coreboot-gerrit September 2020

coreboot-gerrit@coreboot.org

1 participants
2629 discussions

Change in coreboot[master]: [test] use gcc -Wunused-macros warning option
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45086 ) Change subject: [test] use gcc -Wunused-macros warning option ...................................................................... [test] use gcc -Wunused-macros warning option Change-Id: I2750a5a132347574fc895e1ce2617917cb468af3 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/45086/1 diff --git a/Makefile.inc b/Makefile.inc index ab0e5bb..af71728 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -425,7 +425,7 @@ CFLAGS_common += -pipe -g -nostdinc -std=gnu11 CFLAGS_common += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes CFLAGS_common += -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Wimplicit-fallthrough -CFLAGS_common += -Wshadow -Wdate-time -Wtype-limits -Wvla +CFLAGS_common += -Wshadow -Wdate-time -Wtype-limits -Wvla -Wunused-macros CFLAGS_common += -Wlogical-op -Wduplicated-cond -Wdangling-else CFLAGS_common += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer CFLAGS_common += -fstrict-aliasing -ffunction-sections -fdata-sections -fno-pie -- To view, visit https://review.coreboot.org/c/coreboot/+/45086 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2750a5a132347574fc895e1ce2617917cb468af3 Gerrit-Change-Number: 45086 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

1 1

Change in coreboot[master]: soc/intel/baytrail: Fix 32-bit RW PCI_BASE_ADDRESS_0 register
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41610 ) Change subject: soc/intel/baytrail: Fix 32-bit RW PCI_BASE_ADDRESS_0 register ...................................................................... soc/intel/baytrail: Fix 32-bit RW PCI_BASE_ADDRESS_0 register Change-Id: Ie2543935c3bc96702bb9c9259c3f434d61317d9c Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/soc/intel/baytrail/ehci.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/41610/1 diff --git a/src/soc/intel/baytrail/ehci.c b/src/soc/intel/baytrail/ehci.c index 16baa51..f88efdc 100644 --- a/src/soc/intel/baytrail/ehci.c +++ b/src/soc/intel/baytrail/ehci.c @@ -69,7 +69,7 @@ }; static const struct reg_script ehci_hc_reset[] = { - REG_RES_OR16(PCI_BASE_ADDRESS_0, USB2CMD, USB2CMD_HCRESET), + REG_RES_OR32(PCI_BASE_ADDRESS_0, USB2CMD, USB2CMD_HCRESET), REG_SCRIPT_END }; -- To view, visit https://review.coreboot.org/c/coreboot/+/41610 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie2543935c3bc96702bb9c9259c3f434d61317d9c Gerrit-Change-Number: 41610 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: soc/intel/denverton_ns/bootblock: Fix 32-bit RW PCI_BASE_ADDRESS_0 re...
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41609 ) Change subject: soc/intel/denverton_ns/bootblock: Fix 32-bit RW PCI_BASE_ADDRESS_0 register ...................................................................... soc/intel/denverton_ns/bootblock: Fix 32-bit RW PCI_BASE_ADDRESS_0 register Change-Id: I2b65b2aee672808932e32438410a4ebe8fa37606 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/soc/intel/denverton_ns/bootblock/uart.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/41609/1 diff --git a/src/soc/intel/denverton_ns/bootblock/uart.c b/src/soc/intel/denverton_ns/bootblock/uart.c index 7514fee..78018ca 100644 --- a/src/soc/intel/denverton_ns/bootblock/uart.c +++ b/src/soc/intel/denverton_ns/bootblock/uart.c @@ -17,15 +17,13 @@ static void pci_early_hsuart_device_probe(u8 bus, u8 dev, u8 func, u32 mmio_base) { - register uint16_t reg16; pci_devfn_t uart_dev = PCI_DEV(bus, dev, func); /* We're using MMIO for HSUARTs. This section is needed for logging * from FSP only */ /* Decode IOBASE at IOBA (BAR0). */ - reg16 = pci_read_config16(uart_dev, PCI_BASE_ADDRESS_0) | mmio_base; - pci_write_config16(uart_dev, PCI_BASE_ADDRESS_0, reg16); + pci_or_config32(uart_dev, PCI_BASE_ADDRESS_0, mmio_base); #if (CONFIG(NON_LEGACY_UART_MODE)) /* Decode MMIO at MEMBA (BAR1) */ -- To view, visit https://review.coreboot.org/c/coreboot/+/41609 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2b65b2aee672808932e32438410a4ebe8fa37606 Gerrit-Change-Number: 41609 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

3 3

Change in coreboot[master]: mb/*/Kconfig: Remove redundant 'MAINBOARD_VENDOR' type define
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45121 ) Change subject: mb/*/Kconfig: Remove redundant 'MAINBOARD_VENDOR' type define ...................................................................... mb/*/Kconfig: Remove redundant 'MAINBOARD_VENDOR' type define MAINBOARD_VENDOR is already declared as a string. Change-Id: If6b565c538d751e06207d39c5da3f12ae800f385 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/mainboard/51nb/Kconfig M src/mainboard/dell/Kconfig M src/mainboard/libretrend/Kconfig M src/mainboard/ocp/Kconfig M src/mainboard/prodrive/Kconfig 5 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/45121/1 diff --git a/src/mainboard/51nb/Kconfig b/src/mainboard/51nb/Kconfig index 5124fdb..d0efbc6 100644 --- a/src/mainboard/51nb/Kconfig +++ b/src/mainboard/51nb/Kconfig @@ -12,7 +12,6 @@ source "src/mainboard/51nb/*/Kconfig" config MAINBOARD_VENDOR - string "Mainboard Vendor" default "51NB" endif # VENDOR_51NB diff --git a/src/mainboard/dell/Kconfig b/src/mainboard/dell/Kconfig index 298c62b..d95850d 100644 --- a/src/mainboard/dell/Kconfig +++ b/src/mainboard/dell/Kconfig @@ -10,7 +10,6 @@ source "src/mainboard/dell/*/Kconfig" config MAINBOARD_VENDOR - string default "Dell Inc." endif # VENDOR_DELL diff --git a/src/mainboard/libretrend/Kconfig b/src/mainboard/libretrend/Kconfig index 7e1eacd..0612ec7 100644 --- a/src/mainboard/libretrend/Kconfig +++ b/src/mainboard/libretrend/Kconfig @@ -10,7 +10,6 @@ source "src/mainboard/libretrend/*/Kconfig" config MAINBOARD_VENDOR - string "Mainboard Vendor" default "Libretrend" endif # VENDOR_LIBRETREND diff --git a/src/mainboard/ocp/Kconfig b/src/mainboard/ocp/Kconfig index b748129..9269bfa 100644 --- a/src/mainboard/ocp/Kconfig +++ b/src/mainboard/ocp/Kconfig @@ -10,7 +10,6 @@ source "src/mainboard/ocp/*/Kconfig" config MAINBOARD_VENDOR - string default "Open Compute Project" endif # VENDOR_OCP diff --git a/src/mainboard/prodrive/Kconfig b/src/mainboard/prodrive/Kconfig index 0847425..62524d0 100644 --- a/src/mainboard/prodrive/Kconfig +++ b/src/mainboard/prodrive/Kconfig @@ -10,7 +10,6 @@ source "src/mainboard/prodrive/*/Kconfig" config MAINBOARD_VENDOR - string default "Prodrive" endif # VENDOR_PRODRIVE -- To view, visit https://review.coreboot.org/c/coreboot/+/45121 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6b565c538d751e06207d39c5da3f12ae800f385 Gerrit-Change-Number: 45121 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

2 6

Change in coreboot[master]: mb/*/Kconfig: Add missing 'int' for UART_FOR_CONSOLE
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45066 ) Change subject: mb/*/Kconfig: Add missing 'int' for UART_FOR_CONSOLE ...................................................................... mb/*/Kconfig: Add missing 'int' for UART_FOR_CONSOLE Change-Id: I7b49753c0eb0330990e41716d5c73913e4683487 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/mainboard/google/hatch/Kconfig M src/mainboard/intel/apollolake_rvp/Kconfig M src/mainboard/intel/leafhill/Kconfig M src/mainboard/intel/minnow3/Kconfig M src/mainboard/siemens/mc_apl1/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig 6 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/45066/1 diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index ee9210d..95ea7f8 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -90,6 +90,7 @@ default 0x1 config UART_FOR_CONSOLE + int default 0 if BOARD_GOOGLE_BASEBOARD_HATCH diff --git a/src/mainboard/intel/apollolake_rvp/Kconfig b/src/mainboard/intel/apollolake_rvp/Kconfig index dfd86eb..7d56566 100644 --- a/src/mainboard/intel/apollolake_rvp/Kconfig +++ b/src/mainboard/intel/apollolake_rvp/Kconfig @@ -16,5 +16,6 @@ default "Apollolake RVP" config UART_FOR_CONSOLE + int default 2 endif diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig index 652a659..d13b493 100644 --- a/src/mainboard/intel/leafhill/Kconfig +++ b/src/mainboard/intel/leafhill/Kconfig @@ -20,6 +20,7 @@ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/leafhill.\$(CONFIG_COREBOOT_ROMSIZE_KB).fmd" config UART_FOR_CONSOLE + int default 2 config NEED_IFWI diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig index 0c86df6..9c1491b 100644 --- a/src/mainboard/intel/minnow3/Kconfig +++ b/src/mainboard/intel/minnow3/Kconfig @@ -20,6 +20,7 @@ default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/minnow3.fmd" config UART_FOR_CONSOLE + int default 2 config NEED_IFWI diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig index 0fe4a25..031394e 100644 --- a/src/mainboard/siemens/mc_apl1/Kconfig +++ b/src/mainboard/siemens/mc_apl1/Kconfig @@ -38,6 +38,7 @@ default "MC APL6" if BOARD_SIEMENS_MC_APL6 config UART_FOR_CONSOLE + int default 2 config MAX_CPUS diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig index 50a390b..a7eb8eb 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig @@ -12,6 +12,7 @@ select TPM_MEASURED_BOOT config UART_FOR_CONSOLE + int default 1 config CBFS_SIZE -- To view, visit https://review.coreboot.org/c/coreboot/+/45066 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b49753c0eb0330990e41716d5c73913e4683487 Gerrit-Change-Number: 45066 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

3 7

Change in coreboot[master]: mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45124 ) Change subject: mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR ...................................................................... mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR Change-Id: Ife0355d741f2ba4dc01c1baa9f3c9a345d24e65a Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/mainboard/biostar/Kconfig M src/mainboard/emulation/qemu-aarch64/Kconfig M src/mainboard/emulation/qemu-armv7/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/mainboard/emulation/qemu-power8/Kconfig M src/mainboard/emulation/qemu-q35/Kconfig M src/mainboard/emulation/qemu-riscv/Kconfig M src/mainboard/emulation/spike-riscv/Kconfig M src/mainboard/facebook/fbg1701/Kconfig 9 files changed, 29 insertions(+), 30 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/45124/1 diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig index 1122c43..ae502cb 100644 --- a/src/mainboard/biostar/Kconfig +++ b/src/mainboard/biostar/Kconfig @@ -11,7 +11,6 @@ source "src/mainboard/biostar/*/Kconfig" - config MAINBOARD_VENDOR default "Biostar" diff --git a/src/mainboard/emulation/qemu-aarch64/Kconfig b/src/mainboard/emulation/qemu-aarch64/Kconfig index 06a7ea8..c2b0003 100644 --- a/src/mainboard/emulation/qemu-aarch64/Kconfig +++ b/src/mainboard/emulation/qemu-aarch64/Kconfig @@ -22,14 +22,14 @@ select MISSING_BOARD_RESET select ARM64_USE_ARM_TRUSTED_FIRMWARE -config MEMLAYOUT_LD_FILE - string - default "src/mainboard/emulation/qemu-aarch64/memlayout.ld" - config MAINBOARD_DIR string default "emulation/qemu-aarch64" +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/memlayout.ld" + config MAINBOARD_PART_NUMBER string default "QEMU AArch64" diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig index a912998..000d49b 100644 --- a/src/mainboard/emulation/qemu-armv7/Kconfig +++ b/src/mainboard/emulation/qemu-armv7/Kconfig @@ -24,14 +24,14 @@ select MISSING_BOARD_RESET select NO_MONOTONIC_TIMER -config MEMLAYOUT_LD_FILE - string - default "src/mainboard/emulation/qemu-armv7/memlayout.ld" - config MAINBOARD_DIR string default "emulation/qemu-armv7" +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/memlayout.ld" + config MAINBOARD_PART_NUMBER string default "QEMU ARMv7" diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 9187b05..cb77719 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -33,6 +33,10 @@ endif +config MAINBOARD_DIR + string + default "emulation/qemu-i440fx" + config FMDFILE string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A @@ -41,10 +45,6 @@ hex default 0x2c -config MAINBOARD_DIR - string - default "emulation/qemu-i440fx" - config MAINBOARD_PART_NUMBER string default "QEMU x86 i440fx/piix4" diff --git a/src/mainboard/emulation/qemu-power8/Kconfig b/src/mainboard/emulation/qemu-power8/Kconfig index 5dbea72..8a41743 100644 --- a/src/mainboard/emulation/qemu-power8/Kconfig +++ b/src/mainboard/emulation/qemu-power8/Kconfig @@ -17,14 +17,14 @@ select BOOT_DEVICE_NOT_SPI_FLASH select MISSING_BOARD_RESET -config MEMLAYOUT_LD_FILE - string - default "src/mainboard/emulation/qemu-power8/memlayout.ld" - config MAINBOARD_DIR string default "emulation/qemu-power8" +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/memlayout.ld" + config MAINBOARD_PART_NUMBER string default "QEMU POWER8" diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index edd2b2c..fa5f9bd 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -27,6 +27,10 @@ select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC select GBB_FLAG_DISABLE_FWMP +config MAINBOARD_DIR + string + default "emulation/qemu-q35" + config FMDFILE string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB @@ -43,10 +47,6 @@ hex default 0x2c -config MAINBOARD_DIR - string - default "emulation/qemu-q35" - config MAINBOARD_PART_NUMBER string default "QEMU x86 q35/ich9" diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig index 5b556fc..15a4dc5 100644 --- a/src/mainboard/emulation/qemu-riscv/Kconfig +++ b/src/mainboard/emulation/qemu-riscv/Kconfig @@ -30,14 +30,14 @@ select DRIVERS_UART_8250MEM select RISCV_HAS_OPENSBI -config MEMLAYOUT_LD_FILE - string - default "src/mainboard/emulation/qemu-riscv/memlayout.ld" - config MAINBOARD_DIR string default "emulation/qemu-riscv" +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/memlayout.ld" + config MAINBOARD_PART_NUMBER string default "QEMU RISCV" diff --git a/src/mainboard/emulation/spike-riscv/Kconfig b/src/mainboard/emulation/spike-riscv/Kconfig index 3c1ae12..0a4e82f 100644 --- a/src/mainboard/emulation/spike-riscv/Kconfig +++ b/src/mainboard/emulation/spike-riscv/Kconfig @@ -11,14 +11,14 @@ select BOOT_DEVICE_NOT_SPI_FLASH select MISSING_BOARD_RESET -config MEMLAYOUT_LD_FILE - string - default "src/mainboard/emulation/spike-riscv/memlayout.ld" - config MAINBOARD_DIR string default "emulation/spike-riscv" +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/memlayout.ld" + config MAINBOARD_PART_NUMBER string default "SPIKE RISCV" diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig index ca19e05..cb283a5 100644 --- a/src/mainboard/facebook/fbg1701/Kconfig +++ b/src/mainboard/facebook/fbg1701/Kconfig @@ -74,7 +74,7 @@ config VENDORCODE_ELTAN_VBOOT_MANIFEST string - default "mainboard/facebook/fbg1701/manifest.h" + default "mainboard/\$(CONFIG_MAINBOARD_DIR)/manifest.h" config VENDORCODE_ELTAN_VBOOT_KEY_LOCATION hex -- To view, visit https://review.coreboot.org/c/coreboot/+/45124 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ife0355d741f2ba4dc01c1baa9f3c9a345d24e65a Gerrit-Change-Number: 45124 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

1 3

Change in coreboot[master]: mb/prodrive/hermes: Clean-up Kconfig
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45102 ) Change subject: mb/prodrive/hermes: Clean-up Kconfig ...................................................................... mb/prodrive/hermes: Clean-up Kconfig This fix 'util/lint/kconfig_lint' warning: 'Warning: Unused symbol 'BOARD_PRODRIVE_HERMES' referenced at src/mainboard/prodrive/hermes/Kconfig.name:1' Change-Id: I6d80a52b374fa4c6f665b42bdf3591fb87238525 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/mainboard/prodrive/hermes/Kconfig M src/mainboard/prodrive/hermes/Kconfig.name 2 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/45102/1 diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig index 6a79f5b..366f7fd 100644 --- a/src/mainboard/prodrive/hermes/Kconfig +++ b/src/mainboard/prodrive/hermes/Kconfig @@ -1,5 +1,7 @@ -config BOARD_PRODRIVE_HERMES_BASEBOARD - def_bool n +if BOARD_PRODRIVE_HERMES + +config BOARD_SPECIFIC_OPTIONS + def_bool y select SOC_INTEL_COFFEELAKE select BOARD_ROMSIZE_KB_32768 select GENERIC_SPD_BIN @@ -19,8 +21,6 @@ select ONBOARD_VGA_IS_PRIMARY select DISABLE_ACPI_HIBERNATE -if BOARD_PRODRIVE_HERMES_BASEBOARD - config MAINBOARD_FAMILY string default "PRODRIVE_HERMES_SERIES" @@ -43,7 +43,7 @@ config VARIANT_DIR string - default "baseboard" if BOARD_PRODRIVE_HERMES_BASEBOARD + default "baseboard" if BOARD_PRODRIVE_HERMES config MAX_CPUS int @@ -69,4 +69,4 @@ hex default 0x900000 -endif # BOARD_PRODRIVE_HERMES_BASEBOARD +endif # BOARD_PRODRIVE_HERMES diff --git a/src/mainboard/prodrive/hermes/Kconfig.name b/src/mainboard/prodrive/hermes/Kconfig.name index 10dd9ba..4aff62f 100644 --- a/src/mainboard/prodrive/hermes/Kconfig.name +++ b/src/mainboard/prodrive/hermes/Kconfig.name @@ -1,3 +1,2 @@ config BOARD_PRODRIVE_HERMES bool "Hermes" - select BOARD_PRODRIVE_HERMES_BASEBOARD -- To view, visit https://review.coreboot.org/c/coreboot/+/45102 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6d80a52b374fa4c6f665b42bdf3591fb87238525 Gerrit-Change-Number: 45102 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

4 7

Change in coreboot[master]: mb/Kconfig: Move MAINBOARD_VENDOR declaration before default entrie
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45135 ) Change subject: mb/Kconfig: Move MAINBOARD_VENDOR declaration before default entrie ...................................................................... mb/Kconfig: Move MAINBOARD_VENDOR declaration before default entrie This is to make it visible in kconfig tools. Change-Id: I2f5c89351c3b31b51c6fe3deebcbe2e7ccbb3105 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/mainboard/Kconfig 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/45135/1 diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 77fcba1..9ab047c 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -8,11 +8,11 @@ endchoice -source "src/mainboard/*/Kconfig" - config MAINBOARD_VENDOR string "Mainboard vendor name" +source "src/mainboard/*/Kconfig" + config BOARD_ROMSIZE_KB_64 bool config BOARD_ROMSIZE_KB_128 -- To view, visit https://review.coreboot.org/c/coreboot/+/45135 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2f5c89351c3b31b51c6fe3deebcbe2e7ccbb3105 Gerrit-Change-Number: 45135 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

2 3

Change in coreboot[master]: mb/Kconfig: Move MAINBOARD_FAMILY type definition to mb/Kconfig
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45123 ) Change subject: mb/Kconfig: Move MAINBOARD_FAMILY type definition to mb/Kconfig ...................................................................... mb/Kconfig: Move MAINBOARD_FAMILY type definition to mb/Kconfig Change-Id: If007988496c972185bad097535c5fd30ccfcd45b Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/mainboard/51nb/x210/Kconfig M src/mainboard/Kconfig M src/mainboard/bostentech/Kconfig M src/mainboard/facebook/monolith/Kconfig M src/mainboard/google/beltino/Kconfig M src/mainboard/google/cyan/Kconfig M src/mainboard/google/dedede/Kconfig M src/mainboard/google/deltaur/Kconfig M src/mainboard/google/drallion/Kconfig M src/mainboard/google/eve/Kconfig M src/mainboard/google/fizz/Kconfig M src/mainboard/google/glados/Kconfig M src/mainboard/google/hatch/Kconfig M src/mainboard/google/kahlee/Kconfig M src/mainboard/google/octopus/Kconfig M src/mainboard/google/poppy/Kconfig M src/mainboard/google/reef/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/slippy/Kconfig M src/mainboard/google/volteer/Kconfig M src/mainboard/google/zork/Kconfig M src/mainboard/intel/cannonlake_rvp/Kconfig M src/mainboard/intel/coffeelake_rvp/Kconfig M src/mainboard/intel/glkrvp/Kconfig M src/mainboard/intel/icelake_rvp/Kconfig M src/mainboard/intel/jasperlake_rvp/Kconfig M src/mainboard/intel/kblrvp/Kconfig M src/mainboard/intel/kunimitsu/Kconfig M src/mainboard/intel/saddlebrook/Kconfig M src/mainboard/intel/tglrvp/Kconfig M src/mainboard/lenovo/Kconfig M src/mainboard/ocp/deltalake/Kconfig M src/mainboard/ocp/tiogapass/Kconfig M src/mainboard/prodrive/hermes/Kconfig M src/mainboard/purism/librem_bdw/Kconfig M src/mainboard/purism/librem_skl/Kconfig M src/mainboard/purism/librem_whl/Kconfig M src/mainboard/razer/blade_stealth_kbl/Kconfig M src/mainboard/supermicro/x11-lga1151-series/Kconfig 39 files changed, 5 insertions(+), 38 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/45123/1 diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig index 824e8b3..771cb30 100644 --- a/src/mainboard/51nb/x210/Kconfig +++ b/src/mainboard/51nb/x210/Kconfig @@ -13,7 +13,6 @@ select SYSTEM_TYPE_LAPTOP config MAINBOARD_FAMILY - string default "X210" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 9ab047c..2cb932f 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -11,6 +11,11 @@ config MAINBOARD_VENDOR string "Mainboard vendor name" +config MAINBOARD_FAMILY + string + help + This text string identifies the family to which a particular computer belongs. + source "src/mainboard/*/Kconfig" config BOARD_ROMSIZE_KB_64 diff --git a/src/mainboard/bostentech/Kconfig b/src/mainboard/bostentech/Kconfig index 15a7657..01c8850 100644 --- a/src/mainboard/bostentech/Kconfig +++ b/src/mainboard/bostentech/Kconfig @@ -13,7 +13,6 @@ default "Shenzhen Bostrontium Teng Technology" config MAINBOARD_FAMILY - string default MAINBOARD_PART_NUMBER endif # VENDOR_BOSTENTECH diff --git a/src/mainboard/facebook/monolith/Kconfig b/src/mainboard/facebook/monolith/Kconfig index 92c02a7..8e5cce7 100644 --- a/src/mainboard/facebook/monolith/Kconfig +++ b/src/mainboard/facebook/monolith/Kconfig @@ -30,7 +30,6 @@ default "Monolith" config MAINBOARD_FAMILY - string default "Facebook Monolith" config MAX_CPUS diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig index 0ac6805..0a7412b 100644 --- a/src/mainboard/google/beltino/Kconfig +++ b/src/mainboard/google/beltino/Kconfig @@ -40,7 +40,6 @@ default "Zako" if BOARD_GOOGLE_ZAKO config MAINBOARD_FAMILY - string default "Google_Beltino" config VGA_BIOS_FILE diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index a3db6d7..0cefbcb 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -36,7 +36,6 @@ default "google/cyan" config MAINBOARD_FAMILY - string default "Intel_Strago" if !BOARD_GOOGLE_CYAN default "" diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index dd1125e..f8426d2 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -63,7 +63,6 @@ default "google/dedede" config MAINBOARD_FAMILY - string default "Google_Dedede" if BOARD_GOOGLE_DEDEDE config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index dafd593..8b56081 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -63,7 +63,6 @@ default "google/deltaur" config MAINBOARD_FAMILY - string default "Google_Deltaur" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index ae10b78..896fc42 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -71,7 +71,6 @@ default "google/drallion" config MAINBOARD_FAMILY - string default "Google_Drallion" if BOARD_GOOGLE_DRALLION config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index dcc5b38..92a8179 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -59,7 +59,6 @@ default "Eve" config MAINBOARD_FAMILY - string default "Google_Eve" config MAX_CPUS diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 90a3dc4..6e74137 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -57,7 +57,6 @@ default "Endeavour" if BOARD_GOOGLE_ENDEAVOUR config MAINBOARD_FAMILY - string default "Google_Fizz" if BOARD_GOOGLE_FIZZ default "Google_Kalista" if BOARD_GOOGLE_KARMA default "Google_Endeavour" if BOARD_GOOGLE_ENDEAVOUR diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 9790552..069358c 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -47,7 +47,6 @@ default "Sentry" if BOARD_GOOGLE_SENTRY config MAINBOARD_FAMILY - string default "Google_Glados" config VARIANT_DIR diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 690acd1..2cc00e0 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -115,7 +115,6 @@ default "google/hatch" config MAINBOARD_FAMILY - string default "Google_Hatch" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index a9ba0f5..87e188f 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -65,7 +65,6 @@ default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb" config MAINBOARD_FAMILY - string default "Google_Kahlee" config FMDFILE diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index d01d95f..55789be 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -94,7 +94,6 @@ default "Foob" if BOARD_GOOGLE_FOOB config MAINBOARD_FAMILY - string default "Google_Octopus" config MAX_CPUS diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 74b4da6..397d55d 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -88,7 +88,6 @@ default "google/poppy" config MAINBOARD_FAMILY - string default "Google_Atlas" if BOARD_GOOGLE_ATLAS default "Google_Poppy" if BOARD_GOOGLE_POPPY default "Google_Nami" if BOARD_GOOGLE_NAMI diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index df1d8c4..93dbfc4 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -77,7 +77,6 @@ default "Coral" if BOARD_GOOGLE_CORAL config MAINBOARD_FAMILY - string default "Google_Coral" if BOARD_GOOGLE_CORAL default "Google_Reef" diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index 31a770a..c8a48fc 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -67,7 +67,6 @@ default "google/sarien" config MAINBOARD_FAMILY - string default "Google_Arcada" if BOARD_GOOGLE_ARCADA default "Google_Sarien" if BOARD_GOOGLE_SARIEN diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 931d3ce..950afb3 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -44,7 +44,6 @@ default "Wolf" if BOARD_GOOGLE_WOLF config MAINBOARD_FAMILY - string default "Google_Slippy" config OVERRIDE_DEVICETREE diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 4867fea..fdedca5 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -64,7 +64,6 @@ default "google/volteer" config MAINBOARD_FAMILY - string default "Google_Volteer" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index c4f6bf7..6d8028d 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -93,7 +93,6 @@ default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_FAMILY - string default "Google_Zork" config MAX_CPUS diff --git a/src/mainboard/intel/cannonlake_rvp/Kconfig b/src/mainboard/intel/cannonlake_rvp/Kconfig index 32c9487..11cef1d 100644 --- a/src/mainboard/intel/cannonlake_rvp/Kconfig +++ b/src/mainboard/intel/cannonlake_rvp/Kconfig @@ -32,7 +32,6 @@ default "Cannonlake RVP" config MAINBOARD_FAMILY - string default "Intel_cannonlake_rvp" config MAX_CPUS diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig index 81bfc93..4ca587e 100644 --- a/src/mainboard/intel/coffeelake_rvp/Kconfig +++ b/src/mainboard/intel/coffeelake_rvp/Kconfig @@ -40,7 +40,6 @@ default "cflrvp" config MAINBOARD_FAMILY - string default "Intel_whlrvp" if BOARD_INTEL_WHISKEYLAKE_RVP default "Intel_cmlrvp" if BOARD_INTEL_COMETLAKE_RVPU default "Intel_cflrvp" diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig index 8ed2aff..3e39498 100644 --- a/src/mainboard/intel/glkrvp/Kconfig +++ b/src/mainboard/intel/glkrvp/Kconfig @@ -65,7 +65,6 @@ default "glkrvp" if BOARD_INTEL_GLKRVP config MAINBOARD_FAMILY - string default "Intel_Glkrvp" if BOARD_INTEL_GLKRVP config MAX_CPUS diff --git a/src/mainboard/intel/icelake_rvp/Kconfig b/src/mainboard/intel/icelake_rvp/Kconfig index 2743384..0b36af6 100644 --- a/src/mainboard/intel/icelake_rvp/Kconfig +++ b/src/mainboard/intel/icelake_rvp/Kconfig @@ -32,7 +32,6 @@ default "Icelake RVP" config MAINBOARD_FAMILY - string default "Intel_icelake_rvp" config MAX_CPUS diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig index d6fbe81..d1db3c9 100644 --- a/src/mainboard/intel/jasperlake_rvp/Kconfig +++ b/src/mainboard/intel/jasperlake_rvp/Kconfig @@ -32,7 +32,6 @@ default "jslrvp" config MAINBOARD_FAMILY - string default "Intel_jslrvp" config MAX_CPUS diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig index d7209c5..07894bc 100644 --- a/src/mainboard/intel/kblrvp/Kconfig +++ b/src/mainboard/intel/kblrvp/Kconfig @@ -40,7 +40,6 @@ default "Kblrvp" config MAINBOARD_FAMILY - string default "Intel_Kblrvp" config MAX_CPUS diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index d7706d1..a7e317a1 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -37,7 +37,6 @@ default "Kunimitsu" config MAINBOARD_FAMILY - string default "Intel_Kunimitsu" config MAX_CPUS diff --git a/src/mainboard/intel/saddlebrook/Kconfig b/src/mainboard/intel/saddlebrook/Kconfig index e0f2add3..acf210f 100644 --- a/src/mainboard/intel/saddlebrook/Kconfig +++ b/src/mainboard/intel/saddlebrook/Kconfig @@ -30,7 +30,6 @@ default "Skylake Saddle Brook" config MAINBOARD_FAMILY - string default "Intel_SaddleBrook" config MAX_CPUS diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig index 437f5c6..c1a4d53 100644 --- a/src/mainboard/intel/tglrvp/Kconfig +++ b/src/mainboard/intel/tglrvp/Kconfig @@ -49,7 +49,6 @@ default "tglrvpy" if BOARD_INTEL_TGLRVP_UP4 config MAINBOARD_FAMILY - string default "Intel_tglrvp" config MAX_CPUS diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig index 467c20a..fcc554c 100644 --- a/src/mainboard/lenovo/Kconfig +++ b/src/mainboard/lenovo/Kconfig @@ -13,7 +13,6 @@ default "LENOVO" config MAINBOARD_FAMILY - string default MAINBOARD_PART_NUMBER endif # VENDOR_LENOVO diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig index b229c94..83b5a8b 100644 --- a/src/mainboard/ocp/deltalake/Kconfig +++ b/src/mainboard/ocp/deltalake/Kconfig @@ -31,7 +31,6 @@ default "DeltaLake" config MAINBOARD_FAMILY - string default "DeltaLake" config MAX_SOCKET diff --git a/src/mainboard/ocp/tiogapass/Kconfig b/src/mainboard/ocp/tiogapass/Kconfig index 67c1fa9..95585bf 100644 --- a/src/mainboard/ocp/tiogapass/Kconfig +++ b/src/mainboard/ocp/tiogapass/Kconfig @@ -24,7 +24,6 @@ default "TiogaPass" config MAINBOARD_FAMILY - string default "TiogaPass" config FMDFILE diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig index 6a79f5b..46bf390 100644 --- a/src/mainboard/prodrive/hermes/Kconfig +++ b/src/mainboard/prodrive/hermes/Kconfig @@ -22,7 +22,6 @@ if BOARD_PRODRIVE_HERMES_BASEBOARD config MAINBOARD_FAMILY - string default "PRODRIVE_HERMES_SERIES" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig index 275594b..aaee7f2 100644 --- a/src/mainboard/purism/librem_bdw/Kconfig +++ b/src/mainboard/purism/librem_bdw/Kconfig @@ -43,7 +43,6 @@ default "Librem 15 v2" if BOARD_PURISM_LIBREM15_V2 config MAINBOARD_FAMILY - string default "Librem 13" if BOARD_PURISM_LIBREM13_V1 default "Librem 15" if BOARD_PURISM_LIBREM15_V2 diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index cd8fc66..f9d541d 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -28,7 +28,6 @@ default "librem15" if BOARD_PURISM_LIBREM15_V3 || BOARD_PURISM_LIBREM15_V4 config MAINBOARD_FAMILY - string default "Librem 13" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4 default "Librem 15" if BOARD_PURISM_LIBREM15_V3 || BOARD_PURISM_LIBREM15_V4 diff --git a/src/mainboard/purism/librem_whl/Kconfig b/src/mainboard/purism/librem_whl/Kconfig index bc25fb5..a8998de 100644 --- a/src/mainboard/purism/librem_whl/Kconfig +++ b/src/mainboard/purism/librem_whl/Kconfig @@ -20,7 +20,6 @@ default "purism/librem_whl" config MAINBOARD_FAMILY - string default "Librem Mini" if BOARD_PURISM_LIBREM_MINI config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/razer/blade_stealth_kbl/Kconfig b/src/mainboard/razer/blade_stealth_kbl/Kconfig index 532bd76..2ee582a 100644 --- a/src/mainboard/razer/blade_stealth_kbl/Kconfig +++ b/src/mainboard/razer/blade_stealth_kbl/Kconfig @@ -29,7 +29,6 @@ default 18 config MAINBOARD_FAMILY - string default "BLADE_STEALTH" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig index a446835..850af26 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig +++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig @@ -18,7 +18,6 @@ if BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES config MAINBOARD_FAMILY - string default "Supermicro_X11_LGA1151_SERIES" config MAINBOARD_PART_NUMBER -- To view, visit https://review.coreboot.org/c/coreboot/+/45123 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If007988496c972185bad097535c5fd30ccfcd45b Gerrit-Change-Number: 45123 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

