diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-20 13:41:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-20 13:41:56 -0400 |
| commit | b71d9e8b3805305ea4116733f515061710ad7081 (patch) | |
| tree | c7240f83b5f72b156ee29f5f8640dd5b83b2cb71 /configs | |
| parent | 3313e908445f7cd7d362955c9054ddf7615d53ef (diff) | |
| parent | d8024074e43c2a99ecf93d919544d82f69025521 (diff) | |
| download | u-boot-b71d9e8b3805305ea4116733f515061710ad7081.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/A20-OLinuXino_MICRO-eMMC_defconfig | 2 | ||||
| -rw-r--r-- | configs/Bananapi_M2_Ultra_defconfig | 1 | ||||
| -rw-r--r-- | configs/amarula_a64_relic_defconfig | 1 | ||||
| -rw-r--r-- | configs/bananapi_m2_berry_defconfig | 1 | ||||
| -rw-r--r-- | configs/sopine_baseboard_defconfig | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig index d4442c2a74..95ba3250a2 100644 --- a/configs/A20-OLinuXino_MICRO-eMMC_defconfig +++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig @@ -8,7 +8,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y CONFIG_SATAPWR="PB8" -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro-emmc" CONFIG_AHCI=y CONFIG_NR_DRAM_BANKS=1 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig index 2771893e15..0123ccee12 100644 --- a/configs/Bananapi_M2_Ultra_defconfig +++ b/configs/Bananapi_M2_Ultra_defconfig @@ -4,7 +4,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_R40=y CONFIG_DRAM_CLK=576 CONFIG_DRAM_ZQ=3881979 -CONFIG_DRAM_ODT_EN=y CONFIG_MACPWR="PA17" CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig index 8b17b7fed4..ba46d902a6 100644 --- a/configs/amarula_a64_relic_defconfig +++ b/configs/amarula_a64_relic_defconfig @@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y CONFIG_SPL=y CONFIG_MACH_SUN50I=y CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y -CONFIG_DRAM_ODT_EN=y CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_VIDEO_DE2 is not set CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic" diff --git a/configs/bananapi_m2_berry_defconfig b/configs/bananapi_m2_berry_defconfig index dc37a4d867..a6ba32462b 100644 --- a/configs/bananapi_m2_berry_defconfig +++ b/configs/bananapi_m2_berry_defconfig @@ -4,7 +4,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_R40=y CONFIG_DRAM_CLK=576 CONFIG_DRAM_ZQ=3881979 -CONFIG_DRAM_ODT_EN=y CONFIG_MMC0_CD_PIN="PH13" CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry" CONFIG_AHCI=y diff --git a/configs/sopine_baseboard_defconfig b/configs/sopine_baseboard_defconfig index 5b9fd334d1..ea826aabad 100644 --- a/configs/sopine_baseboard_defconfig +++ b/configs/sopine_baseboard_defconfig @@ -6,7 +6,6 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=3881949 -CONFIG_DRAM_ODT_EN=y CONFIG_MMC0_CD_PIN="" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_SPL_SPI_SUNXI=y |