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
/
udoo.h
diff --git
a/include/configs/udoo.h
b/include/configs/udoo.h
index
2983693
..
8af5151
100644
(file)
--- a/
include/configs/udoo.h
+++ b/
include/configs/udoo.h
@@
-12,19
+12,10
@@
#include "imx6_spl.h"
#include "imx6_spl.h"
-/* Provide the MACH_TYPE value that the vendor kernel requires. */
-#define CONFIG_MACH_TYPE 4800
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
-
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_MXC_UART_BASE UART2_BASE
-/* SATA Configs */
-#define CONFIG_LBA48
-
/* MMC Configuration */
/* MMC Configuration */
-#define C
ONFIG_SYS_FSL_ESDHC_ADDR
0
+#define C
FG_SYS_FSL_ESDHC_ADDR
0
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc1,115200\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc1,115200\0" \
@@
-34,7
+25,7
@@
"fdt_addr=0x18000000\0" \
"fdt_addr_r=0x18000000\0" \
"ip_dyn=yes\0" \
"fdt_addr=0x18000000\0" \
"fdt_addr_r=0x18000000\0" \
"ip_dyn=yes\0" \
- "mmcdev=
0
\0" \
+ "mmcdev=
2
\0" \
"mmcrootfstype=ext4\0" \
"findfdt="\
"if test ${board_rev} = MX6Q; then " \
"mmcrootfstype=ext4\0" \
"findfdt="\
"if test ${board_rev} = MX6Q; then " \
@@
-43,14
+34,14
@@
"setenv fdtfile imx6dl-udoo.dtb; fi; " \
"if test ${fdtfile} = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi\0" \
"setenv fdtfile imx6dl-udoo.dtb; fi; " \
"if test ${fdtfile} = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi\0" \
- "kernel_addr_r=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
- "pxefile_addr_r=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
+ "kernel_addr_r=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
+ "pxefile_addr_r=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
"ramdisk_addr_r=0x13000000\0" \
"ramdisk_addr_r=0x13000000\0" \
- "scriptaddr=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
+ "scriptaddr=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
BOOTENV
#define BOOT_TARGET_DEVICES(func) \
BOOTENV
#define BOOT_TARGET_DEVICES(func) \
- func(MMC, mmc,
0
) \
+ func(MMC, mmc,
2
) \
func(SATA, sata, 0) \
func(DHCP, dhcp, na)
func(SATA, sata, 0) \
func(DHCP, dhcp, na)
@@
-64,11
+55,6
@@
#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 */
#endif /* __CONFIG_H * */
/* Environment organization */
#endif /* __CONFIG_H * */