apalis-tk1: enable distroboot

1. Use distro_bootcmd as default boot command instead of
legacy emmcboot wrapper.
2. Drop emmcboot and sdboot wrappers.
3. Provide proper boot order for Distro Boot.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 868303a29cca9933d6f83ee8e0da6a279f98343c..db66d68f637ddda0fb2e6d5a1bfd35ee1e18cd8b 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -11,7 +11,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_BOOTDELAY=1
-CONFIG_BOOTCOMMAND="run emmcboot; setenv fdtfile ${soc}-${fdt-module}-${fdt_board}.dtb && run distro_bootcmd"
+CONFIG_BOOTCOMMAND="setenv fdtfile ${soc}-${fdt-module}-${fdt_board}.dtb && run distro_bootcmd"
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 965259c5e1e9ff3d2c0f10ca09e0b8c80a90073d..6f736064278ca20aa4bf2ce4d9bfccc54a41d1a1 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -34,6 +34,20 @@
 /* General networking support */
 #define CONFIG_TFTP_TSIZE
 
+/*
+ * Custom Distro Boot configuration:
+ * 1. 8bit SD port (MMC1)
+ * 2. 4bit SD port (MMC2)
+ * 3. eMMC (MMC0)
+ */
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+
 #undef CONFIG_IPADDR
 #define CONFIG_IPADDR          192.168.10.2
 #define CONFIG_NETMASK         255.255.255.0
@@ -54,24 +68,6 @@
        "update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
                "mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
 
-#define EMMC_BOOTCMD \
-       "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
-               "ro rootfstype=ext4 rootwait\0" \
-       "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
-               "setenv bootargs ${defargs} ${emmcargs} " \
-               "${setupargs} ${vidargs}; echo Booting from internal eMMC; " \
-               "run emmcdtbload; " \
-               "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
-               "bootz ${kernel_addr_r} - ${dtbparam}\0" \
-       "emmcbootpart=1\0" \
-       "emmcdev=0\0" \
-       "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
-               "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb && " \
-               "setenv dtbparam ${fdt_addr_r}\0" \
-       "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
-       "emmcrootpart=2\0"
-
 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
        "nfsboot=pci enum; run setup; setenv bootargs ${defargs} ${nfsargs} " \
@@ -82,23 +78,6 @@
                "${soc}-${fdt_module}-${fdt_board}.dtb " \
                "&& setenv dtbparam ${fdt_addr_r}\0"
 
-#define SD_BOOTCMD \
-       "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro " \
-       "rootfstype=ext4 rootwait\0" \
-       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
-               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-               "${vidargs}; echo Booting from SD card in 8bit slot...; " \
-               "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
-               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
-               "bootz ${kernel_addr_r} - ${dtbparam}\0" \
-       "sdbootpart=1\0" \
-       "sddev=1\0" \
-       "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
-               "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\0" \
-       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
-       "sdrootpart=2\0"
-
 #define BOARD_EXTRA_ENV_SETTINGS \
        "boot_file=zImage\0" \
        "console=ttyS0\0" \
@@ -106,12 +85,10 @@
                "usb_port_owner_info=2 lane_owner_info=6 emc_max_dvfs=0 " \
                "user_debug=30 pcie_aspm=off\0" \
        "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \
-       EMMC_BOOTCMD \
        "fdt_board=eval\0" \
        "fdt_fixup=;\0" \
        "fdt_module=" FDT_MODULE "\0" \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \