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@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
Hello build bot (Jenkins), Philipp Hug, Frans Hendriks, ron minnich, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45124
to look at the new patch set (#2).
Change subject: mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR ......................................................................
mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR
Change-Id: Ife0355d741f2ba4dc01c1baa9f3c9a345d24e65a Signed-off-by: Elyes HAOUAS ehaouas@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/2
Hello build bot (Jenkins), Philipp Hug, Frans Hendriks, ron minnich, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45124
to look at the new patch set (#3).
Change subject: mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR ......................................................................
mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR
Change-Id: Ife0355d741f2ba4dc01c1baa9f3c9a345d24e65a Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- 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 8 files changed, 29 insertions(+), 29 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/45124/3
HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/45124 )
Change subject: mb/*/*/Kconfig: Use CONFIG_MAINBOARD_DIR ......................................................................
Abandoned
-
HAOUAS Elyes (Code Review)