config: Move CONFIG_BOARD_LATE_INIT to defconfigs

[people/ms/u-boot.git] / include / configs / baltos.h

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index e69c1b63c1442710cd990bfb2928c1bdc9ef15ce..4e07e52a1b2a5fb8afafbc50b5291725c4f5939c 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -21,7 +21,6 @@
 
 #define MACH_TYPE_TIAM335EVM           3589    /* Until the next sync */
 #define CONFIG_MACH_TYPE               MACH_TYPE_TIAM335EVM
-#define CONFIG_BOARD_LATE_INIT
 
 /* Clock Defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
@@ -102,7 +101,9 @@
        "optargs=\0" \
        "mmcdev=0\0" \
        "mmcroot=/dev/mmcblk0p2 ro\0" \
+       "usbroot=/dev/sda2 ro\0" \
        "mmcrootfstype=ext4 rootwait\0" \
+       "usbrootfstype=ext4 rootwait\0" \
        "rootpath=/export/rootfs\0" \
        "nfsopts=nolock\0" \
        "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
@@ -114,6 +115,11 @@
                "${mtdparts} " \
                "root=${mmcroot} " \
                "rootfstype=${mmcrootfstype}\0" \
+       "usbargs=setenv bootargs console=${console} " \
+               "${optargs} " \
+               "${mtdparts} " \
+               "root=${usbroot} " \
+               "rootfstype=${usbrootfstype}\0" \
        "spiroot=/dev/mtdblock4 rw\0" \
        "spirootfstype=jffs2\0" \
        "spisrcaddr=0xe0000\0" \
@@ -130,15 +136,25 @@
                "ip=dhcp\0" \
        "bootenv=uEnv.txt\0" \
        "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+       "usbloadbootenv=load usb 0:1 ${loadaddr} ${bootenv}\0" \
        "importbootenv=echo Importing environment from mmc ...; " \
                "env import -t $loadaddr $filesize\0" \
+       "usbimportbootenv=echo Importing environment from USB ...; " \
+               "env import -t $loadaddr $filesize\0" \
        "ramargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${ramroot} " \
                "rootfstype=${ramrootfstype}\0" \
        "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
        "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+       "usbloadimage=load usb 0:1 ${loadaddr} kernel-fit.itb\0" \
        "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+       "usbloados=run usbargs; " \
+               "bootm ${loadaddr}#conf${board_name}; " \
+               "if test $? -ne 0; then " \
+                       "echo Using default FIT configuration; " \
+                       "bootm ${loadaddr}; " \
+               "fi;\0" \
        "mmcloados=run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if run loadfdt; then " \
@@ -153,6 +169,21 @@
                "else " \
                        "bootz; " \
                "fi;\0" \
+       "usbboot=usb reset; " \
+               "if usb storage; then " \
+                       "echo USB drive found;" \
+                       "if run usbloadbootenv; then " \
+                               "echo Loaded environment from ${bootenv};" \
+                               "run usbimportbootenv;" \
+                       "fi;" \
+                       "if test -n $uenvcmd; then " \
+                               "echo Running uenvcmd ...;" \
+                               "run uenvcmd;" \
+                       "fi;" \
+                       "if run usbloadimage; then " \
+                               "run usbloados;" \
+                       "fi;" \
+               "fi;\0" \
        "mmcboot=mmc dev ${mmcdev}; " \
                "if mmc rescan; then " \
                        "echo SD/MMC found on device ${mmcdev};" \
@@ -190,6 +221,7 @@
 
 #define CONFIG_BOOTCOMMAND \
        "run findfdt; " \
+       "run usbboot;" \
        "run mmcboot;" \
        "setenv mmcdev 1; " \
        "setenv bootpart 1:2; " \
@@ -224,7 +256,7 @@
 /* General network SPL, both CPSW and USB gadget RNDIS */
 #define CONFIG_SPL_NET_VCI_STRING      "AM335x U-Boot SPL"*/
 
-#define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #ifdef CONFIG_NAND
 #define CONFIG_NAND_OMAP_GPMC