Merge git://git.denx.de/u-boot-fsl-qoriq

[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 e1f724b..120ac02 100644 (file)
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -11,14 +11,11 @@
 #ifndef __CONFIG_CL_SOM_AM57X_H
 #define __CONFIG_CL_SOM_AM57X_H
 
-#define CONFIG_DRA7XX
-
 #define CONFIG_NR_DRAM_BANKS           2
 
 #define CONSOLEDEV                     "ttyO2"
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE      /* UART3 */
 #define CONFIG_CONS_INDEX              3
-#define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_SYS_OMAP_ABE_SYSCK
 
@@ -45,15 +42,14 @@
 #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 */
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_ENV_SPI_MAX_HZ          48000000
@@ -63,8 +59,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN  1
 #define CONFIG_SYS_I2C_EEPROM_BUS       3
 
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_EEPROM_LAYOUT
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_EEPROM_SIZE         256
 
@@ -85,9 +79,10 @@
 #define CONFIG_SYS_I2C_PCA953X_ADDR     0x20
 #define CONFIG_SYS_I2C_PCA953X_WIDTH    { {0x20, 16} }
 
+#endif /* !CONFIG_SPL_BUILD */
+
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
-#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
 
 #define CONFIG_OMAP_USB_PHY
 #define CONFIG_OMAP_USB3PHY1_HOST
@@ -99,8 +94,6 @@
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_ETHER_MCS7830
 
-#endif /* !CONFIG_SPL_BUILD */
-
 /* CPSW Ethernet */
 #define CONFIG_DRIVER_TI_CPSW
 #define CONFIG_MII
@@ -133,8 +126,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} " \
@@ -170,7 +165,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 \