Patrick Georgi merged this change.

View Change

Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
arch/ppc64: Make PPC64 stages select ARCH_PPC64

Also don't define the default as this result in spurious lines in the
.config.

This also cleans up an unused Kconfig file.

In the generated config.h CPU_QEMU_POWER8 is gone as expected and
ARCH_RAMSTAGE_PPC64 moves a few lines, but the value stays the same.

Change-Id: I70b64e49e1ce07b8f30d9bbc493272bdfb3bb0bf
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31314
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M src/arch/ppc64/Kconfig
M src/mainboard/emulation/qemu-power8/Kconfig
2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/arch/ppc64/Kconfig b/src/arch/ppc64/Kconfig
index 9e37bfc..0699e91 100644
--- a/src/arch/ppc64/Kconfig
+++ b/src/arch/ppc64/Kconfig
@@ -1,25 +1,20 @@
config ARCH_PPC64
bool
- default n

config ARCH_BOOTBLOCK_PPC64
bool
- default n
select ARCH_PPC64
select BOOTBLOCK_CUSTOM
select C_ENVIRONMENT_BOOTBLOCK
- select ARCH_VERSTAGE_PPC64
- select ARCH_ROMSTAGE_PPC64
- select ARCH_RAMSTAGE_PPC64

config ARCH_VERSTAGE_PPC64
bool
- default n
+ select ARCH_PPC64

config ARCH_ROMSTAGE_PPC64
bool
- default n
+ select ARCH_PPC64

config ARCH_RAMSTAGE_PPC64
bool
- default n
+ select ARCH_PPC64
diff --git a/src/mainboard/emulation/qemu-power8/Kconfig b/src/mainboard/emulation/qemu-power8/Kconfig
index c3a9904..0496178 100644
--- a/src/mainboard/emulation/qemu-power8/Kconfig
+++ b/src/mainboard/emulation/qemu-power8/Kconfig
@@ -22,8 +22,10 @@
select CPU_QEMU_POWER8
select BOARD_ROMSIZE_KB_4096
select ARCH_BOOTBLOCK_PPC64
+ select ARCH_VERSTAGE_PPC64
+ select ARCH_ROMSTAGE_PPC64
+ select ARCH_RAMSTAGE_PPC64
select HAVE_UART_SPECIAL
- select ARCH_PPC64
select BOOT_DEVICE_NOT_SPI_FLASH
select MISSING_BOARD_RESET


To view, visit change 31314. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I70b64e49e1ce07b8f30d9bbc493272bdfb3bb0bf
Gerrit-Change-Number: 31314
Gerrit-PatchSet: 7
Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: HAOUAS Elyes <ehaouas@noos.fr>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-Reviewer: ron minnich <rminnich@gmail.com>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged