configs: Migrate RBTREE, LZO, CMD_MTDPARTS, CMD_UBI and CMD_UBIFS

[platform/kernel/u-boot.git] / include / configs / cl-som-am57x.h

diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index 96e5c9c..a04f4cd 100644 (file)
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -42,9 +42,9 @@
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 
-/* SD/MMC RAW boot */
-#undef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
-#undef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
+/* SD/MMC RAW/FS boot */
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
 
 /* Environment */
 #define CONFIG_ENV_SIZE                        (16 << 10) /* 16 KiB env size */
@@ -128,8 +128,10 @@
        "bootkernel=bootz ${loadaddr} - ${fdtaddr}\0" \
        "mmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
        "mmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
+       "emmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
+       "emmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
        "load_mmc=mmc dev ${mmcdev} && mmc rescan && " \
-               "run mmcloadkernel run mmcloadfdt\0" \
+               "run mmcloadkernel && run mmcloadfdt\0" \
        "mmcroot=/dev/mmcblk1p2\0" \
        "mmcrootfstype=ext4 rw rootwait\0" \
        "mmcargs=setenv bootargs console=${console} root=${mmcroot} " \
@@ -165,7 +167,7 @@
                "source ${loadaddr}\0" \
        "sataboot=run load_sata && run sataargs && " \
                "echo Booting from SATA ... && " \
-               "run bootkernel\0" \
+               "run bootkernel\0"
 
 #undef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND \