Merge git://git.denx.de/u-boot-mpc85xx

[platform/kernel/u-boot.git] / include / configs / am57xx_evm.h

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 46e8d4c..3d8b996 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -12,14 +12,14 @@
 #ifndef __CONFIG_AM57XX_EVM_H
 #define __CONFIG_AM57XX_EVM_H
 
-#define CONFIG_AM57XX
+#include <environment/ti/dfu.h>
+
+#define CONFIG_DRA7XX
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_IODELAY_RECALIBRATION
 #endif
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 #define CONFIG_NR_DRAM_BANKS           2
 
 #define CONFIG_ENV_SIZE                        (64 << 10)
@@ -38,14 +38,38 @@
 
 /* Define the default GPT table for eMMC */
 #define PARTS_DEFAULT \
+       /* Linux partitions */ \
+       "uuid_disk=${uuid_gpt_disk};" \
+       "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
+       /* Android partitions */ \
+       "partitions_android=" \
        "uuid_disk=${uuid_gpt_disk};" \
-       "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
+       "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \
+       "name=bootloader,size=768K,uuid=${uuid_gpt_bootloader};" \
+       "name=environment,size=128K,uuid=${uuid_gpt_environment};" \
+       "name=misc,size=128K,uuid=${uuid_gpt_misc};" \
+       "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \
+       "name=efs,size=16M,uuid=${uuid_gpt_efs};" \
+       "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \
+       "name=recovery,size=10M,uuid=${uuid_gpt_recovery};" \
+       "name=boot,size=10M,uuid=${uuid_gpt_boot};" \
+       "name=system,size=768M,uuid=${uuid_gpt_system};" \
+       "name=cache,size=256M,uuid=${uuid_gpt_cache};" \
+       "name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \
+       "name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \
+       "name=userdata,size=-,uuid=${uuid_gpt_userdata}"
+
+#define DFUARGS \
+       "dfu_bufsiz=0x10000\0" \
+       DFU_ALT_INFO_MMC \
+       DFU_ALT_INFO_EMMC \
+       DFU_ALT_INFO_RAM \
 
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_CMD_GPT
-#define CONFIG_EFI_PARTITION
+#define CONFIG_RANDOM_UUID
+#define CONFIG_HSMMC2_8BIT
 
 /* CPSW Ethernet */
 #define CONFIG_BOOTP_DNS               /* Configurable parts of CMD_DHCP */
@@ -64,14 +88,12 @@
 
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
-#define CONFIG_USB_STORAGE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
 
 #define CONFIG_OMAP_USB_PHY
 #define CONFIG_OMAP_USB3PHY1_HOST
 
 /* SATA */
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SCSI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
@@ -102,16 +124,11 @@
 #ifdef CONFIG_SPL_BUILD
 #undef CONFIG_DM_SPI
 #undef CONFIG_DM_SPI_FLASH
-#undef CONFIG_SPL_MAX_SIZE
-#define CONFIG_SPL_MAX_SIZE             (256 << 10) /* 256 KiB */
 #endif
 
 /* SPI SPL */
-#define CONFIG_SPL_SPI_SUPPORT
-#define CONFIG_SPL_DMA_SUPPORT
 #define CONFIG_TI_EDMA3
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 
 /* SPI */