projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[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
e69e800
..
c47ffcc
100644
(file)
--- a/
include/configs/am57xx_evm.h
+++ b/
include/configs/am57xx_evm.h
@@
-16,13
+16,8
@@
#define CONFIG_IODELAY_RECALIBRATION
#define CONFIG_IODELAY_RECALIBRATION
-/* MMC ENV related defines */
-#define CONFIG_SYS_MMC_ENV_DEV 1 /* eMMC */
-#define CONFIG_SYS_MMC_ENV_PART 0
-#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_SYS_BOOTM_LEN SZ_64M
-#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_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
#define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
@@
-33,7
+28,6
@@
#define CONFIG_SYS_OMAP_ABE_SYSCK
#define CONFIG_SYS_OMAP_ABE_SYSCK
-#ifdef CONFIG_SPL_DFU
#ifndef CONFIG_SPL_BUILD
#define DFUARGS \
"dfu_bufsiz=0x10000\0" \
#ifndef CONFIG_SPL_BUILD
#define DFUARGS \
"dfu_bufsiz=0x10000\0" \
@@
-42,8
+36,7
@@
DFU_ALT_INFO_RAM \
DFU_ALT_INFO_QSPI
#else
DFU_ALT_INFO_RAM \
DFU_ALT_INFO_QSPI
#else
-#undef CONFIG_CMD_BOOTD
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
+#ifdef CONFIG_SPL_DFU
#define DFUARGS \
"dfu_bufsiz=0x10000\0" \
DFU_ALT_INFO_RAM
#define DFUARGS \
"dfu_bufsiz=0x10000\0" \
DFU_ALT_INFO_RAM
@@
-56,8
+49,6
@@
#define CONFIG_HSMMC2_8BIT
/* CPSW Ethernet */
#define CONFIG_HSMMC2_8BIT
/* CPSW Ethernet */
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */
#define CONFIG_NET_RETRY_COUNT 10
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */
@@
-88,6
+79,5
@@
#define CONFIG_SYS_SPI_ARGS_SIZE 0x80000
/* SPI SPL */
#define CONFIG_SYS_SPI_ARGS_SIZE 0x80000
/* SPI SPL */
-#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
#endif /* __CONFIG_AM57XX_EVM_H */
#endif /* __CONFIG_AM57XX_EVM_H */