projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace
[platform/kernel/u-boot.git]
/
include
/
configs
/
pico-imx6ul.h
diff --git
a/include/configs/pico-imx6ul.h
b/include/configs/pico-imx6ul.h
index
1f111ea
..
d4f58b6
100644
(file)
--- a/
include/configs/pico-imx6ul.h
+++ b/
include/configs/pico-imx6ul.h
@@
-16,13
+16,8
@@
#ifdef CONFIG_SPL_OS_BOOT
/* Falcon Mode */
#ifdef CONFIG_SPL_OS_BOOT
/* Falcon Mode */
-#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
-#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
-#define CONFIG_SYS_SPL_ARGS_ADDR 0x88000000
/* Falcon Mode - MMC support: args@1MB kernel@2MB */
/* Falcon Mode - MMC support: args@1MB kernel@2MB */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
#endif
/* Network support */
#endif
/* Network support */
@@
-32,13
+27,11
@@
#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR
/* MMC Configs */
#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR
/* MMC Configs */
-#define C
ONFIG_SYS_FSL_ESDHC_ADDR
USDHC1_BASE_ADDR
+#define C
FG_SYS_FSL_ESDHC_ADDR
USDHC1_BASE_ADDR
/* USB Configs */
/* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_USBD_HS
#define CONFIG_USBD_HS
@@
-109,14
+102,7
@@
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
-#define CONFIG_SYS_INIT_SP_OFFSET \
- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
-/* environment organization */
-
-#ifdef CONFIG_DM_VIDEO
+#ifdef CONFIG_VIDEO
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif