Commit 8094f0cb0ce9c61f1e2638ad75ce45a677fe3c4a

Authored by Andre Przywara
Committed by Jagan Teki
1 parent 25b3d90b2c

sunxi: A64: fix default DRAM_ODT_EN symbol

"default" lines in Kconfig are processed in order, the first hit will
stop considering subsequent lines. In the case of the DRAM_ODT_EN symbol
that means that everything following the first two lines will never be
checked:
------------
config DRAM_ODT_EN
	bool "sunxi dram odt enable"
	default n if !MACH_SUN8I_A23
	default y if MACH_SUN8I_A23
	default y if MACH_SUN8I_R40
	default y if MACH_SUN50I
------------

Assuming that the "default y" for the A64 and the R40 were a deliberate
choice, fix the Kconfig stanza to take this into account.
Also remove the now redundant lines from the respective defconfigs.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
[jagan: droped 'default n' on original change]
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com> # A64, R40
Tested-by: Chen-Yu Tsai <wens@csie.org> # A23

Showing 5 changed files with 0 additions and 5 deletions Side-by-side Diff

arch/arm/mach-sunxi/Kconfig
... ... @@ -417,7 +417,6 @@
417 417  
418 418 config DRAM_ODT_EN
419 419 bool "sunxi dram odt enable"
420   - default n if !MACH_SUN8I_A23
421 420 default y if MACH_SUN8I_A23
422 421 default y if MACH_SUN8I_R40
423 422 default y if MACH_SUN50I
configs/Bananapi_M2_Ultra_defconfig
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_MACH_SUN8I_R40=y
5 5 CONFIG_DRAM_CLK=576
6 6 CONFIG_DRAM_ZQ=3881979
7   -CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MACPWR="PA17"
9 8 CONFIG_MMC0_CD_PIN="PH13"
10 9 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/amarula_a64_relic_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN50I=y
5 5 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
6   -CONFIG_DRAM_ODT_EN=y
7 6 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
8 7 # CONFIG_VIDEO_DE2 is not set
9 8 CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
configs/bananapi_m2_berry_defconfig
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_MACH_SUN8I_R40=y
5 5 CONFIG_DRAM_CLK=576
6 6 CONFIG_DRAM_ZQ=3881979
7   -CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MMC0_CD_PIN="PH13"
9 8 CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry"
10 9 CONFIG_AHCI=y
configs/sopine_baseboard_defconfig
... ... @@ -6,7 +6,6 @@
6 6 CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
7 7 CONFIG_DRAM_CLK=552
8 8 CONFIG_DRAM_ZQ=3881949
9   -CONFIG_DRAM_ODT_EN=y
10 9 CONFIG_MMC0_CD_PIN=""
11 10 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
12 11 CONFIG_SPL_SPI_SUNXI=y