From f0d62cefe855017a9e3f47aa3b0fc187ef8a5931 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 14 Oct 2022 17:48:22 +0200 Subject: [PATCH] mb/amd/padmelon: rename to pademelon This AMD reference board is called Pademelon and not Padmelon, so fix the name in coreboot. Also update the corresponding documentation. Signed-off-by: Felix Held Change-Id: Id1c7331f5f3c34dc7ec4bc5a1f5fe3d12d503474 Reviewed-on: https://review.coreboot.org/c/coreboot/+/68426 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- .../padmelon.jpg => pademelon/pademelon.jpg} | Bin .../padmelon.md => pademelon/pademelon.md} | 14 +++++------ .../pademelon_io.jpg} | Bin Documentation/mainboard/index.md | 2 +- MAINTAINERS | 2 +- .../{padmelon => pademelon}/BiosCallOuts.c | 0 .../{padmelon => pademelon}/BiosCallOuts.h | 0 .../amd/{padmelon => pademelon}/Kconfig | 22 +++++++++--------- src/mainboard/amd/pademelon/Kconfig.name | 2 ++ .../amd/{padmelon => pademelon}/Makefile.inc | 0 .../{padmelon => pademelon}/OemCustomize.c | 0 .../amd/{padmelon => pademelon}/acpi/gpe.asl | 0 .../{padmelon => pademelon}/acpi/routing.asl | 0 .../{padmelon => pademelon}/acpi/sleep.asl | 0 .../{padmelon => pademelon}/acpi/usb_oc.asl | 0 .../{padmelon => pademelon}/board_info.txt | 2 +- .../bootblock/OemCustomize.c | 0 .../bootblock/bootblock.c | 0 .../amd/{padmelon => pademelon}/devicetree.cb | 0 .../amd/{padmelon => pademelon}/dsdt.asl | 0 .../amd/{padmelon => pademelon}/fan_init.c | 0 .../amd/{padmelon => pademelon}/gpio.c | 0 .../amd/{padmelon => pademelon}/gpio.h | 0 .../amd/{padmelon => pademelon}/hda_verb.c | 0 .../amd/{padmelon => pademelon}/mainboard.c | 2 +- .../override-merlinfalcon.cb | 0 .../override-prairiefalcon.cb | 0 .../amd/{padmelon => pademelon}/romstage.c | 0 src/mainboard/amd/padmelon/Kconfig.name | 2 -- 29 files changed, 24 insertions(+), 24 deletions(-) rename Documentation/mainboard/amd/{padmelon/padmelon.jpg => pademelon/pademelon.jpg} (100%) rename Documentation/mainboard/amd/{padmelon/padmelon.md => pademelon/pademelon.md} (90%) rename Documentation/mainboard/amd/{padmelon/padmelon_io.jpg => pademelon/pademelon_io.jpg} (100%) rename src/mainboard/amd/{padmelon => pademelon}/BiosCallOuts.c (100%) rename src/mainboard/amd/{padmelon => pademelon}/BiosCallOuts.h (100%) rename src/mainboard/amd/{padmelon => pademelon}/Kconfig (73%) create mode 100644 src/mainboard/amd/pademelon/Kconfig.name rename src/mainboard/amd/{padmelon => pademelon}/Makefile.inc (100%) rename src/mainboard/amd/{padmelon => pademelon}/OemCustomize.c (100%) rename src/mainboard/amd/{padmelon => pademelon}/acpi/gpe.asl (100%) rename src/mainboard/amd/{padmelon => pademelon}/acpi/routing.asl (100%) rename src/mainboard/amd/{padmelon => pademelon}/acpi/sleep.asl (100%) rename src/mainboard/amd/{padmelon => pademelon}/acpi/usb_oc.asl (100%) rename src/mainboard/amd/{padmelon => pademelon}/board_info.txt (84%) rename src/mainboard/amd/{padmelon => pademelon}/bootblock/OemCustomize.c (100%) rename src/mainboard/amd/{padmelon => pademelon}/bootblock/bootblock.c (100%) rename src/mainboard/amd/{padmelon => pademelon}/devicetree.cb (100%) rename src/mainboard/amd/{padmelon => pademelon}/dsdt.asl (100%) rename src/mainboard/amd/{padmelon => pademelon}/fan_init.c (100%) rename src/mainboard/amd/{padmelon => pademelon}/gpio.c (100%) rename src/mainboard/amd/{padmelon => pademelon}/gpio.h (100%) rename src/mainboard/amd/{padmelon => pademelon}/hda_verb.c (100%) rename src/mainboard/amd/{padmelon => pademelon}/mainboard.c (98%) rename src/mainboard/amd/{padmelon => pademelon}/override-merlinfalcon.cb (100%) rename src/mainboard/amd/{padmelon => pademelon}/override-prairiefalcon.cb (100%) rename src/mainboard/amd/{padmelon => pademelon}/romstage.c (100%) delete mode 100644 src/mainboard/amd/padmelon/Kconfig.name diff --git a/Documentation/mainboard/amd/padmelon/padmelon.jpg b/Documentation/mainboard/amd/pademelon/pademelon.jpg similarity index 100% rename from Documentation/mainboard/amd/padmelon/padmelon.jpg rename to Documentation/mainboard/amd/pademelon/pademelon.jpg diff --git a/Documentation/mainboard/amd/padmelon/padmelon.md b/Documentation/mainboard/amd/pademelon/pademelon.md similarity index 90% rename from Documentation/mainboard/amd/padmelon/padmelon.md rename to Documentation/mainboard/amd/pademelon/pademelon.md index 975426d8c6..5f053d4cc5 100644 --- a/Documentation/mainboard/amd/padmelon/padmelon.md +++ b/Documentation/mainboard/amd/pademelon/pademelon.md @@ -1,4 +1,4 @@ -# Padmelon board +# Pademelon board ## Specs (with Merlin Falcon SOC) @@ -18,7 +18,7 @@ ## Mainboard -![mainboard][padmelon] +![mainboard][pademelon] Three items are marked in this picture 1. dediprog header @@ -27,7 +27,7 @@ Three items are marked in this picture ## Back panel -![back panel][padmelon_io] +![back panel][pademelon_io] * The lower serial port is UART A (debug serial) @@ -65,9 +65,9 @@ Three items are marked in this picture ```eval_rst +----------------------------+----------------------------------------+ -|padmelon.jpg | Motherboard with components identified | +|pademelon.jpg | Motherboard with components identified | +----------------------------+----------------------------------------+ -|padmelon_io.jpg | Back panel picture | +|pademelon_io.jpg | Back panel picture | +----------------------------+----------------------------------------+ ``` @@ -76,5 +76,5 @@ Three items are marked in this picture [Merlin Falcon BKDG][merlinfalcon] [merlinfalcon]: ../../../soc/amd/family15h.md -[padmelon]: padmelon.jpg -[padmelon_io]: padmelon_io.jpg +[pademelon]: pademelon.jpg +[pademelon_io]: pademelon_io.jpg diff --git a/Documentation/mainboard/amd/padmelon/padmelon_io.jpg b/Documentation/mainboard/amd/pademelon/pademelon_io.jpg similarity index 100% rename from Documentation/mainboard/amd/padmelon/padmelon_io.jpg rename to Documentation/mainboard/amd/pademelon/pademelon_io.jpg diff --git a/Documentation/mainboard/index.md b/Documentation/mainboard/index.md index 25200ac9c1..91ed2c8ba2 100644 --- a/Documentation/mainboard/index.md +++ b/Documentation/mainboard/index.md @@ -11,7 +11,7 @@ This section contains documentation about coreboot on specific mainboards. - [G43T-AM3](acer/g43t-am3.md) ## AMD -- [padmelon](amd/padmelon/padmelon.md) +- [pademelon](amd/pademelon/pademelon.md) ## ASRock diff --git a/MAINTAINERS b/MAINTAINERS index d753c3f779..8590e04665 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -153,7 +153,7 @@ L: amd_coreboot_org_changes@googlegroups.com F: src/mainboard/amd/gardenia/ F: src/mainboard/amd/inagua/ F: src/mainboard/amd/olivehill/ -F: src/mainboard/amd/padmelon/ +F: src/mainboard/amd/pademelon/ F: src/mainboard/amd/parmer/ F: src/mainboard/amd/persimmon/ F: src/mainboard/amd/south_station/ diff --git a/src/mainboard/amd/padmelon/BiosCallOuts.c b/src/mainboard/amd/pademelon/BiosCallOuts.c similarity index 100% rename from src/mainboard/amd/padmelon/BiosCallOuts.c rename to src/mainboard/amd/pademelon/BiosCallOuts.c diff --git a/src/mainboard/amd/padmelon/BiosCallOuts.h b/src/mainboard/amd/pademelon/BiosCallOuts.h similarity index 100% rename from src/mainboard/amd/padmelon/BiosCallOuts.h rename to src/mainboard/amd/pademelon/BiosCallOuts.h diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/pademelon/Kconfig similarity index 73% rename from src/mainboard/amd/padmelon/Kconfig rename to src/mainboard/amd/pademelon/Kconfig index 08bc797e2c..9890d7f61c 100644 --- a/src/mainboard/amd/padmelon/Kconfig +++ b/src/mainboard/amd/pademelon/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -if BOARD_AMD_PADMELON +if BOARD_AMD_PADEMELON config BOARD_SPECIFIC_OPTIONS def_bool y @@ -19,20 +19,20 @@ config BOARD_SPECIFIC_OPTIONS select AZALIA_PLUGIN_SUPPORT config MAINBOARD_DIR - default "amd/padmelon" + default "amd/pademelon" config MAINBOARD_PART_NUMBER - default "Padmelon" + default "Pademelon" choice - prompt "SOC used in padmelon board" - default PADMELON_MERLIN_FALCON + prompt "SOC used in pademelon board" + default PADEMELON_MERLIN_FALCON -config PADMELON_MERLIN_FALCON +config PADEMELON_MERLIN_FALCON bool "Merlin Falcon" select AMD_APU_MERLINFALCON -config PADMELON_PRAIRIE_FALCON +config PADEMELON_PRAIRIE_FALCON bool "Prairie Falcon" select AMD_APU_PRAIRIEFALCON @@ -40,8 +40,8 @@ endchoice config OVERRIDE_DEVICETREE - default "override-merlinfalcon.cb" if PADMELON_MERLIN_FALCON - default "override-prairiefalcon.cb" if PADMELON_PRAIRIE_FALCON + default "override-merlinfalcon.cb" if PADEMELON_MERLIN_FALCON + default "override-prairiefalcon.cb" if PADEMELON_PRAIRIE_FALCON config MAX_CPUS int @@ -61,7 +61,7 @@ config HWM_PORT HWM base address must be an odd address. Hardware monitor used addresses are HWM_PORT for index an HWM_PORT + 1 for data. If changed, make sure fan_init.c IO window setting. The HWM - (Hardware Monitor) is used for fan control within padmelon. + (Hardware Monitor) is used for fan control within pademelon. if !EM100 config EFS_SPI_READ_MODE @@ -71,4 +71,4 @@ config EFS_SPI_SPEED default 0 # 66MHz endif -endif # BOARD_AMD_PADMELON +endif # BOARD_AMD_PADEMELON diff --git a/src/mainboard/amd/pademelon/Kconfig.name b/src/mainboard/amd/pademelon/Kconfig.name new file mode 100644 index 0000000000..5a9020b42e --- /dev/null +++ b/src/mainboard/amd/pademelon/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_AMD_PADEMELON + bool "Pademelon" diff --git a/src/mainboard/amd/padmelon/Makefile.inc b/src/mainboard/amd/pademelon/Makefile.inc similarity index 100% rename from src/mainboard/amd/padmelon/Makefile.inc rename to src/mainboard/amd/pademelon/Makefile.inc diff --git a/src/mainboard/amd/padmelon/OemCustomize.c b/src/mainboard/amd/pademelon/OemCustomize.c similarity index 100% rename from src/mainboard/amd/padmelon/OemCustomize.c rename to src/mainboard/amd/pademelon/OemCustomize.c diff --git a/src/mainboard/amd/padmelon/acpi/gpe.asl b/src/mainboard/amd/pademelon/acpi/gpe.asl similarity index 100% rename from src/mainboard/amd/padmelon/acpi/gpe.asl rename to src/mainboard/amd/pademelon/acpi/gpe.asl diff --git a/src/mainboard/amd/padmelon/acpi/routing.asl b/src/mainboard/amd/pademelon/acpi/routing.asl similarity index 100% rename from src/mainboard/amd/padmelon/acpi/routing.asl rename to src/mainboard/amd/pademelon/acpi/routing.asl diff --git a/src/mainboard/amd/padmelon/acpi/sleep.asl b/src/mainboard/amd/pademelon/acpi/sleep.asl similarity index 100% rename from src/mainboard/amd/padmelon/acpi/sleep.asl rename to src/mainboard/amd/pademelon/acpi/sleep.asl diff --git a/src/mainboard/amd/padmelon/acpi/usb_oc.asl b/src/mainboard/amd/pademelon/acpi/usb_oc.asl similarity index 100% rename from src/mainboard/amd/padmelon/acpi/usb_oc.asl rename to src/mainboard/amd/pademelon/acpi/usb_oc.asl diff --git a/src/mainboard/amd/padmelon/board_info.txt b/src/mainboard/amd/pademelon/board_info.txt similarity index 84% rename from src/mainboard/amd/padmelon/board_info.txt rename to src/mainboard/amd/pademelon/board_info.txt index 4bca78cd84..845e211a3e 100644 --- a/src/mainboard/amd/padmelon/board_info.txt +++ b/src/mainboard/amd/pademelon/board_info.txt @@ -1,5 +1,5 @@ Vendor name: AMD -Board name: Padmelon +Board name: Pademelon Category: desktop ROM package: SOIC-8 ROM protocol: SPI diff --git a/src/mainboard/amd/padmelon/bootblock/OemCustomize.c b/src/mainboard/amd/pademelon/bootblock/OemCustomize.c similarity index 100% rename from src/mainboard/amd/padmelon/bootblock/OemCustomize.c rename to src/mainboard/amd/pademelon/bootblock/OemCustomize.c diff --git a/src/mainboard/amd/padmelon/bootblock/bootblock.c b/src/mainboard/amd/pademelon/bootblock/bootblock.c similarity index 100% rename from src/mainboard/amd/padmelon/bootblock/bootblock.c rename to src/mainboard/amd/pademelon/bootblock/bootblock.c diff --git a/src/mainboard/amd/padmelon/devicetree.cb b/src/mainboard/amd/pademelon/devicetree.cb similarity index 100% rename from src/mainboard/amd/padmelon/devicetree.cb rename to src/mainboard/amd/pademelon/devicetree.cb diff --git a/src/mainboard/amd/padmelon/dsdt.asl b/src/mainboard/amd/pademelon/dsdt.asl similarity index 100% rename from src/mainboard/amd/padmelon/dsdt.asl rename to src/mainboard/amd/pademelon/dsdt.asl diff --git a/src/mainboard/amd/padmelon/fan_init.c b/src/mainboard/amd/pademelon/fan_init.c similarity index 100% rename from src/mainboard/amd/padmelon/fan_init.c rename to src/mainboard/amd/pademelon/fan_init.c diff --git a/src/mainboard/amd/padmelon/gpio.c b/src/mainboard/amd/pademelon/gpio.c similarity index 100% rename from src/mainboard/amd/padmelon/gpio.c rename to src/mainboard/amd/pademelon/gpio.c diff --git a/src/mainboard/amd/padmelon/gpio.h b/src/mainboard/amd/pademelon/gpio.h similarity index 100% rename from src/mainboard/amd/padmelon/gpio.h rename to src/mainboard/amd/pademelon/gpio.h diff --git a/src/mainboard/amd/padmelon/hda_verb.c b/src/mainboard/amd/pademelon/hda_verb.c similarity index 100% rename from src/mainboard/amd/padmelon/hda_verb.c rename to src/mainboard/amd/pademelon/hda_verb.c diff --git a/src/mainboard/amd/padmelon/mainboard.c b/src/mainboard/amd/pademelon/mainboard.c similarity index 98% rename from src/mainboard/amd/padmelon/mainboard.c rename to src/mainboard/amd/pademelon/mainboard.c index 3b643ed3fe..a013e6ce89 100644 --- a/src/mainboard/amd/padmelon/mainboard.c +++ b/src/mainboard/amd/pademelon/mainboard.c @@ -101,7 +101,7 @@ static void mainboard_init(void *chip_info) } /************************************************* - * enable the dedicated function in padmelon board. + * enable the dedicated function in pademelon board. *************************************************/ static void mainboard_enable(struct device *dev) { diff --git a/src/mainboard/amd/padmelon/override-merlinfalcon.cb b/src/mainboard/amd/pademelon/override-merlinfalcon.cb similarity index 100% rename from src/mainboard/amd/padmelon/override-merlinfalcon.cb rename to src/mainboard/amd/pademelon/override-merlinfalcon.cb diff --git a/src/mainboard/amd/padmelon/override-prairiefalcon.cb b/src/mainboard/amd/pademelon/override-prairiefalcon.cb similarity index 100% rename from src/mainboard/amd/padmelon/override-prairiefalcon.cb rename to src/mainboard/amd/pademelon/override-prairiefalcon.cb diff --git a/src/mainboard/amd/padmelon/romstage.c b/src/mainboard/amd/pademelon/romstage.c similarity index 100% rename from src/mainboard/amd/padmelon/romstage.c rename to src/mainboard/amd/pademelon/romstage.c diff --git a/src/mainboard/amd/padmelon/Kconfig.name b/src/mainboard/amd/padmelon/Kconfig.name deleted file mode 100644 index fb88c3906c..0000000000 --- a/src/mainboard/amd/padmelon/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_AMD_PADMELON - bool "Padmelon"