arch/power8: Rename to ppc64
POWER8 is a specific implementation of ppc64, which is by now outdated (POWER9 has been on the market for a while). Rename arch/power8/ to potentially cover a wider range of hardware. TEST=Toolchains built before/after this commit can build coreboot for emulation/qemu-power8 from before/after this commit. Change-Id: I2d6f08b12a9ffc8a652ddcd6f24ad85ecb33ca52 Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Reviewed-on: https://review.coreboot.org/c/29943 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Timothy Pearson <tpearson@raptorengineering.com>
This commit is contained in:
committed by
Timothy Pearson
parent
2af17af829
commit
c22ad581c8
@@ -1,25 +0,0 @@
|
||||
config ARCH_POWER8
|
||||
bool
|
||||
default n
|
||||
|
||||
config ARCH_BOOTBLOCK_POWER8
|
||||
bool
|
||||
default n
|
||||
select ARCH_POWER8
|
||||
select BOOTBLOCK_CUSTOM
|
||||
select C_ENVIRONMENT_BOOTBLOCK
|
||||
select ARCH_VERSTAGE_POWER8
|
||||
select ARCH_ROMSTAGE_POWER8
|
||||
select ARCH_RAMSTAGE_POWER8
|
||||
|
||||
config ARCH_VERSTAGE_POWER8
|
||||
bool
|
||||
default n
|
||||
|
||||
config ARCH_ROMSTAGE_POWER8
|
||||
bool
|
||||
default n
|
||||
|
||||
config ARCH_RAMSTAGE_POWER8
|
||||
bool
|
||||
default n
|
25
src/arch/ppc64/Kconfig
Normal file
25
src/arch/ppc64/Kconfig
Normal file
@@ -0,0 +1,25 @@
|
||||
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
|
||||
|
||||
config ARCH_ROMSTAGE_PPC64
|
||||
bool
|
||||
default n
|
||||
|
||||
config ARCH_RAMSTAGE_PPC64
|
||||
bool
|
||||
default n
|
@@ -16,14 +16,14 @@
|
||||
##
|
||||
################################################################################
|
||||
|
||||
power8_flags = -I$(src)/arch/power8/ -mbig-endian -mcpu=power8 -mtune=power8
|
||||
ppc64_flags = -I$(src)/arch/ppc64/ -mbig-endian -mcpu=power8 -mtune=power8
|
||||
|
||||
power8_asm_flags =
|
||||
ppc64_asm_flags =
|
||||
|
||||
################################################################################
|
||||
## bootblock
|
||||
################################################################################
|
||||
ifeq ($(CONFIG_ARCH_BOOTBLOCK_POWER8),y)
|
||||
ifeq ($(CONFIG_ARCH_BOOTBLOCK_PPC64),y)
|
||||
|
||||
bootblock-y = bootblock.S stages.c
|
||||
bootblock-y += boot.c
|
||||
@@ -35,7 +35,7 @@ bootblock-y += \
|
||||
$(top)/src/lib/memmove.c \
|
||||
$(top)/src/lib/memset.c
|
||||
|
||||
bootblock-generic-ccopts += $(power8_flags)
|
||||
bootblock-generic-ccopts += $(ppc64_flags)
|
||||
|
||||
$(objcbfs)/bootblock.debug: $$(bootblock-objs)
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
@@ -48,7 +48,7 @@ endif
|
||||
################################################################################
|
||||
## romstage
|
||||
################################################################################
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_POWER8),y)
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_PPC64),y)
|
||||
|
||||
romstage-y += boot.c
|
||||
romstage-y += stages.c
|
||||
@@ -68,15 +68,15 @@ $(objcbfs)/romstage.debug: $$(romstage-objs)
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
$(LD_romstage) $(LDFLAGS_romstage) -o $@ -L$(obj) -T $(call src-to-obj,romstage,src/mainboard/$(MAINBOARDDIR)/memlayout.ld) --whole-archive --start-group $(filter-out %.ld,$(romstage-objs)) --end-group $(COMPILER_RT_romstage)
|
||||
|
||||
romstage-c-ccopts += $(power8_flags)
|
||||
romstage-S-ccopts += $(power8_asm_flags)
|
||||
romstage-c-ccopts += $(ppc64_flags)
|
||||
romstage-S-ccopts += $(ppc64_asm_flags)
|
||||
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
## ramstage
|
||||
################################################################################
|
||||
ifeq ($(CONFIG_ARCH_RAMSTAGE_POWER8),y)
|
||||
ifeq ($(CONFIG_ARCH_RAMSTAGE_PPC64),y)
|
||||
|
||||
ramstage-y += rom_media.c
|
||||
ramstage-y += stages.c
|
||||
@@ -102,7 +102,7 @@ $(objcbfs)/ramstage.debug: $$(ramstage-objs)
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(LD_ramstage) $(LDFLAGS_ramstage) -o $@ -L$(obj) -T $(call src-to-obj,ramstage,src/mainboard/$(MAINBOARDDIR)/memlayout.ld) --whole-archive --start-group $(filter-out %.ld,$(ramstage-objs)) --end-group $(COMPILER_RT_ramstage)
|
||||
|
||||
ramstage-c-ccopts += $(power8_flags)
|
||||
ramstage-S-ccopts += $(power8_asm_flags)
|
||||
ramstage-c-ccopts += $(ppc64_flags)
|
||||
ramstage-S-ccopts += $(ppc64_asm_flags)
|
||||
|
||||
endif
|
@@ -36,10 +36,10 @@ struct cpu_info {
|
||||
#endif
|
||||
};
|
||||
|
||||
struct cpuinfo_power8 {
|
||||
uint8_t power8; /* CPU family */
|
||||
uint8_t power8_vendor; /* CPU vendor */
|
||||
uint8_t power8_model;
|
||||
struct cpuinfo_ppc64 {
|
||||
uint8_t ppc64; /* CPU family */
|
||||
uint8_t ppc64_vendor; /* CPU vendor */
|
||||
uint8_t ppc64_model;
|
||||
};
|
||||
|
||||
#endif
|
@@ -11,8 +11,8 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef POWER8_STDINT_H
|
||||
#define POWER8_STDINT_H
|
||||
#ifndef PPC64_STDINT_H
|
||||
#define PPC64_STDINT_H
|
||||
|
||||
/* Exact integral types */
|
||||
typedef unsigned char uint8_t;
|
||||
@@ -73,4 +73,4 @@ typedef uint8_t bool;
|
||||
typedef s64 intptr_t;
|
||||
typedef u64 uintptr_t;
|
||||
|
||||
#endif /* POWER8_STDINT_H */
|
||||
#endif /* PPC64_STDINT_H */
|
@@ -15,7 +15,7 @@
|
||||
|
||||
config CPU_QEMU_POWER8
|
||||
bool
|
||||
select ARCH_BOOTBLOCK_POWER8
|
||||
select ARCH_VERSTAGE_POWER8
|
||||
select ARCH_ROMSTAGE_POWER8
|
||||
select ARCH_RAMSTAGE_POWER8
|
||||
select ARCH_BOOTBLOCK_PPC64
|
||||
select ARCH_VERSTAGE_PPC64
|
||||
select ARCH_ROMSTAGE_PPC64
|
||||
select ARCH_RAMSTAGE_PPC64
|
||||
|
@@ -85,7 +85,7 @@ config MAINBOARD_USE_LIBGFXINIT
|
||||
# TODO: Explain differences (if any) for onboard cards.
|
||||
config VGA_ROM_RUN
|
||||
bool "Run VGA Option ROMs"
|
||||
depends on PCI && (ARCH_X86 || ARCH_POWER8) && !MAINBOARD_FORCE_NATIVE_VGA_INIT
|
||||
depends on PCI && (ARCH_X86 || ARCH_PPC64) && !MAINBOARD_FORCE_NATIVE_VGA_INIT
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER
|
||||
help
|
||||
Execute VGA Option ROMs in coreboot if found. This can be used
|
||||
|
@@ -20,9 +20,9 @@ if BOARD_EMULATION_QEMU_POWER8
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select BOARD_ROMSIZE_KB_4096
|
||||
select ARCH_BOOTBLOCK_POWER8
|
||||
select ARCH_BOOTBLOCK_PPC64
|
||||
select HAVE_UART_SPECIAL
|
||||
select ARCH_POWER8
|
||||
select ARCH_PPC64
|
||||
select BOOT_DEVICE_NOT_SPI_FLASH
|
||||
select MISSING_BOARD_RESET
|
||||
|
||||
|
Reference in New Issue
Block a user