sunxi: enable automatic FIT build for 64-bit SoCs

[u-boot] / include / configs / omapl138_lcdk.h

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 85e95b31779cb1ec4b8ad1637bd690952a756071..0cc0042bca3bc7f451ab94861352f91a559f6921 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -227,7 +227,6 @@
  * Network & Ethernet Configuration
  */
 #ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM       7
 #define CONFIG_MII
 #undef CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_BOOTP_DEFAULT
@@ -260,36 +259,32 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_REVISION_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTARGS                "console=ttyS2,115200n8 root=/dev/mmcblk0p2 rw rootwait ip=off"
 #define CONFIG_BOOTCOMMAND \
-       "if mmc rescan; then " \
-               "run mmcboot; " \
-       "else " \
-               "run spiboot; " \
-       "fi"
-#define CONFIG_EXTRA_ENV_SETTINGS \
+               "run envboot; " \
+               "run mmcboot; "
+
+#define DEFAULT_LINUX_BOOT_ENV \
+       "loadaddr=0xc0700000\0" \
        "fdtaddr=0xc0600000\0" \
+       "scriptaddr=0xc0600000\0"
+
+#include <environment/ti/mmc.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       DEFAULT_LINUX_BOOT_ENV \
+       DEFAULT_MMC_TI_ARGS \
+       "bootpart=0:2\0" \
+       "bootdir=/boot\0" \
+       "bootfile=zImage\0" \
        "fdtfile=da850-lcdk.dtb\0" \
-       "fdtboot=bootz 0xc0700000 - ${fdtaddr};\0" \
-       "mmcboot=" \
-               "if fatload mmc 0 0xc0600000 boot.scr; then " \
-                       "source 0xc0600000; " \
-               "else " \
-                       "fatload mmc 0 0xc0700000 " \
-                               __stringify(CONFIG_BOOTFILE) "; " \
-                       "fatload mmc 0 ${fdtaddr} ${fdtfile}; " \
-                       "run fdtboot; " \
-               "fi;\0" \
-       "spiboot=" \
-               "sf probe 0; " \
-               "sf read 0xc0700000 0x80000 0x220000; " \
-               "bootz 0xc0700000;\0"
+       "boot_fdt=yes\0" \
+       "boot_fit=0\0" \
+       "console=ttyS2,115200n8\0"
 
 /*
  * U-Boot commands
  */
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS