imx6: Convert sabrelite and nitrogen6x boards to distro boot support

Boot tested on sabrelite board.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Troy Kisky <troy.kisky@boundarydevices.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Gary Bisson <gary.bisson@boundarydevices.com>
Tested-by: Denis Pynkin <denis.pynkin@collabora.com>

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 5ed88d26542b059c8788ab775bfa0381f77b158b..4e375d88d1dfb704640d11e951ffe69e993f1dfa 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -79,161 +79,68 @@
 
 #define CONFIG_PREBOOT                 ""
 
-#ifdef CONFIG_CMD_SATA
-#define CONFIG_DRIVE_SATA "sata "
+#ifdef CONFIG_CMD_MMC
+#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
 #else
-#define CONFIG_DRIVE_SATA
+#define DISTRO_BOOT_DEV_MMC(func)
 #endif
 
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_DRIVE_MMC "mmc "
+#ifdef CONFIG_CMD_SATA
+#define DISTRO_BOOT_DEV_SATA(func) func(SATA, sata, 0)
 #else
-#define CONFIG_DRIVE_MMC
+#define DISTRO_BOOT_DEV_SATA(func)
 #endif
 
 #ifdef CONFIG_USB_STORAGE
-#define CONFIG_DRIVE_USB "usb "
+#define DISTRO_BOOT_DEV_USB(func) func(USB, usb, 0)
 #else
-#define CONFIG_DRIVE_USB
+#define DISTRO_BOOT_DEV_USB(func)
+#endif
+
+#ifdef CONFIG_CMD_PXE
+#define DISTRO_BOOT_DEV_PXE(func) func(PXE, pxe, na)
+#else
+#define DISTRO_BOOT_DEV_PXE(func)
+#endif
+
+#ifdef CONFIG_CMD_DHCP
+#define DISTRO_BOOT_DEV_DHCP(func) func(DHCP, dhcp, na)
+#else
+#define DISTRO_BOOT_DEV_DHCP(func)
 #endif
 
-#define CONFIG_DRIVE_TYPES CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC CONFIG_DRIVE_USB
-#define CONFIG_UMSDEVS CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC
 
 #if defined(CONFIG_SABRELITE)
+#define FDTFILE "fdtfile=imx6q-sabrelite.dtb\0"
+#else
+/* FIXME: nitrogen6x covers multiple configs. Define fdtfile for each supported config. */
+#define FDTFILE
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+       DISTRO_BOOT_DEV_MMC(func) \
+       DISTRO_BOOT_DEV_SATA(func) \
+       DISTRO_BOOT_DEV_USB(func) \
+       DISTRO_BOOT_DEV_PXE(func) \
+       DISTRO_BOOT_DEV_DHCP(func)
+
+#include <config_distro_bootcmd.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "script=boot.scr\0" \
-       "uimage=uImage\0" \
        "console=ttymxc1\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
-       "fdt_file=imx6q-sabrelite.dtb\0" \
-       "fdt_addr=0x18000000\0" \
-       "boot_fdt=try\0" \
+       "fdt_addr_r=0x18000000\0" \
+       FDTFILE \
+       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
+       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       "ramdisk_addr_r=0x13000000\0" \
+       "ramdiskaddr=0x13000000\0" \
        "ip_dyn=yes\0" \
        "usb_pgood_delay=2000\0" \
