diff options
author | Tom Rini <trini@konsulko.com> | 2019-02-14 20:14:51 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-02-14 20:14:51 -0500 |
commit | c59786f21a9a503d98582003962e7c66a73312e9 (patch) | |
tree | 2d0e5ac50f0dc8e75ca683bb7045bc15f96643a6 /configs | |
parent | 63f7e3fca391a50a499fed828fe16325fdee45f3 (diff) | |
parent | d065a6c00a63c2f441bb8b5d31407c5e10da9612 (diff) | |
download | u-boot-c59786f21a9a503d98582003962e7c66a73312e9.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- MMC CD pin fix on Orangepi Zero plus
- SPI boot for Olinuxino Lime2-eMMC boards
- Change in dram frequnecy for tbs_a711
Diffstat (limited to 'configs')
-rw-r--r-- | configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 | ||||
-rw-r--r-- | configs/orangepi_zero_plus_defconfig | 3 | ||||
-rw-r--r-- | configs/tbs_a711_defconfig | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig index 7863a4e8e0..1010f41325 100644 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_SPL=y +CONFIG_SPL_SPI_SUNXI=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_MMC0_CD_PIN="PH1" diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index a2cfc7f59a..105d8f3251 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -4,8 +4,7 @@ CONFIG_SPL=y CONFIG_MACH_SUN50I_H5=y CONFIG_DRAM_CLK=624 CONFIG_DRAM_ZQ=3881977 -CONFIG_MMC0_CD_PIN="PH13" -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_MMC0_CD_PIN="PF6" CONFIG_NR_DRAM_BANKS=1 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/tbs_a711_defconfig b/configs/tbs_a711_defconfig index 253ef5cce0..007ff89348 100644 --- a/configs/tbs_a711_defconfig +++ b/configs/tbs_a711_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y CONFIG_SPL=y CONFIG_MACH_SUN8I_A83T=y CONFIG_DRAM_TYPE=7 -CONFIG_DRAM_CLK=648 +CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=15355 CONFIG_DRAM_ODT_EN=y CONFIG_MMC_SUNXI_SLOT_EXTRA=2 |