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>

26 files changed, 49 insertions, 49 deletions

diff --git a/src/arch/power8/Kconfig b/src/arch/power8/Kconfig
deleted file mode 100644
index 476de2b3a6..0000000000
--- 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 0000000000..9e37bfc15f
--- /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
index 98f9db196c..99d86345ac 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 @@ 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
diff --git a/src/arch/power8/boot.c b/src/arch/ppc64/boot.c
index 4da60b4e6c..4da60b4e6c 100644
--- a/src/arch/power8/boot.c
+++ b/src/arch/ppc64/boot.c
diff --git a/src/arch/power8/bootblock.S b/src/arch/ppc64/bootblock.S
index 77289a1246..77289a1246 100644
--- a/src/arch/power8/bootblock.S
+++ b/src/arch/ppc64/bootblock.S
diff --git a/src/arch/power8/id.ld b/src/arch/ppc64/id.ld
index 932375665e..932375665e 100644
--- a/src/arch/power8/id.ld
+++ b/src/arch/ppc64/id.ld
diff --git a/src/arch/power8/include/arch/byteorder.h b/src/arch/ppc64/include/arch/byteorder.h
index 37cb8b6df6..37cb8b6df6 100644
--- a/src/arch/power8/include/arch/byteorder.h
+++ b/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
index 37174475f5..37174475f5 100644
--- a/src/arch/power8/include/arch/cache.h
+++ b/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
index 9467f52646..9467f52646 100644
--- a/src/arch/power8/include/arch/cbconfig.h
+++ b/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
index a4421e57c2..3238bfbf32 100644
--- a/src/arch/power8/include/arch/cpu.h
+++ b/src/arch/ppc64/include/arch/cpu.h
@@ -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
diff --git a/src/arch/power8/include/arch/early_variables.h b/src/arch/ppc64/include/arch/early_variables.h
index 99fc06bb18..99fc06bb18 100644
--- a/src/arch/power8/include/arch/early_variables.h
+++ b/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
index 07030e5b95..07030e5b95 100644
--- a/src/arch/power8/include/arch/exception.h
+++ b/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
index 7fdc155586..7fdc155586 100644
--- a/src/arch/power8/include/arch/header.ld
+++ b/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
index 1ba1e35b67..1ba1e35b67 100644
--- a/src/arch/power8/include/arch/hlt.h
+++ b/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
index 804d7dc1b1..804d7dc1b1 100644
--- a/src/arch/power8/include/arch/io.h
+++ b/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
index 4d2af5953d..4d2af5953d 100644
--- a/src/arch/power8/include/arch/memlayout.h
+++ b/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
index 90bd60b9a6..90bd60b9a6 100644
--- a/src/arch/power8/include/arch/stages.h
+++ b/src/arch/ppc64/include/arch/stages.h
diff --git a/src/arch/power8/include/stdint.h b/src/arch/ppc64/include/stdint.h
index 8cb34eea75..6425824439 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 uint8_t bool;
 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
index 65b8ecf02f..65b8ecf02f 100644
--- a/src/arch/power8/misc.c
+++ b/src/arch/ppc64/misc.c
diff --git a/src/arch/power8/prologue.inc b/src/arch/ppc64/prologue.inc
index a349cf97b3..a349cf97b3 100644
--- a/src/arch/power8/prologue.inc
+++ b/src/arch/ppc64/prologue.inc
diff --git a/src/arch/power8/rom_media.c b/src/arch/ppc64/rom_media.c
index c1713074f9..c1713074f9 100644
--- a/src/arch/power8/rom_media.c
+++ b/src/arch/ppc64/rom_media.c
diff --git a/src/arch/power8/stages.c b/src/arch/ppc64/stages.c
index 053fd7634c..053fd7634c 100644
--- a/src/arch/power8/stages.c
+++ b/src/arch/ppc64/stages.c
diff --git a/src/arch/power8/tables.c b/src/arch/ppc64/tables.c
index eef6bf2ffd..eef6bf2ffd 100644
--- a/src/arch/power8/tables.c
+++ b/src/arch/ppc64/tables.c
diff --git a/src/cpu/qemu-power8/Kconfig b/src/cpu/qemu-power8/Kconfig
index d273cc3a00..c1f8309795 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 016e1047a4..66f57d96ca 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -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
diff --git a/src/mainboard/emulation/qemu-power8/Kconfig b/src/mainboard/emulation/qemu-power8/Kconfig
index 3b8f3c7b5c..66a3d8c25f 100644
--- a/src/mainboard/emulation/qemu-power8/Kconfig
+++ b/src/mainboard/emulation/qemu-power8/Kconfig
@@ -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