3 9

Change in coreboot[master]: src/Kconfig: Move mainboards specific symbols to mb/Kconfig
by HAOUAS Elyes (Code Review) 21 Sep '20

21 Sep '20

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45136 ) Change subject: src/Kconfig: Move mainboards specific symbols to mb/Kconfig ...................................................................... src/Kconfig: Move mainboards specific symbols to mb/Kconfig Now, symbols are visible in kconfig tools defined in mb/Kconfig instead of odd. Change-Id: If09dd487e940e18b11ac12e1c14f725b22b5bf70 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/Kconfig M src/mainboard/Kconfig 2 files changed, 45 insertions(+), 45 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/45136/1 diff --git a/src/Kconfig b/src/Kconfig index d6b703b..b9b2992 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -441,51 +441,6 @@ source "src/mainboard/Kconfig" -config DEVICETREE - string - default "devicetree.cb" - help - This symbol allows mainboards to select a different file under their - mainboard directory for the devicetree.cb file. This allows the board - variants that need different devicetrees to be in the same directory. - - Examples: "devicetree.variant.cb" - "variant/devicetree.cb" - -config OVERRIDE_DEVICETREE - string - default "" - help - This symbol allows variants to provide an override devicetree file to - override the registers and/or add new devices on top of the ones - provided by baseboard devicetree using CONFIG_DEVICETREE. - - Examples: "devicetree.variant-override.cb" - "variant/devicetree-override.cb" - -config FMDFILE - string "fmap description file in fmd format" - default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS - default "" - help - The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE, - but in some cases more complex setups are required. - When an fmd is specified, it overrides the default format. - -config CBFS_SIZE - hex "Size of CBFS filesystem in ROM" - depends on FMDFILE = "" - # Default value set at the end of the file - help - This is the part of the ROM actually managed by CBFS, located at the - end of the ROM (passed through cbfstool -o) on x86 and at at the start - of the ROM (passed through cbfstool -s) everywhere else. It defaults - to span the whole ROM on all but Intel systems that use an Intel Firmware - Descriptor. It can be overridden to make coreboot live alongside other - components like ChromeOS's vboot/FMAP or Intel's IFD / ME / TXE - binaries. This symbol should only be used to generate a default FMAP and - is unused when a non-default fmd file is provided via CONFIG_FMDFILE. - endmenu # load site-local kconfig to allow user specific defaults and overrides diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index be53982..eb45858 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -14,8 +14,53 @@ config MAINBOARD_FAMILY string +config FMDFILE + string "fmap description file in fmd format" + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS + default "" + help + The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE, + but in some cases more complex setups are required. + When an fmd is specified, it overrides the default format. + +config CBFS_SIZE + hex "Size of CBFS filesystem in ROM" + depends on FMDFILE = "" + # Default value set at the end of the file + help + This is the part of the ROM actually managed by CBFS, located at the + end of the ROM (passed through cbfstool -o) on x86 and at at the start + of the ROM (passed through cbfstool -s) everywhere else. It defaults + to span the whole ROM on all but Intel systems that use an Intel Firmware + Descriptor. It can be overridden to make coreboot live alongside other + components like ChromeOS's vboot/FMAP or Intel's IFD / ME / TXE + binaries. This symbol should only be used to generate a default FMAP and + is unused when a non-default fmd file is provided via CONFIG_FMDFILE. + source "src/mainboard/*/Kconfig" +config DEVICETREE + string + default "devicetree.cb" + help + This symbol allows mainboards to select a different file under their + mainboard directory for the devicetree.cb file. This allows the board + variants that need different devicetrees to be in the same directory. + + Examples: "devicetree.variant.cb" + "variant/devicetree.cb" + +config OVERRIDE_DEVICETREE + string + default "" + help + This symbol allows variants to provide an override devicetree file to + override the registers and/or add new devices on top of the ones + provided by baseboard devicetree using CONFIG_DEVICETREE. + + Examples: "devicetree.variant-override.cb" + "variant/devicetree-override.cb" + config BOARD_ROMSIZE_KB_64 bool config BOARD_ROMSIZE_KB_128 -- To view, visit https://review.coreboot.org/c/coreboot/+/45136 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If09dd487e940e18b11ac12e1c14f725b22b5bf70 Gerrit-Change-Number: 45136 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

1 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit September 2020