projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm
[oweals/u-boot.git]
/
include
/
configs
/
exynos5-common.h
diff --git
a/include/configs/exynos5-common.h
b/include/configs/exynos5-common.h
index cd2a9046afec3b44fd0865de16040a4dddb20d5e..e0a4d76d53800d268d5afa45bccd086a49a29e1c 100644
(file)
--- a/
include/configs/exynos5-common.h
+++ b/
include/configs/exynos5-common.h
@@
-44,7
+44,6
@@
/* MMC SPL */
#define COPY_BL2_FNPTR_ADDR 0x02020030
/* MMC SPL */
#define COPY_BL2_FNPTR_ADDR 0x02020030
-#define CONFIG_SUPPORT_EMMC_BOOT
/* specific .lds file */
/* specific .lds file */
@@
-108,16
+107,9
@@
#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0
/* SPI */
#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0
/* SPI */
-#ifdef CONFIG_SPI_FLASH
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_SF_DEFAULT_SPEED 50000000
-#endif
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_SPI_MODE SPI_MODE_0
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
-#define CONFIG_ENV_SPI_BUS 1
-#define CONFIG_ENV_SPI_MAX_HZ 50000000
#endif
/* Ethernet Controllor Driver */
#endif
/* Ethernet Controllor Driver */
@@
-136,9
+128,9
@@
#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018
#define BOOT_TARGET_DEVICES(func) \
#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018
#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 2) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
- func(MMC, mmc, 2) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
func(PXE, pxe, na) \
func(DHCP, dhcp, na)