Merge tag 'dm-pull-5dec18' of git://git.denx.de/u-boot-dm

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

diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 9eb95bc..c631e26 100644 (file)
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -37,8 +37,6 @@
 /* memtest will be run on 16MB */
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024)
 
-#define CONFIG_NR_DRAM_BANKS   1 /* we have 1 bank of DRAM */
-
 /*
  * Serial Driver info
  */
@@ -56,7 +54,6 @@
  * I2C Configuration
  */
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_DAVINCI
 #define CONFIG_SYS_DAVINCI_I2C_SPEED           400000
 #define CONFIG_SYS_DAVINCI_I2C_SLAVE   10 /* Bogus, master-only in U-Boot */
 
@@ -84,34 +81,60 @@
                "if run loadbootscr; then " \
                        "run bootscript; " \
                "else " \
+                       "if run loadbootenv; then " \
+                               "echo Loaded env from ${bootenvfile};" \
+                               "run importbootenv;" \
+                       "fi;" \
+                       "if test -n $uenvcmd; then " \
+                               "echo Running uenvcmd...;" \
+                               "run uenvcmd;" \
+                       "fi;" \
                        "if run loadimage; then " \
                                "run mmcargs; " \
+                               "if run loadfdt; then " \
+                                       "echo Using ${fdtfile}...;" \
+                                       "run fdtfixup; " \
+                                       "run fdtboot; "\
+                               "fi; " \
                                "run mmcboot; " \
-                       "else " \
-                               "run flashargs; " \
-                               "run flashboot; " \
                        "fi; " \
                "fi; " \
-       "else " \
-               "run flashargs; " \
-               "run flashboot; " \
-       "fi"
+       "fi; "\
+       "run flashargs; " \
+       "run flashboot"
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "bootenvfile=uEnv.txt\0" \
+       "fdtfile=da850-lego-ev3.dtb\0" \
        "memsize=64M\0" \
        "filesyssize=10M\0" \
        "verify=n\0" \
        "console=ttyS1,115200n8\0" \
        "bootscraddr=0xC0600000\0" \
+       "fdtaddr=0xC0600000\0" \
        "loadaddr=0xC0007FC0\0" \
        "filesysaddr=0xC1180000\0" \
        "fwupdateboot=mw 0xFFFF1FFC 0x5555AAAA; reset\0" \
-       "mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \
+       "importbootenv=echo Importing environment...; " \
+               "env import -t ${loadaddr} ${filesize}\0" \
+       "loadbootenv=fatload mmc 0 ${loadaddr} ${bootenvfile}\0" \
+       "mmcargs=setenv bootargs console=${console} root=/dev/mmcblk0p2 rw " \
+               "rootwait ${optargs}\0" \
        "mmcboot=bootm ${loadaddr}\0" \
-       "flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \
-       "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \
+       "flashargs=setenv bootargs initrd=${filesysaddr},${filesyssize} " \
+               "root=/dev/ram0 rw rootfstype=squashfs console=${console} " \
+               "${optargs}\0" \
+       "flashboot=sf probe 0; " \
+               "sf read ${fdtaddr} 0x40000 0x10000; " \
+               "sf read ${loadaddr} 0x50000 0x400000; " \
+               "sf read ${filesysaddr} 0x450000 0xA00000; " \
+               "run fdtfixup; " \
+               "run fdtboot\0" \
        "loadimage=fatload mmc 0 ${loadaddr} uImage\0" \
+       "loadfdt=fatload mmc 0 ${fdtaddr} ${fdtfile}\0" \
+       "fdtfixup=fdt addr ${fdtaddr}; fdt resize; fdt chosen\0" \
+       "fdtboot=bootm ${loadaddr} - ${fdtaddr}\0" \
        "loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
-       "bootscript=source ${bootscraddr}\0" \
+       "bootscript=source ${bootscraddr}\0"
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS