[coreboot-gerrit] Change in ...coreboot[master]: arch/power8: Rename to ppc64
Jonathan Neuschäfer (Code Review)
gerrit at coreboot.org
Fri Nov 30 01:38:24 CET 2018
Jonathan Neuschäfer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29943
Change subject: arch/power8: Rename to ppc64
......................................................................
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 at gmx.net>
---
M Documentation/releases/coreboot-4.9-relnotes.md
M MAINTAINERS
D src/arch/power8/Kconfig
A src/arch/ppc64/Kconfig
R src/arch/ppc64/Makefile.inc
R src/arch/ppc64/boot.c
R src/arch/ppc64/bootblock.S
R src/arch/ppc64/id.ld
R src/arch/ppc64/include/arch/byteorder.h
R src/arch/ppc64/include/arch/cache.h
R src/arch/ppc64/include/arch/cbconfig.h
R src/arch/ppc64/include/arch/cpu.h
R src/arch/ppc64/include/arch/early_variables.h
R src/arch/ppc64/include/arch/exception.h
R src/arch/ppc64/include/arch/header.ld
R src/arch/ppc64/include/arch/hlt.h
R src/arch/ppc64/include/arch/io.h
R src/arch/ppc64/include/arch/memlayout.h
R src/arch/ppc64/include/arch/stages.h
R src/arch/ppc64/include/stdint.h
R src/arch/ppc64/misc.c
R src/arch/ppc64/prologue.inc
R src/arch/ppc64/rom_media.c
R src/arch/ppc64/stages.c
R src/arch/ppc64/tables.c
M src/cpu/qemu-power8/Kconfig
M src/device/Kconfig
M src/mainboard/emulation/qemu-power8/Kconfig
M toolchain.inc
M util/crossgcc/Makefile
M util/crossgcc/Makefile.inc
M util/lint/check_lint_tests
M util/xcompile/xcompile
33 files changed, 66 insertions(+), 64 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/29943/1
diff --git a/Documentation/releases/coreboot-4.9-relnotes.md b/Documentation/releases/coreboot-4.9-relnotes.md
index c59744e..a24266a 100644
--- a/Documentation/releases/coreboot-4.9-relnotes.md
+++ b/Documentation/releases/coreboot-4.9-relnotes.md
@@ -23,6 +23,8 @@
* Add bootblock compression capability: on systems that copy the bootblock
from very slow flash to ERAM, allow adding a stub that decompresses the
bootblock into ERAM to minimize the amount of flash reads
+* Rename the POWER8 architecture port to PPC64 to reflect that it isn't limited
+ to POWER8
Toolchain
---------
diff --git a/MAINTAINERS b/MAINTAINERS
index 3df572c..b3cc559 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -144,11 +144,11 @@
F: src/mainboard/sifive/
F: util/riscv/
-POWER8 ARCHITECTURE
+PPC64 ARCHITECTURE
M: Ronald Minnich <rminnich at gmail.com>
M: Timothy Pearson <tpearson at raptorengineeringinc.com>
S: Maintained
-F: src/arch/power8/
+F: src/arch/ppc64/
F: src/cpu/qemu-power8/
F: src/mainboard/emulation/qemu-power8/
diff --git a/src/arch/power8/Kconfig b/src/arch/power8/Kconfig
deleted file mode 100644
index 476de2b..0000000
--- a/src/arch/power8/Kconfig
+++ /dev/null
@@ -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
diff --git a/src/arch/ppc64/Kconfig b/src/arch/ppc64/Kconfig
new file mode 100644
index 0000000..9e37bfc
--- /dev/null
+++ b/src/arch/ppc64/Kconfig
@@ -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
diff --git a/src/arch/power8/Makefile.inc b/src/arch/ppc64/Makefile.inc
similarity index 88%
rename from src/arch/power8/Makefile.inc
rename to src/arch/ppc64/Makefile.inc
index 98f9db1..99d8634 100644
--- a/src/arch/power8/Makefile.inc
+++ b/src/arch/ppc64/Makefile.inc
@@ -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 @@
$(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 @@
################################################################################
## 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 @@
@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 @@
@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
diff --git a/src/arch/power8/boot.c b/src/arch/ppc64/boot.c
similarity index 100%
rename from src/arch/power8/boot.c
rename to src/arch/ppc64/boot.c
diff --git a/src/arch/power8/bootblock.S b/src/arch/ppc64/bootblock.S
similarity index 100%
rename from src/arch/power8/bootblock.S
rename to src/arch/ppc64/bootblock.S
diff --git a/src/arch/power8/id.ld b/src/arch/ppc64/id.ld
similarity index 100%
rename from src/arch/power8/id.ld
rename to src/arch/ppc64/id.ld
diff --git a/src/arch/power8/include/arch/byteorder.h b/src/arch/ppc64/include/arch/byteorder.h
similarity index 100%
rename from src/arch/power8/include/arch/byteorder.h
rename to src/arch/ppc64/include/arch/byteorder.h
diff --git a/src/arch/power8/include/arch/cache.h b/src/arch/ppc64/include/arch/cache.h
similarity index 100%
rename from src/arch/power8/include/arch/cache.h
rename to src/arch/ppc64/include/arch/cache.h
diff --git a/src/arch/power8/include/arch/cbconfig.h b/src/arch/ppc64/include/arch/cbconfig.h
similarity index 100%
rename from src/arch/power8/include/arch/cbconfig.h
rename to src/arch/ppc64/include/arch/cbconfig.h
diff --git a/src/arch/power8/include/arch/cpu.h b/src/arch/ppc64/include/arch/cpu.h
similarity index 86%
rename from src/arch/power8/include/arch/cpu.h
rename to src/arch/ppc64/include/arch/cpu.h
index a4421e5..3238bfb 100644
--- a/src/arch/power8/include/arch/cpu.h
+++ b/src/arch/ppc64/include/arch/cpu.h
@@ -36,10 +36,10 @@
#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
diff --git a/src/arch/power8/include/arch/early_variables.h b/src/arch/ppc64/include/arch/early_variables.h
similarity index 100%
rename from src/arch/power8/include/arch/early_variables.h
rename to src/arch/ppc64/include/arch/early_variables.h
diff --git a/src/arch/power8/include/arch/exception.h b/src/arch/ppc64/include/arch/exception.h
similarity index 100%
rename from src/arch/power8/include/arch/exception.h
rename to src/arch/ppc64/include/arch/exception.h
diff --git a/src/arch/power8/include/arch/header.ld b/src/arch/ppc64/include/arch/header.ld
similarity index 100%
rename from src/arch/power8/include/arch/header.ld
rename to src/arch/ppc64/include/arch/header.ld
diff --git a/src/arch/power8/include/arch/hlt.h b/src/arch/ppc64/include/arch/hlt.h
similarity index 100%
rename from src/arch/power8/include/arch/hlt.h
rename to src/arch/ppc64/include/arch/hlt.h
diff --git a/src/arch/power8/include/arch/io.h b/src/arch/ppc64/include/arch/io.h
similarity index 100%
rename from src/arch/power8/include/arch/io.h
rename to src/arch/ppc64/include/arch/io.h
diff --git a/src/arch/power8/include/arch/memlayout.h b/src/arch/ppc64/include/arch/memlayout.h
similarity index 100%
rename from src/arch/power8/include/arch/memlayout.h
rename to src/arch/ppc64/include/arch/memlayout.h
diff --git a/src/arch/power8/include/arch/stages.h b/src/arch/ppc64/include/arch/stages.h
similarity index 100%
rename from src/arch/power8/include/arch/stages.h
rename to src/arch/ppc64/include/arch/stages.h
diff --git a/src/arch/power8/include/stdint.h b/src/arch/ppc64/include/stdint.h
similarity index 95%
rename from src/arch/power8/include/stdint.h
rename to src/arch/ppc64/include/stdint.h
index 8cb34ee..6425824 100644
--- a/src/arch/power8/include/stdint.h
+++ b/src/arch/ppc64/include/stdint.h
@@ -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 s64 intptr_t;
typedef u64 uintptr_t;
-#endif /* POWER8_STDINT_H */
+#endif /* PPC64_STDINT_H */
diff --git a/src/arch/power8/misc.c b/src/arch/ppc64/misc.c
similarity index 100%
rename from src/arch/power8/misc.c
rename to src/arch/ppc64/misc.c
diff --git a/src/arch/power8/prologue.inc b/src/arch/ppc64/prologue.inc
similarity index 100%
rename from src/arch/power8/prologue.inc
rename to src/arch/ppc64/prologue.inc
diff --git a/src/arch/power8/rom_media.c b/src/arch/ppc64/rom_media.c
similarity index 100%
rename from src/arch/power8/rom_media.c
rename to src/arch/ppc64/rom_media.c
diff --git a/src/arch/power8/stages.c b/src/arch/ppc64/stages.c
similarity index 100%
rename from src/arch/power8/stages.c
rename to src/arch/ppc64/stages.c
diff --git a/src/arch/power8/tables.c b/src/arch/ppc64/tables.c
similarity index 100%
rename from src/arch/power8/tables.c
rename to src/arch/ppc64/tables.c
diff --git a/src/cpu/qemu-power8/Kconfig b/src/cpu/qemu-power8/Kconfig
index d273cc3..c1f8309 100644
--- a/src/cpu/qemu-power8/Kconfig
+++ b/src/cpu/qemu-power8/Kconfig
@@ -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
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 016e104..66f57d9 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -85,7 +85,7 @@
# 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
diff --git a/src/mainboard/emulation/qemu-power8/Kconfig b/src/mainboard/emulation/qemu-power8/Kconfig
index 9e14cab..c756710 100644
--- a/src/mainboard/emulation/qemu-power8/Kconfig
+++ b/src/mainboard/emulation/qemu-power8/Kconfig
@@ -20,9 +20,9 @@
config BOARD_SPECIFIC_OPTIONS # dummy
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
diff --git a/toolchain.inc b/toolchain.inc
index ec57b5d..0486287 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -57,7 +57,7 @@
ARCHDIR-arm64 := arm64
ARCHDIR-riscv := riscv
ARCHDIR-mips := mips
-ARCHDIR-power8 := power8
+ARCHDIR-ppc64 := ppc64
CFLAGS_arm +=
CFLAGS_arm64 += -mgeneral-regs-only
@@ -65,7 +65,7 @@
CFLAGS_riscv +=
CFLAGS_x86_32 +=
CFLAGS_x86_64 += -mcmodel=large -mno-red-zone
-CFLAGS_power8 +=
+CFLAGS_ppc64 +=
# Some boards only provide 2K stacks, so storing lots of data there leads to
# problems. Since C rules don't allow us to statically determine the maximum
@@ -85,7 +85,7 @@
CFLAGS_arm64 += -Wstack-usage=1536
CFLAGS_mips += -Wstack-usage=1536
CFLAGS_riscv += -Wstack-usage=1536
-CFLAGS_power8 += -Wstack-usage=1536
+CFLAGS_ppc64 += -Wstack-usage=1536
endif
toolchain_to_dir = \
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index 0c092d7..a8ea815 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -9,12 +9,12 @@
all all_with_gdb:
$(MAKE) build-i386 build-x64 build-arm build-mips \
- build-riscv build-aarch64 build-power8 build-nds32le \
+ build-riscv build-aarch64 build-ppc64 build-nds32le \
build_clang build_iasl build_make
all_without_gdb:
$(MAKE) SKIP_GDB=1 build-i386 build-x64 build-arm build-mips \
- build-riscv build-aarch64 build-power8 build-nds32le \
+ build-riscv build-aarch64 build-ppc64 build-nds32le \
build_clang build_iasl build_make
build_tools: build_gcc build_gdb
@@ -63,7 +63,7 @@
# GDB is currently not supported on RISC-V
@$(MAKE) build_gcc BUILD_PLATFORM=riscv-elf
-build-power8:
+build-ppc64:
@$(MAKE) build_tools BUILD_PLATFORM=powerpc64-linux-gnu
build-nds32le:
@@ -85,6 +85,6 @@
.PHONY: build_gcc build_iasl build_gdb build_clang all all_with_gdb \
all_without_gdb build_tools build-i386 build-x64 build-arm \
- build-aarch64 build-mips build-riscv build-power8 build-nds32le \
+ build-aarch64 build-mips build-riscv build-ppc64 build-nds32le \
clean distclean clean_tempfiles
.NOTPARALLEL:
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc
index f7da7de..7fdc443 100644
--- a/util/crossgcc/Makefile.inc
+++ b/util/crossgcc/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-TOOLCHAIN_ARCHES := i386 x64 arm aarch64 mips riscv power8 nds32le
+TOOLCHAIN_ARCHES := i386 x64 arm aarch64 mips riscv ppc64 nds32le
help_toolchain help::
@echo '*** Toolchain targets ***'
diff --git a/util/lint/check_lint_tests b/util/lint/check_lint_tests
index 5ba33c8..6b1860f 100755
--- a/util/lint/check_lint_tests
+++ b/util/lint/check_lint_tests
@@ -6,7 +6,7 @@
#lint-stable-000-license-headers
TESTFILE000a=src/arch/x86/thread.c
-TESTFILE000b=src/arch/power8/misc.c
+TESTFILE000b=src/arch/ppc64/misc.c
sed -i.bak 's/^[[:space:]]\*[[:space:]].*//' ${TESTFILE000a}
sed -i.bak 's/^[[:space:]]\*[[:space:]]but WITHOUT ANY WARRANTY;//' ${TESTFILE000b}
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 6d82a4d..7713543 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -303,7 +303,7 @@
}
# Architecture definitions
-SUPPORTED_ARCHITECTURES="arm arm64 mipsel riscv x64 x86 power8"
+SUPPORTED_ARCHITECTURES="arm arm64 mipsel riscv x64 x86 ppc64"
# TARCH: local name for the architecture
# (used as CC_${TARCH} in the build system)
@@ -366,12 +366,12 @@
TENDIAN="EL"
}
-arch_config_power8() {
- TARCH="power8"
+arch_config_ppc64() {
+ TARCH="ppc64"
TBFDARCHS="powerpc"
TCLIST="powerpc64"
TWIDTH="64"
- TSUPP="power8"
+ TSUPP="ppc64 power8"
TABI="linux-gnu" # there is no generic ABI on ppc64
CC_RT_EXTRA_GCC="-mcpu=power8 -mbig-endian"
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/29943
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2d6f08b12a9ffc8a652ddcd6f24ad85ecb33ca52
Gerrit-Change-Number: 29943
Gerrit-PatchSet: 1
Gerrit-Owner: Jonathan Neuschäfer <j.neuschaefer at gmx.net>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181130/10d820b5/attachment-0001.html>
More information about the coreboot-gerrit
mailing list