ARM: m28evk: Update default environment

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Lothar Rubusch <lothar@denx.de>

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 89f9785cabc8c6730d2d1f2c4f5789353152a5e8..fccd29dc26ce8fba8d81dc410168be090a1d6e48 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -157,14 +157,28 @@
 
 /* Booting Linux */
 #define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTFILE                "uImage"
+#define CONFIG_BOOTFILE                "fitImage"
 #define CONFIG_BOOTARGS                "console=ttyAMA0,115200n8 "
-#define CONFIG_BOOTCOMMAND     "run bootcmd_net"
+#define CONFIG_BOOTCOMMAND     "run mmc_mmc"
 #define CONFIG_LOADADDR                0x42000000
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
 
 /* Extra Environment */
+#define CONFIG_PREBOOT         "run try_bootscript"
+#define CONFIG_HOSTNAME                m28evk
+
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       "consdev=ttyAMA0\0"                                             \
+       "baudrate=115200\0"                                             \
+       "bootdev=/dev/mmcblk0p2\0"                                      \
+       "rootdev=/dev/mmcblk0p3\0"                                      \
+       "netdev=eth0\0"                                                 \
+       "hostname=m28evk\0"                                             \
+       "rootpath=/opt/eldk-5.5/armv5te/rootfs-qte-sdk\0"               \
+       "kernel_addr_r=0x42000000\0"                                    \
+       "videomode=video=ctfb:x:800,y:480,depth:18,mode:0,pclk:30066,"  \
+               "le:0,ri:256,up:0,lo:45,hs:1,vs:1,sync:100663296,"      \
+               "vmode:0\0"                                             \
        "update_nand_full_filename=u-boot.nand\0"                       \
        "update_nand_firmware_filename=u-boot.sb\0"                     \
        "update_sd_firmware_filename=u-boot.sd\0"                       \
@@ -180,7 +194,7 @@
                "if tftp ${update_nand_full_filename} ; then "          \
                "run update_nand_get_fcb_size ; "                       \
                "nand scrub -y 0x0 ${filesize} ; "                      \
-               "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; "   \
+               "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; "           \
                "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
                "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
                "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
@@ -202,6 +216,73 @@
                "setexpr fw_sz ${fw_sz} + 1 ; "                         \
                "mmc write ${loadaddr} 0x800 ${fw_sz} ; "               \
                "fi ; "                                                 \
+               "fi\0"                                                  \
+       "addcons="                                                      \
+               "setenv bootargs ${bootargs} "                          \
+               "console=${consdev},${baudrate}\0"                      \
+       "addip="                                                        \
+               "setenv bootargs ${bootargs} "                          \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:"                \
+                       "${netmask}:${hostname}:${netdev}:off\0"        \
+       "addmisc="                                                      \
+               "setenv bootargs ${bootargs} ${miscargs}\0"             \
+       "adddfltmtd="                                                   \
+               "if test \"x${mtdparts}\" == \"x\" ; then "             \
+                       "mtdparts default ; "                           \
+               "fi\0"                                                  \
+       "addmtd="                                                       \
+               "run adddfltmtd ; "                                     \
+               "setenv bootargs ${bootargs} ${mtdparts}\0"             \
+       "addargs=run addcons addmtd addmisc\0"                          \
+       "mmcload="                                                      \
+               "mmc rescan ; "                                         \
+               "ext4load mmc 0:2 ${kernel_addr_r} ${bootfile}\0"       \
+       "ubiload="                                                      \
+               "ubi part UBI ; ubifsmount ubi0:rootfs ; "              \
+               "ubifsload ${kernel_addr_r} /boot/${bootfile}\0"        \
+       "netload="                                                      \
+               "tftp ${kernel_addr_r} ${hostname}/${bootfile}\0"       \
+       "miscargs=nohlt panic=1\0"                                      \
+       "mmcargs=setenv bootargs root=${rootdev} rw rootwait\0"         \
+       "ubiargs="                                                      \
+               "setenv bootargs ubi.mtd=5 "                            \
+               "root=ubi0:rootfs rootfstype=ubifs\0"                   \
+       "nfsargs="                                                      \
+               "setenv bootargs root=/dev/nfs rw "                     \
+                       "nfsroot=${serverip}:${rootpath},v3,tcp\0"      \
+       "mmc_mmc="                                                      \
+               "run mmcload mmcargs addargs ; "                        \
+               "bootm ${kernel_addr_r}\0"                              \
+       "mmc_ubi="                                                      \
+               "run mmcload ubiargs addargs ; "                        \
+               "bootm ${kernel_addr_r}\0"                              \
+       "mmc_nfs="                                                      \
+               "run mmcload nfsargs addip addargs ; "                  \
+               "bootm ${kernel_addr_r}\0"                              \
+       "ubi_mmc="                                                      \
+               "run ubiload mmcargs addargs ; "                        \
+               "bootm ${kernel_addr_r}\0"                              \
+       "ubi_ubi="                                                      \
+               "run ubiload ubiargs addargs ; "                        \
+               "bootm ${kernel_addr_r}\0"                              \
+       "ubi_nfs="                                                      \
+               "run ubiload nfsargs addip addargs ; "                  \
+               "bootm ${kernel_addr_r}\0"                              \
+       "net_mmc="                                                      \
+               "run netload mmcargs addargs ; "                        \
+               "bootm ${kernel_addr_r}\0"                              \
+       "net_ubi="                                                      \
+               "run netload ubiargs addargs ; "                        \
+               "bootm ${kernel_addr_r}\0"                              \
+       "net_nfs="                                                      \
+               "run netload nfsargs addip addargs ; "                  \
+               "bootm ${kernel_addr_r}\0"                              \
+       "try_bootscript="                                               \
+               "mmc rescan;"                                           \
+               "if ext4load mmc 0:2 ${kernel_addr_r} ${bootscript};"   \
+               "then;"                                                 \
+                       "\techo Running bootscript...;"                 \
+                       "\tsource ${kernel_addr_r};"                    \
                "fi\0"
 
 /* The rest of the configuration is shared */