Merge tag 'arc-fixes-for-2019.04-rc1' of git://git.denx.de/u-boot-arc

[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 6962039..d61fdf9 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2014
  * Texas Instruments Incorporated.
@@ -5,56 +6,34 @@
  *
  * Configuration settings for the TI Beagle x15 board.
  * See ti_omap5_common.h for omap5 common settings.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_AM57XX_EVM_H
 #define __CONFIG_AM57XX_EVM_H
 
 #include <environment/ti/dfu.h>
+#include <linux/sizes.h>
 
-#ifdef CONFIG_SPL_BUILD
 #define CONFIG_IODELAY_RECALIBRATION
-#endif
-
-#define CONFIG_NR_DRAM_BANKS           2
 
-#define CONFIG_ENV_SIZE                        (64 << 10)
-#define CONFIG_ENV_IS_IN_FAT
-#define FAT_ENV_INTERFACE              "mmc"
-#define FAT_ENV_DEVICE_AND_PART                "0:1"
-#define FAT_ENV_FILE                   "uboot.env"
+/* MMC ENV related defines */
+#define CONFIG_SYS_MMC_ENV_DEV         1               /* eMMC */
+#define CONFIG_SYS_MMC_ENV_PART                0
+#define CONFIG_ENV_SIZE                        SZ_128K
+#define CONFIG_ENV_OFFSET              0x260000
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
 #define CONSOLEDEV                     "ttyO2"
 #define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2                UART2_BASE      /* UART2 */
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE      /* UART3 */
 
-#define CONFIG_SYS_OMAP_ABE_SYSCK
+#define CONFIG_ENV_EEPROM_IS_ON_I2C
+#define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* Main EEPROM */
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 
-/* 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=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 CONFIG_SYS_OMAP_ABE_SYSCK
 
 #define DFUARGS \
        "dfu_bufsiz=0x10000\0" \
@@ -65,35 +44,22 @@
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_RANDOM_UUID
 #define CONFIG_HSMMC2_8BIT
 
 /* CPSW Ethernet */
-#define CONFIG_BOOTP_DNS               /* Configurable parts of CMD_DHCP */
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_DRIVER_TI_CPSW          /* Driver for IP block */
-#define CONFIG_MII                     /* Required in net/eth.c */
-#define CONFIG_PHY_GIGE                        /* per-board part of CPSW */
-#define CONFIG_PHYLIB
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs longer aneg time at 1G */
 
 #define CONFIG_SUPPORT_EMMC_BOOT
 
 /* 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
 
 /* SATA */
-#define CONFIG_SCSI
-#define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID    1
 #define CONFIG_SYS_SCSI_MAX_LUN                1
@@ -116,11 +82,9 @@
 
 /* SPI SPL */
 #define CONFIG_TI_EDMA3
-#define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 
 /* SPI */
-#undef CONFIG_OMAP3_SPI
 #define CONFIG_TI_SPI_MMAP
 #define CONFIG_SF_DEFAULT_SPEED                76800000
 #define CONFIG_SF_DEFAULT_MODE                 SPI_MODE_0