Merge tag 'u-boot-amlogic-20230417' of https://source.denx.de/u-boot/custodians/u...

[platform/kernel/u-boot.git] / include / configs / udoo.h

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index fe6ea68..d85cf78 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -10,17 +10,12 @@
 
 #include "mx6_common.h"
 
-#include "imx6_spl.h"
-
-#define CONFIG_MXC_UART_BASE           UART2_BASE
-
-/* SATA Configs */
-#define CONFIG_LBA48
+#define CFG_MXC_UART_BASE              UART2_BASE
 
 /* MMC Configuration */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
+#define CFG_SYS_FSL_ESDHC_ADDR 0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc1,115200\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
@@ -28,7 +23,7 @@
        "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 " \
@@ -44,7 +39,7 @@
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(MMC, mmc, 0) \
+       func(MMC, mmc, 2) \
        func(SATA, sata, 0) \
        func(DHCP, dhcp, na)
 
@@ -54,14 +49,9 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#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)
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment organization */