8094f0cb0c
"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
17 lines
397 B
Plaintext
17 lines
397 B
Plaintext
CONFIG_ARM=y
|
|
CONFIG_ARCH_SUNXI=y
|
|
CONFIG_SPL=y
|
|
CONFIG_MACH_SUN8I_R40=y
|
|
CONFIG_DRAM_CLK=576
|
|
CONFIG_DRAM_ZQ=3881979
|
|
CONFIG_MMC0_CD_PIN="PH13"
|
|
CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry"
|
|
CONFIG_AHCI=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_SCSI_AHCI=y
|
|
CONFIG_AXP_DLDO4_VOLT=2500
|
|
CONFIG_AXP_ELDO3_VOLT=1200
|
|
CONFIG_SCSI=y
|