diff options
| author | Martin Roth <gaumless@gmail.com> | 2023-01-04 21:27:06 -0700 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2023-01-12 03:13:17 +0000 |
| commit | 20646cdbe80737e3a931dec70a8279163b2a9d60 (patch) | |
| tree | 54a14680804d1cb8cbd0d2000dd0b3ec8319945b /src/mainboard/amd/mayan | |
| parent | ba2cef5b54938cce17871143ea9bbd3fc6868971 (diff) | |
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>
Diffstat (limited to 'src/mainboard/amd/mayan')
| -rw-r--r-- | src/mainboard/amd/mayan/Kconfig | 10 | ||||
| -rw-r--r-- | src/mainboard/amd/mayan/Kconfig.name | 6 | ||||
| -rw-r--r-- | src/mainboard/amd/mayan/devicetree_phoenix.cb (renamed from src/mainboard/amd/mayan/devicetree_morgana.cb) | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/mayan/gpio.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/mainboard/amd/mayan/Kconfig b/src/mainboard/amd/mayan/Kconfig index 8cd412a10e..797b5e59ce 100644 --- 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 index 1d60d67882..9c99748b05 100644 --- 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/src/mainboard/amd/mayan/devicetree_morgana.cb b/src/mainboard/amd/mayan/devicetree_phoenix.cb index cfcacfa013..ec88892f23 100644 --- a/src/mainboard/amd/mayan/devicetree_morgana.cb +++ b/src/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 index b17061d516..2245e3bac4 100644 --- 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), |