soc/amd: Change Morgana codename to Phoenix

Now that the next generation of APUs is officially announced, we can unmask morgana. The chip formerly known as Morgana is actually Phoenix. Surprise! This patch just changes the name across the entire codebase. Note that the fw.cfg file will stay pointing to the 3rdparty/amd_blobs/morgana/psp directory until the amd_blobs_repo is updated. Signed-off-by: Martin Roth <martin.roth@amd.corp-partner.google.com> Change-Id: Ie9492a30ae9ff9cd7e15e0f2d239c32190ad4956 Reviewed-on: https://review.coreboot.org/c/coreboot/+/71731 Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-by: Jason Glenesk <jason.glenesk@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
coreboot · Jan 12, 2023 · 20646cd · 20646cd
1 parent ba2cef5
commit 20646cd
Show file tree

Hide file tree

Showing 74 changed files with 183 additions and 183 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -815,15 +815,15 @@ S:	Supported
 F:	src/soc/amd/mendocino/
 F:	src/vendorcode/amd/fsp/mendocino/
 
-AMD Morgana
+AMD Phoenix
 M:	Felix Held <felix-coreboot@felixheld.de>
 M:	Jason Glenesk <jason.glenesk@gmail.com>
 M:	Fred Reitberger <reitbergerfred@gmail.com>
 M:	Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
 L:	amd_coreboot_org_changes@googlegroups.com
 S:	Supported
-F:	src/soc/amd/morgana/
-F:	src/vendorcode/amd/fsp/morgana/
+F:	src/soc/amd/phoenix/
+F:	src/vendorcode/amd/fsp/phoenix/
 
 AMD Stoneyridge
 M:	Felix Held <felix-coreboot@felixheld.de>

diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-if BOARD_AMD_BIRMAN_GLINDA || BOARD_AMD_BIRMAN_MORGANA
+if BOARD_AMD_BIRMAN_GLINDA || BOARD_AMD_BIRMAN_PHOENIX
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
@@ -24,11 +24,11 @@ config MAINBOARD_DIR
 
 config MAINBOARD_PART_NUMBER
 	default "Birman_Glinda" if BOARD_AMD_BIRMAN_GLINDA
-	default "Birman_Morgana"
+	default "Birman_Phoenix"
 
 config DEVICETREE
 	default "devicetree_glinda.cb" if BOARD_AMD_BIRMAN_GLINDA
-	default "devicetree_morgana.cb"
+	default "devicetree_phoenix.cb"
 
 config AMD_FWM_POSITION_INDEX
 	int
@@ -79,7 +79,7 @@ config RO_REGION_ONLY
 	string
 	depends on VBOOT_SLOTS_RW_AB || VBOOT_SLOTS_RW_A
 	# Add the EFS and EC to the RO region only
-	# This is a birman-specific override of soc/amd/(morgana | glinda)/Kconfig
+	# This is a birman-specific override of soc/amd/(phoenix | glinda)/Kconfig
 	default "apu/amdfw apu/ecfw"
 
 config CHROMEOS
@@ -109,4 +109,4 @@ config TPM_SPI_SPEED
 
 endif # !EM100
 
-endif # BOARD_AMD_BIRMAN_GLINDA || BOARD_AMD_BIRMAN_MORGANA
+endif # BOARD_AMD_BIRMAN_GLINDA || BOARD_AMD_BIRMAN_PHOENIX
diff --git a/src/mainboard/amd/birman/Kconfig.name b/src/mainboard/amd/birman/Kconfig.name
@@ -1,8 +1,8 @@
 comment "Birman"
 
-config BOARD_AMD_BIRMAN_MORGANA
-	bool "->  Birman for Morgana SoC"
-	select SOC_AMD_MORGANA
+config BOARD_AMD_BIRMAN_PHOENIX
+	bool "->  Birman for Phoenix SoC"
+	select SOC_AMD_PHOENIX
 
 config BOARD_AMD_BIRMAN_GLINDA
 	bool "->  Birman for Glinda SoC"