-       "mmcdevs=0 1\0" \
-       "mmcpart=1\0" \
-       "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-       "mmcargs=setenv bootargs console=${console},${baudrate} " \
-               "root=${mmcroot}\0" \
-       "loadbootscript=" \
-               "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-       "bootscript=echo Running bootscript from mmc ...; " \
-               "source\0" \
-       "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-       "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-       "mmcboot=echo Booting from mmc ...; " \
-               "run mmcargs; " \
-               "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                       "if run loadfdt; then " \
-                               "bootm ${loadaddr} - ${fdt_addr}; " \
-                       "else " \
-                               "if test ${boot_fdt} = try; then " \
-                                       "bootm; " \
-                               "else " \
-                                       "echo WARN: Cannot load the DT; " \
-                               "fi; " \
-                       "fi; " \
-               "else " \
-                       "bootm; " \
-               "fi;\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-               "root=/dev/nfs " \
-       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-               "netboot=echo Booting from net ...; " \
-               "run netargs; " \
-               "if test ${ip_dyn} = yes; then " \
-                       "setenv get_cmd dhcp; " \
-               "else " \
-                       "setenv get_cmd tftp; " \
-               "fi; " \
-               "${get_cmd} ${uimage}; " \
-               "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                       "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-                               "bootm ${loadaddr} - ${fdt_addr}; " \
-                       "else " \
-                               "if test ${boot_fdt} = try; then " \
-                                       "bootm; " \
-                               "else " \
-                                       "echo WARN: Cannot load the DT; " \
-                               "fi; " \
-                       "fi; " \
-               "else " \
-                       "bootm; " \
-               "fi;\0"
-
-#define CONFIG_BOOTCOMMAND \
-       "for mmcdev in ${mmcdevs}; do " \
-               "mmc dev ${mmcdev}; " \
-               "if mmc rescan; then " \
-                       "if run loadbootscript; then " \
-                               "run bootscript; " \
-                       "else " \
-                               "if run loaduimage; then " \
-                                       "run mmcboot; " \
-                               "fi; " \
-                       "fi; " \
-               "fi; " \
-       "done; " \
-       "run netboot; "
-#else
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "bootdevs=" CONFIG_DRIVE_TYPES "\0" \
-       "umsdevs=" CONFIG_UMSDEVS "\0" \
-       "usb_pgood_delay=2000\0" \
-       "console=ttymxc1\0" \
-       "clearenv=if sf probe || sf probe || sf probe 1 ; then " \
-               "sf erase 0xc0000 0x2000 && " \
-               "echo restored environment to factory default ; fi\0" \
-       "bootcmd=for dtype in ${bootdevs}" \
-               "; do " \
-                       "if itest.s \"xusb\" == \"x${dtype}\" ; then " \
-                               "usb start ;" \
-                       "fi; " \
-                       "for disk in 0 1 ; do ${dtype} dev ${disk} ;" \
-                               "load " \
-                                       "${dtype} ${disk}:1 " \
-                                       "10008000 " \
-                                       "/6x_bootscript" \
-                                       "&& source 10008000 ; " \
-                       "done ; " \
-               "done; " \
-               "setenv stdout serial,vga ; " \
-               "echo ; echo 6x_bootscript not found ; " \
-               "echo ; echo serial console at 115200, 8N1 ; echo ; " \
-               "echo details at http://boundarydevices.com/6q_bootscript ; " \
-               "setenv stdout serial;" \
-               "setenv stdin serial,usbkbd;" \
-               "for dtype in ${umsdevs} ; do " \
-                       "if itest.s sata == ${dtype}; then " \
-                               "initcmd='sata init' ;" \
-                       "else " \
-                               "initcmd='mmc rescan' ;" \
-                       "fi; " \
-                       "for disk in 0 1 ; do " \
-                               "if $initcmd && $dtype dev $disk ; then " \
-                                       "setenv stdout serial,vga; " \
-                                       "echo expose ${dtype} ${disk} " \
-                                               "over USB; " \
-                                       "ums 0 $dtype $disk ;" \
-                               "fi; " \
-               "       done; " \
-               "done ;" \
-               "setenv stdout serial,vga; " \
-               "echo no block devices found;" \
-               "\0" \
-       "initrd_high=0xffffffff\0" \
-       "upgradeu=for dtype in ${bootdevs}" \
-               "; do " \
-               "for disk in 0 1 ; do ${dtype} dev ${disk} ;" \
-                       "load ${dtype} ${disk}:1 10008000 " \
-                               "/6x_upgrade " \
-                               "&& source 10008000 ; " \
-               "done ; " \
-       "done\0" \
+       BOOTENV
 
-#endif
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END        0x10010000