mb/*/*/Kconfig: Use CONFIG_VARIANT_DIR for devicetree

Change-Id: Ic9620cfa1630c7c085b6c244ca80dc023a181e30
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://review.coreboot.org/29595
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
This commit is contained in:
Peter Lemenkov 2018-11-06 22:09:18 +01:00 committed by Patrick Georgi
parent fd7fe58e60
commit 395cbb4f97
19 changed files with 21 additions and 85 deletions

View File

@ -62,11 +62,7 @@ config MAINBOARD_PART_NUMBER
config DEVICETREE
string
default "variants/g41c-gs-r2/devicetree.cb" if BOARD_ASROCK_G41C_GS_R2_0
default "variants/g41c-gs/devicetree.cb" if BOARD_ASROCK_G41C_GS
default "variants/g41m-gs/devicetree.cb" if BOARD_ASROCK_G41M_GS
default "variants/g41m-s3/devicetree.cb" if BOARD_ASROCK_G41M_S3
default "variants/g41m-vs3-r2/devicetree.cb" if BOARD_ASROCK_G41M_VS3_R2_0
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAX_CPUS
int

View File

@ -46,8 +46,7 @@ config MAINBOARD_PART_NUMBER
config DEVICETREE
string
default "variants/p5qc/devicetree.cb" if BOARD_ASUS_P5QC
default "variants/p5q_pro/devicetree.cb" if BOARD_ASUS_P5Q_PRO
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAX_CPUS
int

View File

@ -58,12 +58,7 @@ config GBB_HWID
config DEVICETREE
string
default "variants/auron_paine/devicetree.cb" if BOARD_GOOGLE_AURON_PAINE
default "variants/auron_yuna/devicetree.cb" if BOARD_GOOGLE_AURON_YUNA
default "variants/buddy/devicetree.cb" if BOARD_GOOGLE_BUDDY
default "variants/gandof/devicetree.cb" if BOARD_GOOGLE_GANDOF
default "variants/lulu/devicetree.cb" if BOARD_GOOGLE_LULU
default "variants/samus/devicetree.cb" if BOARD_GOOGLE_SAMUS
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config EC_GOOGLE_CHROMEEC_BOARDNAME
string

View File

@ -77,18 +77,7 @@ config MAINBOARD_VENDOR
config DEVICETREE
string
default "variants/banon/devicetree.cb" if BOARD_GOOGLE_BANON
default "variants/celes/devicetree.cb" if BOARD_GOOGLE_CELES
default "variants/cyan/devicetree.cb" if BOARD_GOOGLE_CYAN
default "variants/edgar/devicetree.cb" if BOARD_GOOGLE_EDGAR
default "variants/kefka/devicetree.cb" if BOARD_GOOGLE_KEFKA
default "variants/reks/devicetree.cb" if BOARD_GOOGLE_REKS
default "variants/relm/devicetree.cb" if BOARD_GOOGLE_RELM
default "variants/setzer/devicetree.cb" if BOARD_GOOGLE_SETZER
default "variants/terra/devicetree.cb" if BOARD_GOOGLE_TERRA
default "variants/ultima/devicetree.cb" if BOARD_GOOGLE_ULTIMA
default "variants/wizpig/devicetree.cb" if BOARD_GOOGLE_WIZPIG
default "variants/${CONFIG_VARIANT_DIR}/devicetree.cb"
config VGA_BIOS_FILE
string

View File

@ -60,13 +60,7 @@ config VARIANT_DIR
config DEVICETREE
string
default "variants/asuka/devicetree.cb" if BOARD_GOOGLE_ASUKA
default "variants/caroline/devicetree.cb" if BOARD_GOOGLE_CAROLINE
default "variants/cave/devicetree.cb" if BOARD_GOOGLE_CAVE
default "variants/chell/devicetree.cb" if BOARD_GOOGLE_CHELL
default "variants/glados/devicetree.cb" if BOARD_GOOGLE_GLADOS
default "variants/lars/devicetree.cb" if BOARD_GOOGLE_LARS
default "variants/sentry/devicetree.cb" if BOARD_GOOGLE_SENTRY
default "variants/${CONFIG_VARIANT_DIR}/devicetree.cb"
config MAX_CPUS
int

View File

@ -84,22 +84,7 @@ config GBB_HWID
config DEVICETREE
string
default "variants/banjo/devicetree.cb" if BOARD_GOOGLE_BANJO
default "variants/candy/devicetree.cb" if BOARD_GOOGLE_CANDY
default "variants/clapper/devicetree.cb" if BOARD_GOOGLE_CLAPPER
default "variants/enguarde/devicetree.cb" if BOARD_GOOGLE_ENGUARDE
default "variants/glimmer/devicetree.cb" if BOARD_GOOGLE_GLIMMER
default "variants/gnawty/devicetree.cb" if BOARD_GOOGLE_GNAWTY
default "variants/heli/devicetree.cb" if BOARD_GOOGLE_HELI
default "variants/kip/devicetree.cb" if BOARD_GOOGLE_KIP
default "variants/ninja/devicetree.cb" if BOARD_GOOGLE_NINJA
default "variants/orco/devicetree.cb" if BOARD_GOOGLE_ORCO
default "variants/quawks/devicetree.cb" if BOARD_GOOGLE_QUAWKS
default "variants/rambi/devicetree.cb" if BOARD_GOOGLE_RAMBI
default "variants/squawks/devicetree.cb" if BOARD_GOOGLE_SQUAWKS
default "variants/sumo/devicetree.cb" if BOARD_GOOGLE_SUMO
default "variants/swanky/devicetree.cb" if BOARD_GOOGLE_SWANKY
default "variants/winky/devicetree.cb" if BOARD_GOOGLE_WINKY
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config EC_GOOGLE_CHROMEEC_BOARDNAME
string