diff --git a/...ainboard/amd/birman/devicetree_morgana.cb → ...ainboard/amd/birman/devicetree_phoenix.cb b/...ainboard/amd/birman/devicetree_morgana.cb → ...ainboard/amd/birman/devicetree_phoenix.cb
@@ -2,7 +2,7 @@
 
 # TODO: Update for birman
 
-chip soc/amd/morgana
+chip soc/amd/phoenix
 	register "common_config.espi_config" = "{
 		.std_io_decode_bitmap = ESPI_DECODE_IO_0x80_EN | ESPI_DECODE_IO_0X2E_0X2F_EN | ESPI_DECODE_IO_0X60_0X64_EN,
 		.generic_io_range[0] = {

diff --git a/src/mainboard/amd/mayan/Kconfig b/src/mainboard/amd/mayan/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-if BOARD_AMD_MAYAN_MORGANA
+if BOARD_AMD_MAYAN_PHOENIX
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
@@ -23,10 +23,10 @@ config MAINBOARD_DIR
 	default "amd/mayan"
 
 config MAINBOARD_PART_NUMBER
-	default "Mayan_Morgana"
+	default "Mayan_Phoenix"
 
 config DEVICETREE
-	default "devicetree_morgana.cb"
+	default "devicetree_phoenix.cb"
 
 config AMD_FWM_POSITION_INDEX
 	int
@@ -77,7 +77,7 @@ config RO_REGION_ONLY
 	string
 	depends on VBOOT_SLOTS_RW_AB || VBOOT_SLOTS_RW_A
 	# Add the EFS and EC to the RO region only
-	# This is a mayan-specific override of soc/amd/morgana/Kconfig
+	# This is a mayan-specific override of soc/amd/phoenix/Kconfig
 	default "apu/amdfw ec/ecfw"
 
 config CHROMEOS
@@ -107,4 +107,4 @@ config TPM_SPI_SPEED
 
 endif # !EM100
 
-endif # BOARD_AMD_MAYAN_MORGANA
+endif # BOARD_AMD_MAYAN_PHOENIX
diff --git a/src/mainboard/amd/mayan/Kconfig.name b/src/mainboard/amd/mayan/Kconfig.name
@@ -1,5 +1,5 @@
 comment "Mayan"
 
-config BOARD_AMD_MAYAN_MORGANA
-	bool "->  Mayan for Morgana SoC"
-	select SOC_AMD_MORGANA
+config BOARD_AMD_MAYAN_PHOENIX
+	bool "->  Mayan for Phoenix SoC"
+	select SOC_AMD_PHOENIX
diff --git a/...mainboard/amd/mayan/devicetree_morgana.cb → ...mainboard/amd/mayan/devicetree_phoenix.cb b/...mainboard/amd/mayan/devicetree_morgana.cb → ...mainboard/amd/mayan/devicetree_phoenix.cb
@@ -2,7 +2,7 @@
 
 # TODO: Update for mayan
 
-chip soc/amd/morgana
+chip soc/amd/phoenix
 	register "common_config.espi_config" = "{
 		.std_io_decode_bitmap = ESPI_DECODE_IO_0x80_EN | ESPI_DECODE_IO_0X2E_0X2F_EN | ESPI_DECODE_IO_0X60_0X64_EN,
 		.generic_io_range[0] = {

diff --git a/src/mainboard/amd/mayan/gpio.c b/src/mainboard/amd/mayan/gpio.c
@@ -139,7 +139,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
 	/* CLK_REQ2_L */
 	PAD_NF(GPIO_116, CLK_REQ2_L, PULL_NONE),
 	/* GPIO_117 - GPIO_129: Not available */
-	/* SATA_ACT_L - morgana does not have SATA, so force inactive */
+	/* SATA_ACT_L - phoenix does not have SATA, so force inactive */
 	PAD_GPO(GPIO_130, HIGH),
 	/* CLK_REQ3_L */
 	PAD_NF(GPIO_131, CLK_REQ3_L, PULL_NONE),

diff --git a/src/soc/amd/morgana/include/soc/cpu.h b/src/soc/amd/morgana/include/soc/cpu.h
diff --git a/src/soc/amd/morgana/include/soc/espi.h b/src/soc/amd/morgana/include/soc/espi.h
diff --git a/src/soc/amd/morgana/Kconfig → src/soc/amd/phoenix/Kconfig b/src/soc/amd/morgana/Kconfig → src/soc/amd/phoenix/Kconfig
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 # TODO: Evaluate what can be moved to a common directory
-# TODO: Update for Morgana
+# TODO: Update for Phoenix
 
-config SOC_AMD_MORGANA
+config SOC_AMD_PHOENIX
 	bool
 	select ACPI_SOC_NVS
 	select ARCH_X86
@@ -82,13 +82,13 @@ config SOC_AMD_MORGANA
 	select X86_AMD_FIXED_MTRRS
 	select X86_INIT_NEED_1_SIPI
 	help
-	  AMD Morgana support
+	  AMD Phoenix support
 
-if SOC_AMD_MORGANA
+if SOC_AMD_PHOENIX
 
 config CHIPSET_DEVICETREE
 	string
-	default "soc/amd/morgana/chipset.cb"
+	default "soc/amd/phoenix/chipset.cb"
 
 config EARLY_RESERVED_DRAM_BASE
 	hex
@@ -342,7 +342,7 @@ comment "AMD Firmware Directory Table set to location for 16MB ROM"
 
 config AMDFW_CONFIG_FILE
 	string "AMD PSP Firmware config file"
-	default "src/soc/amd/morgana/fw.cfg"
+	default "src/soc/amd/phoenix/fw.cfg"
 	help
 	  Specify the path/location of AMD PSP Firmware config file.
 
@@ -386,7 +386,7 @@ config HAVE_PSP_WHITELIST_FILE
 config PSP_WHITELIST_FILE
 	string "Debug whitelist file path"
 	depends on HAVE_PSP_WHITELIST_FILE
-	default "site-local/3rdparty/amd_blobs/morgana/PSP/wtl-mrg.sbin"
+	default "site-local/3rdparty/amd_blobs/phoenix/PSP/wtl-phx.sbin"
 
 config HAVE_SPL_FILE
 	bool "Have a mainboard specific SPL table file"
@@ -403,7 +403,7 @@ config HAVE_SPL_FILE
 config SPL_TABLE_FILE
 	string "SPL table file"
 	depends on HAVE_SPL_FILE
-	default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/TypeId0x55_SplTableBl_MRG.sbin"
+	default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/TypeId0x55_SplTableBl_PHX.sbin"
 
 config HAVE_SPL_RW_AB_FILE
 	bool "Have a separate mainboard-specific SPL file in RW A/B partitions"
@@ -418,7 +418,7 @@ config HAVE_SPL_RW_AB_FILE
 config SPL_RW_AB_TABLE_FILE
 	string "Separate SPL table file for RW A/B partitions"
 	depends on HAVE_SPL_RW_AB_FILE
-	default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/TypeId0x55_SplTableBl_MRG.sbin"
+	default "3rdparty/blobs/mainboard/\$(CONFIG_MAINBOARD_DIR)/TypeId0x55_SplTableBl_PHX.sbin"
 
 config PSP_SOFTFUSE_BITS
 	string "PSP Soft Fuse bits to enable"

diff --git a/src/soc/amd/morgana/Makefile.inc → src/soc/amd/phoenix/Makefile.inc b/src/soc/amd/morgana/Makefile.inc → src/soc/amd/phoenix/Makefile.inc
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 # TODO: Move as much as possible to common
-# TODO: Update for Morgana
+# TODO: Update for Phoenix
 
-ifeq ($(CONFIG_SOC_AMD_MORGANA),y)
+ifeq ($(CONFIG_SOC_AMD_PHOENIX),y)
 
 subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage
 
@@ -51,9 +51,9 @@ smm-y		+= smihandler.c
 smm-y		+= smu.c
 smm-$(CONFIG_DEBUG_SMI) += uart.c
 
-CPPFLAGS_common += -I$(src)/soc/amd/morgana/include
-CPPFLAGS_common += -I$(src)/soc/amd/morgana/acpi
-CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/morgana
+CPPFLAGS_common += -I$(src)/soc/amd/phoenix/include
+CPPFLAGS_common += -I$(src)/soc/amd/phoenix/acpi
+CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/phoenix
 CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/common
 
 MAINBOARD_BLOBS_DIR:=$(top)/3rdparty/blobs/mainboard/$(MAINBOARDDIR)
@@ -69,7 +69,7 @@ MAINBOARD_BLOBS_DIR:=$(top)/3rdparty/blobs/mainboard/$(MAINBOARDDIR)
 $(if $(CONFIG_AMD_FWM_POSITION_INDEX), ,\
      $(error Invalid AMD firmware position index. Check if the board sets a valid ROM size))
 
-MORGANA_FWM_POSITION=$(call int-add, \
+PHOENIX_FWM_POSITION=$(call int-add, \
 	$(call int-subtract, 0xffffffff \
 	$(call int-shift-left, \
 	0x80000 $(CONFIG_AMD_FWM_POSITION_INDEX))) 0x20000 1)
@@ -78,11 +78,11 @@ MORGANA_FWM_POSITION=$(call int-add, \
 # Building the cbfs image will fail if the offset isn't large enough
 AMD_FW_AB_POSITION := 0x40
 
-MORGANA_FW_A_POSITION=$(call int-add, \
+PHOENIX_FW_A_POSITION=$(call int-add, \
 	$(shell awk '$$2 == "FMAP_SECTION_FW_MAIN_A_START" {print $$3}' $(obj)/fmap_config.h) \
 	$(AMD_FW_AB_POSITION))
 
-MORGANA_FW_B_POSITION=$(call int-add, \
+PHOENIX_FW_B_POSITION=$(call int-add, \
 	$(shell awk '$$2 == "FMAP_SECTION_FW_MAIN_B_START" {print $$3}' $(obj)/fmap_config.h) \
 	$(AMD_FW_AB_POSITION))
 #
@@ -237,7 +237,7 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
 		$(OPT_EFS_SPI_SPEED) \
 		$(OPT_EFS_SPI_MICRON_FLAG) \
 		--config $(CONFIG_AMDFW_CONFIG_FILE) \
-		--soc-name "Morgana" \
+		--soc-name "Phoenix" \
 		--flashsize $(CONFIG_ROM_SIZE) \
 		$(OPT_RECOVERY_AB_SINGLE_COPY)
 
@@ -259,7 +259,7 @@ $(obj)/amdfw.rom:	$(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
 		$(OPT_VERSTAGE_FILE) \
 		$(OPT_VERSTAGE_SIG_FILE) \
 		$(OPT_SPL_TABLE_FILE) \
-		--location $(shell printf "%#x" $(MORGANA_FWM_POSITION)) \
+		--location $(shell printf "%#x" $(PHOENIX_FWM_POSITION)) \
 		--output $@
 
 $(PSP_BIOSBIN_FILE): $(PSP_ELF_FILE) $(AMDCOMPRESS)
@@ -278,7 +278,7 @@ $(obj)/amdfw_a.rom: $(obj)/amdfw.rom
 		$(OPT_SPL_RW_AB_TABLE_FILE) \
 		$(OPT_SIGNED_AMDFW_A_POSITION) \
 		$(OPT_SIGNED_AMDFW_A_FILE) \
-		--location $(shell printf "%#x" $(MORGANA_FW_A_POSITION)) \
+		--location $(shell printf "%#x" $(PHOENIX_FW_A_POSITION)) \
 		--anywhere \
 		--output $@
 
@@ -292,7 +292,7 @@ $(obj)/amdfw_b.rom: $(obj)/amdfw.rom
 		$(OPT_SPL_RW_AB_TABLE_FILE) \
 		$(OPT_SIGNED_AMDFW_B_POSITION) \
 		$(OPT_SIGNED_AMDFW_B_FILE) \
-		--location $(shell printf "%#x" $(MORGANA_FW_B_POSITION)) \
+		--location $(shell printf "%#x" $(PHOENIX_FW_B_POSITION)) \
 		--anywhere \
 		--output $@
 
@@ -320,4 +320,4 @@ build_complete:: $(obj)/amdfw_a.rom $(obj)/amdfw_b.rom
 endif # CONFIG_SEPARATE_SIGNED_PSPFW
 endif
 
-endif # ($(CONFIG_SOC_AMD_MORGANA),y)
+endif # ($(CONFIG_SOC_AMD_PHOENIX),y)
diff --git a/src/soc/amd/morgana/acpi.c → src/soc/amd/phoenix/acpi.c b/src/soc/amd/morgana/acpi.c → src/soc/amd/phoenix/acpi.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-/* TODO: Update for Morgana */
+/* TODO: Update for Phoenix */
 /* TODO: See what can be made common */
 
 /* ACPI - create the Fixed ACPI Description Tables (FADT) */
@@ -53,7 +53,7 @@ unsigned long acpi_fill_madt(unsigned long current)
  */
 void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
-	const struct soc_amd_morgana_config *cfg = config_of_soc();
+	const struct soc_amd_phoenix_config *cfg = config_of_soc();
 
 	printk(BIOS_DEBUG, "pm_base: 0x%04x\n", ACPI_IO_BASE);
 

diff --git a/src/soc/amd/morgana/acpi/globalnvs.asl → src/soc/amd/phoenix/acpi/globalnvs.asl b/src/soc/amd/morgana/acpi/globalnvs.asl → src/soc/amd/phoenix/acpi/globalnvs.asl
@@ -4,7 +4,7 @@
 
 /*
  * NOTE: The layout of the GNVS structure below must match the layout in
- * soc/amd/morgana/include/soc/nvs.h !!!
+ * soc/amd/phoenix/include/soc/nvs.h !!!
  */
 
 Field (GNVS, ByteAcc, NoLock, Preserve)

diff --git a/src/soc/amd/morgana/acpi/mmio.asl → src/soc/amd/phoenix/acpi/mmio.asl b/src/soc/amd/morgana/acpi/mmio.asl → src/soc/amd/phoenix/acpi/mmio.asl
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-/* TODO: Update for Morgana */
+/* TODO: Update for Phoenix */
 
 #include <soc/amd/common/acpi/aoac.asl>
 #include <soc/aoac_defs.h>

diff --git a/src/soc/amd/morgana/acpi/pci0.asl → src/soc/amd/phoenix/acpi/pci0.asl b/src/soc/amd/morgana/acpi/pci0.asl → src/soc/amd/phoenix/acpi/pci0.asl
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-/* TODO: Update for Morgana */
+/* TODO: Update for Phoenix */
 
 Device(PCI0) {
 	Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */

diff --git a/src/soc/amd/morgana/acpi/pci_int_defs.asl → src/soc/amd/phoenix/acpi/pci_int_defs.asl b/src/soc/amd/morgana/acpi/pci_int_defs.asl → src/soc/amd/phoenix/acpi/pci_int_defs.asl
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-/* TODO: Update for Morgana */
+/* TODO: Update for Phoenix */
 
 /* PCI IRQ mapping registers, C00h-C01h. */
 OperationRegion(PRQM, SystemIO, 0x00000c00, 0x00000002)

diff --git a/src/soc/amd/morgana/acpi/soc.asl → src/soc/amd/phoenix/acpi/soc.asl b/src/soc/amd/morgana/acpi/soc.asl → src/soc/amd/phoenix/acpi/soc.asl
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-/* TODO: Update for Morgana */
+/* TODO: Update for Phoenix */
 
 #include "globalnvs.asl"
 

diff --git a/src/soc/amd/morgana/agesa_acpi.c → src/soc/amd/phoenix/agesa_acpi.c b/src/soc/amd/morgana/agesa_acpi.c → src/soc/amd/phoenix/agesa_acpi.c
diff --git a/src/soc/amd/morgana/aoac.c → src/soc/amd/phoenix/aoac.c b/src/soc/amd/morgana/aoac.c → src/soc/amd/phoenix/aoac.c