From 9f5c895ec7761f376724332cb61b9222562835e1 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 27 Nov 2019 08:20:57 +0100 Subject: mb/*/*/Kconfig: Drop redundant redeclaration of MAINBOARD_VENDOR Change-Id: Ic92e08ae5b741889a8200d10ea8148e4b4384dc8 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/37270 Reviewed-by: HAOUAS Elyes Reviewed-by: David Guckian Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/mainboard/cavium/cn8100_sff_evb/Kconfig | 4 ---- src/mainboard/google/cheza/Kconfig | 4 ---- src/mainboard/google/cyan/Kconfig | 4 ---- src/mainboard/google/dragonegg/Kconfig | 4 ---- src/mainboard/google/drallion/Kconfig | 4 ---- src/mainboard/google/gru/Kconfig | 4 ---- src/mainboard/google/hatch/Kconfig | 4 ---- src/mainboard/google/mistral/Kconfig | 4 ---- src/mainboard/google/oak/Kconfig | 4 ---- src/mainboard/google/sarien/Kconfig | 4 ---- src/mainboard/google/trogdor/Kconfig | 4 ---- src/mainboard/google/veyron/Kconfig | 4 ---- src/mainboard/google/veyron_mickey/Kconfig | 4 ---- src/mainboard/google/veyron_rialto/Kconfig | 4 ---- src/mainboard/intel/apollolake_rvp/Kconfig | 4 ---- src/mainboard/intel/cannonlake_rvp/Kconfig | 4 ---- src/mainboard/intel/coffeelake_rvp/Kconfig | 4 ---- src/mainboard/intel/galileo/Kconfig | 4 ---- src/mainboard/intel/harcuvar/Kconfig | 4 ---- src/mainboard/intel/icelake_rvp/Kconfig | 4 ---- src/mainboard/intel/leafhill/Kconfig | 4 ---- src/mainboard/intel/strago/Kconfig | 4 ---- src/mainboard/kontron/ktqm77/Kconfig | 4 ---- src/mainboard/packardbell/ms2290/Kconfig | 4 ---- src/mainboard/purism/librem_bdw/Kconfig | 4 ---- src/mainboard/purism/librem_skl/Kconfig | 4 ---- src/mainboard/roda/rv11/Kconfig | 4 ---- src/mainboard/scaleway/tagada/Kconfig | 4 ---- src/mainboard/ti/beaglebone/Kconfig | 4 ---- 29 files changed, 116 deletions(-) diff --git a/src/mainboard/cavium/cn8100_sff_evb/Kconfig b/src/mainboard/cavium/cn8100_sff_evb/Kconfig index 0cb6f5a0b5f6..03e65f5de945 100644 --- a/src/mainboard/cavium/cn8100_sff_evb/Kconfig +++ b/src/mainboard/cavium/cn8100_sff_evb/Kconfig @@ -29,10 +29,6 @@ config MAINBOARD_DIR string default "cavium/cn8100_sff_evb" -config MAINBOARD_VENDOR - string - default "Cavium" - config DRAM_SIZE_MB int default 8192 diff --git a/src/mainboard/google/cheza/Kconfig b/src/mainboard/google/cheza/Kconfig index 30218ccb440a..3f3f75607b2d 100644 --- a/src/mainboard/google/cheza/Kconfig +++ b/src/mainboard/google/cheza/Kconfig @@ -27,10 +27,6 @@ config MAINBOARD_DIR string default "google/cheza" -config MAINBOARD_VENDOR - string - default "Google" - config DRIVER_TPM_SPI_BUS hex default 0x5 diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index bb5ffb692a24..6331419cd3aa 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -69,10 +69,6 @@ config MAINBOARD_PART_NUMBER default "Ultima" if BOARD_GOOGLE_ULTIMA default "Wizpig" if BOARD_GOOGLE_WIZPIG -config MAINBOARD_VENDOR - string - default "Google" - config DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" diff --git a/src/mainboard/google/dragonegg/Kconfig b/src/mainboard/google/dragonegg/Kconfig index 1891cbe0acf2..550d83a7df92 100644 --- a/src/mainboard/google/dragonegg/Kconfig +++ b/src/mainboard/google/dragonegg/Kconfig @@ -46,10 +46,6 @@ config MAINBOARD_PART_NUMBER string default "Dragonegg" -config MAINBOARD_VENDOR - string - default "Google" - config MAINBOARD_FAMILY string default "Google_Dragonegg" diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index 256f8cbdaebb..accb9c848369 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -74,10 +74,6 @@ config MAINBOARD_PART_NUMBER default "Sarien_cml" if BOARD_GOOGLE_SARIEN_CML default "Drallion" if BOARD_GOOGLE_DRALLION -config MAINBOARD_VENDOR - string - default "Google" - config MAX_CPUS int default 8 diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index 72003e0d06d3..6cf165c39596 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -69,10 +69,6 @@ config MAINBOARD_DIR string default "google/gru" -config MAINBOARD_VENDOR - string - default "Google" - config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 0x5 diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index d6e6e46f18c5..fce1b875fecb 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -97,10 +97,6 @@ config MAINBOARD_PART_NUMBER default "Kohaku" if BOARD_GOOGLE_KOHAKU default "Puff" if BOARD_GOOGLE_PUFF -config MAINBOARD_VENDOR - string - default "Google" - config MAX_CPUS int default 8 diff --git a/src/mainboard/google/mistral/Kconfig b/src/mainboard/google/mistral/Kconfig index 88e67097baf8..b7d0d312a29a 100644 --- a/src/mainboard/google/mistral/Kconfig +++ b/src/mainboard/google/mistral/Kconfig @@ -24,10 +24,6 @@ config MAINBOARD_DIR string default "google/mistral" -config MAINBOARD_VENDOR - string - default "Google" - ########################################################## #### Update below when adding a new derivative board. #### ########################################################## diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig index 264f3711e3d4..dc12816d6c4f 100644 --- a/src/mainboard/google/oak/Kconfig +++ b/src/mainboard/google/oak/Kconfig @@ -52,10 +52,6 @@ config MAINBOARD_DIR string default "google/oak" -config MAINBOARD_VENDOR - string - default "Google" - config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 0x0 diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index 455fbc205f31..3cd49650d9c8 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -76,10 +76,6 @@ config MAINBOARD_PART_NUMBER default "Arcada" if BOARD_GOOGLE_ARCADA default "Sarien" if BOARD_GOOGLE_SARIEN -config MAINBOARD_VENDOR - string - default "Google" - config MAX_CPUS int default 8 diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig index fba6b17667c7..27bd02316910 100644 --- a/src/mainboard/google/trogdor/Kconfig +++ b/src/mainboard/google/trogdor/Kconfig @@ -27,10 +27,6 @@ config MAINBOARD_DIR string default "google/trogdor" -config MAINBOARD_VENDOR - string - default "Google" - config DRIVER_TPM_SPI_BUS hex default 0x5 diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig index 5d1e616911fe..38c5c3b55268 100644 --- a/src/mainboard/google/veyron/Kconfig +++ b/src/mainboard/google/veyron/Kconfig @@ -58,10 +58,6 @@ config MAINBOARD_PART_NUMBER default "Veyron_Speedy" if BOARD_GOOGLE_VEYRON_SPEEDY default "Veyron" -config MAINBOARD_VENDOR - string - default "Google" - config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 0x0 diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 5d15f0ec77c6..1bedab71d808 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -38,10 +38,6 @@ config MAINBOARD_PART_NUMBER string default "Veyron_Mickey" -config MAINBOARD_VENDOR - string - default "Google" - config BOOT_DEVICE_SPI_FLASH_BUS int default 2 diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index ac6f38205447..5d4fab3182b7 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -38,10 +38,6 @@ config MAINBOARD_PART_NUMBER string default "Veyron_Rialto" -config MAINBOARD_VENDOR - string - default "Google" - config BOOT_DEVICE_SPI_FLASH_BUS int default 2 diff --git a/src/mainboard/intel/apollolake_rvp/Kconfig b/src/mainboard/intel/apollolake_rvp/Kconfig index 391ce1f4944b..dfd86eb3ea35 100644 --- a/src/mainboard/intel/apollolake_rvp/Kconfig +++ b/src/mainboard/intel/apollolake_rvp/Kconfig @@ -15,10 +15,6 @@ config MAINBOARD_PART_NUMBER string default "Apollolake RVP" -config MAINBOARD_VENDOR - string - default "Intel" - config UART_FOR_CONSOLE default 2 endif diff --git a/src/mainboard/intel/cannonlake_rvp/Kconfig b/src/mainboard/intel/cannonlake_rvp/Kconfig index d86e48564f18..133fe477f970 100644 --- a/src/mainboard/intel/cannonlake_rvp/Kconfig +++ b/src/mainboard/intel/cannonlake_rvp/Kconfig @@ -27,10 +27,6 @@ config MAINBOARD_PART_NUMBER string default "Cannonlake RVP" -config MAINBOARD_VENDOR - string - default "Intel" - config MAINBOARD_FAMILY string default "Intel_cannonlake_rvp" diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig index 13e55b3f93d5..5ae567d3260f 100644 --- a/src/mainboard/intel/coffeelake_rvp/Kconfig +++ b/src/mainboard/intel/coffeelake_rvp/Kconfig @@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER default "cmlrvp" if BOARD_INTEL_COMETLAKE_RVP default "cflrvp" -config MAINBOARD_VENDOR - string - default "Intel" - config MAINBOARD_FAMILY string default "Intel_whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig index 2e855da87aac..4ea7f474e361 100644 --- a/src/mainboard/intel/galileo/Kconfig +++ b/src/mainboard/intel/galileo/Kconfig @@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER string default "Galileo" -config MAINBOARD_VENDOR - string - default "Intel" - config GALILEO_GEN2 bool "Board generation: GEN1 (n) or GEN2 (y)" default y diff --git a/src/mainboard/intel/harcuvar/Kconfig b/src/mainboard/intel/harcuvar/Kconfig index e3cd86e8f7e2..271ff818922f 100644 --- a/src/mainboard/intel/harcuvar/Kconfig +++ b/src/mainboard/intel/harcuvar/Kconfig @@ -29,10 +29,6 @@ config MAINBOARD_PART_NUMBER string default "Harcuvar CRB" -config MAINBOARD_VENDOR - string - default "Intel" - config ENABLE_FSP_MEMORY_DOWN bool "Enable Memory Down" default n diff --git a/src/mainboard/intel/icelake_rvp/Kconfig b/src/mainboard/intel/icelake_rvp/Kconfig index 728a532054fc..8331f1bd9161 100644 --- a/src/mainboard/intel/icelake_rvp/Kconfig +++ b/src/mainboard/intel/icelake_rvp/Kconfig @@ -30,10 +30,6 @@ config MAINBOARD_PART_NUMBER string default "Icelake RVP" -config MAINBOARD_VENDOR - string - default "Intel" - config MAINBOARD_FAMILY string default "Intel_icelake_rvp" diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig index 5832570b54f1..97758e192f2f 100644 --- a/src/mainboard/intel/leafhill/Kconfig +++ b/src/mainboard/intel/leafhill/Kconfig @@ -15,10 +15,6 @@ config MAINBOARD_PART_NUMBER string default "Leafhill" -config MAINBOARD_VENDOR - string - default "Intel" - config FMDFILE string default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/leafhill.$(CONFIG_COREBOOT_ROMSIZE_KB).fmd" diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index 246add18957c..5e710a52bf7a 100644 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -30,10 +30,6 @@ config MAINBOARD_PART_NUMBER string default "Strago" -config MAINBOARD_VENDOR - string - default "Intel" - config VGA_BIOS_FILE string depends on VGA_BIOS diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig index 1cefa599b4c2..77775e6b8eac 100644 --- a/src/mainboard/kontron/ktqm77/Kconfig +++ b/src/mainboard/kontron/ktqm77/Kconfig @@ -31,8 +31,4 @@ config VGA_BIOS_FILE string default "pci8086,0166.rom" -config MAINBOARD_VENDOR - string - default "Kontron" - endif # BOARD_KONTRON_KTQM77 diff --git a/src/mainboard/packardbell/ms2290/Kconfig b/src/mainboard/packardbell/ms2290/Kconfig index 6a613849eaf5..819400257b8f 100644 --- a/src/mainboard/packardbell/ms2290/Kconfig +++ b/src/mainboard/packardbell/ms2290/Kconfig @@ -26,10 +26,6 @@ config MAINBOARD_VERSION string default "V1.20" -config MAINBOARD_VENDOR - string - default "Packard Bell" - config USBDEBUG_HCD_INDEX int default 2 diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig index 466e03ec7a99..7a8bc22459cd 100644 --- a/src/mainboard/purism/librem_bdw/Kconfig +++ b/src/mainboard/purism/librem_bdw/Kconfig @@ -42,10 +42,6 @@ config MAINBOARD_DIR string default "purism/librem_bdw" -config MAINBOARD_VENDOR - string - default "Purism" - config MAINBOARD_PART_NUMBER string default "Librem 13 v1" if BOARD_PURISM_LIBREM13_V1 diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index 05fd43d2de26..ca1582a50c41 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -23,10 +23,6 @@ config VARIANT_DIR default "librem13v2" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4 default "librem15v3" if BOARD_PURISM_LIBREM15_V3 || BOARD_PURISM_LIBREM15_V4 -config MAINBOARD_VENDOR - string - default "Purism" - config MAINBOARD_FAMILY string default "Librem 13" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4 diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig index 54f04c406ec8..70c383fc5504 100644 --- a/src/mainboard/roda/rv11/Kconfig +++ b/src/mainboard/roda/rv11/Kconfig @@ -37,8 +37,4 @@ config MAX_CPUS int default 8 -config MAINBOARD_VENDOR - string - default "Roda" - endif # BOARD_RODA_RV11 || BOARD_RODA_RW11 diff --git a/src/mainboard/scaleway/tagada/Kconfig b/src/mainboard/scaleway/tagada/Kconfig index 25cb7e13d710..21088cbb00a3 100644 --- a/src/mainboard/scaleway/tagada/Kconfig +++ b/src/mainboard/scaleway/tagada/Kconfig @@ -32,10 +32,6 @@ config MAINBOARD_PART_NUMBER string default "TAGADA" -config MAINBOARD_VENDOR - string - default "Scaleway" - config BMC_INFO_LOC hex "BMC information location in flash" default 0xff802000 diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig index 70096229b9c5..e4075d0d62c5 100644 --- a/src/mainboard/ti/beaglebone/Kconfig +++ b/src/mainboard/ti/beaglebone/Kconfig @@ -33,10 +33,6 @@ config MAX_CPUS int default 1 -config MAINBOARD_VENDOR - string - default "TI" - config DRAM_SIZE_MB int default 256 -- cgit v1.2.3