View File

@ -31,11 +31,6 @@ config CHROMEOS
select GBB_FLAG_FORCE_DEV_BOOT_LEGACY
select GBB_FLAG_FORCE_MANUAL_RECOVERY
config DEVICETREE
string
default "variants/arcada/devicetree.cb" if BOARD_GOOGLE_ARCADA
default "variants/sarien/devicetree.cb" if BOARD_GOOGLE_SARIEN
config DIMM_MAX
int
default 2
@ -89,6 +84,10 @@ config VARIANT_DIR
default "arcada" if BOARD_GOOGLE_ARCADA
default "sarien" if BOARD_GOOGLE_SARIEN
config DEVICETREE
string
default "variants/${CONFIG_VARIANT_DIR}/devicetree.cb"
config VBOOT
select HAS_RECOVERY_MRC_CACHE
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN

View File

@ -56,10 +56,7 @@ config GBB_HWID
config DEVICETREE
string
default "variants/falco/devicetree.cb" if BOARD_GOOGLE_FALCO
default "variants/leon/devicetree.cb" if BOARD_GOOGLE_LEON
default "variants/peppy/devicetree.cb" if BOARD_GOOGLE_PEPPY
default "variants/wolf/devicetree.cb" if BOARD_GOOGLE_WOLF
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MMCONF_BASE_ADDRESS
hex

View File

@ -37,8 +37,7 @@ config MAINBOARD_DIR
config DEVICETREE
string
default "variants/t520/devicetree.cb" if BOARD_LENOVO_T520
default "variants/w520/devicetree.cb" if BOARD_LENOVO_W520
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER
string

View File

@ -39,8 +39,7 @@ config MAINBOARD_DIR
config DEVICETREE
string
default "variants/t530/devicetree.cb" if BOARD_LENOVO_T530
default "variants/w530/devicetree.cb" if BOARD_LENOVO_W530
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER
string

View File

@ -59,8 +59,7 @@ config MAINBOARD_PART_NUMBER
config DEVICETREE
string
default "variants/rotundu/devicetree.cb" if BOARD_OPENCELLULAR_ROTUNDU
default "variants/supabrckv1/devicetree.cb" if BOARD_OPENCELLULAR_SUPABRCKV1
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAINBOARD_DIR
string

View File

@ -17,8 +17,7 @@ config VARIANT_DIR
config DEVICETREE
string
default "variants/librem13v1/devicetree.cb" if BOARD_PURISM_LIBREM13_V1
default "variants/librem15v2/devicetree.cb" if BOARD_PURISM_LIBREM15_V2
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config DRIVERS_PS2_KEYBOARD
def_bool y

View File

@ -47,8 +47,7 @@ config MAINBOARD_DIR
config DEVICETREE
string
default "variants/librem13v2/devicetree.cb" if BOARD_PURISM_LIBREM13_V2
default "variants/librem15v3/devicetree.cb" if BOARD_PURISM_LIBREM15_V3
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAX_CPUS
int

View File

@ -27,8 +27,7 @@ config VARIANT_DIR
config DEVICETREE
string
default "variants/rv11/devicetree.cb" if BOARD_RODA_RV11
default "variants/rw11/devicetree.cb" if BOARD_RODA_RW11
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER
string

View File

@ -21,6 +21,10 @@ config VARIANT_DIR
default "mc_apl3" if BOARD_SIEMENS_MC_APL3
default "mc_apl4" if BOARD_SIEMENS_MC_APL4
config DEVICETREE
string
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER
string
default "MC APL1" if BOARD_SIEMENS_MC_APL1

View File

@ -9,8 +9,4 @@ config BOARD_SIEMENS_MC_APL1_VAR
select NC_FPGA_NOTIFY_CB_READY
select APL_SKIP_SET_POWER_LIMITS
config DEVICETREE
string
default "variants/mc_apl1/devicetree.cb"
endif # BOARD_SIEMENS_MC_APL1

View File

@ -7,8 +7,4 @@ config BOARD_SIEMENS_MC_APL2_VAR
select DRIVERS_I2C_RX6110SA
select DRIVER_SIEMENS_NC_FPGA
config DEVICETREE
string
default "variants/mc_apl2/devicetree.cb"
endif # BOARD_SIEMENS_MC_APL2

View File

@ -9,8 +9,4 @@ config BOARD_SIEMENS_MC_APL3_VAR
select NC_FPGA_NOTIFY_CB_READY
select APL_SKIP_SET_POWER_LIMITS
config DEVICETREE
string
default "variants/mc_apl3/devicetree.cb"
endif # BOARD_SIEMENS_MC_APL3

View File

@ -5,8 +5,4 @@ config BOARD_SIEMENS_MC_APL4_VAR
def_bool y
select DRIVER_INTEL_I210
config DEVICETREE
string
default "variants/mc_apl4/devicetree.cb"
endif # BOARD_SIEMENS_MC_APL4