diff options
author | Felix Held <felix-coreboot@felixheld.de> | 2022-10-14 17:48:22 +0200 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2022-10-15 16:53:19 +0000 |
commit | f0d62cefe855017a9e3f47aa3b0fc187ef8a5931 (patch) | |
tree | c7c12feb32e8d439da668f943c85bf29c9c41249 | |
parent | 68eb439d80919d54247114c8c6035a65a97eadc8 (diff) |
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 <felix-coreboot@felixheld.de>
Change-Id: Id1c7331f5f3c34dc7ec4bc5a1f5fe3d12d503474
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68426
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
-rw-r--r-- | Documentation/mainboard/amd/pademelon/pademelon.jpg (renamed from Documentation/mainboard/amd/padmelon/padmelon.jpg) | bin | 80772 -> 80772 bytes | |||
-rw-r--r-- | Documentation/mainboard/amd/pademelon/pademelon.md (renamed from Documentation/mainboard/amd/padmelon/padmelon.md) | 14 | ||||
-rw-r--r-- | Documentation/mainboard/amd/pademelon/pademelon_io.jpg (renamed from Documentation/mainboard/amd/padmelon/padmelon_io.jpg) | bin | 32380 -> 32380 bytes | |||
-rw-r--r-- | Documentation/mainboard/index.md | 2 | ||||
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/BiosCallOuts.c (renamed from src/mainboard/amd/padmelon/BiosCallOuts.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/BiosCallOuts.h (renamed from src/mainboard/amd/padmelon/BiosCallOuts.h) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/Kconfig (renamed from src/mainboard/amd/padmelon/Kconfig) | 22 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/Kconfig.name | 2 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/Makefile.inc (renamed from src/mainboard/amd/padmelon/Makefile.inc) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/OemCustomize.c (renamed from src/mainboard/amd/padmelon/OemCustomize.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/acpi/gpe.asl (renamed from src/mainboard/amd/padmelon/acpi/gpe.asl) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/acpi/routing.asl (renamed from src/mainboard/amd/padmelon/acpi/routing.asl) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/acpi/sleep.asl (renamed from src/mainboard/amd/padmelon/acpi/sleep.asl) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/acpi/usb_oc.asl (renamed from src/mainboard/amd/padmelon/acpi/usb_oc.asl) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/board_info.txt (renamed from src/mainboard/amd/padmelon/board_info.txt) | 2 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/bootblock/OemCustomize.c (renamed from src/mainboard/amd/padmelon/bootblock/OemCustomize.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/bootblock/bootblock.c (renamed from src/mainboard/amd/padmelon/bootblock/bootblock.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/devicetree.cb (renamed from src/mainboard/amd/padmelon/devicetree.cb) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/dsdt.asl (renamed from src/mainboard/amd/padmelon/dsdt.asl) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/fan_init.c (renamed from src/mainboard/amd/padmelon/fan_init.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/gpio.c (renamed from src/mainboard/amd/padmelon/gpio.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/gpio.h (renamed from src/mainboard/amd/padmelon/gpio.h) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/hda_verb.c (renamed from src/mainboard/amd/padmelon/hda_verb.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/mainboard.c (renamed from src/mainboard/amd/padmelon/mainboard.c) | 2 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/override-merlinfalcon.cb (renamed from src/mainboard/amd/padmelon/override-merlinfalcon.cb) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/override-prairiefalcon.cb (renamed from src/mainboard/amd/padmelon/override-prairiefalcon.cb) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/pademelon/romstage.c (renamed from src/mainboard/amd/padmelon/romstage.c) | 0 | ||||
-rw-r--r-- | src/mainboard/amd/padmelon/Kconfig.name | 2 |
29 files changed, 24 insertions, 24 deletions
diff --git a/Documentation/mainboard/amd/padmelon/padmelon.jpg b/Documentation/mainboard/amd/pademelon/pademelon.jpg Binary files differindex 76ee578615..76ee578615 100644 --- a/Documentation/mainboard/amd/padmelon/padmelon.jpg +++ b/Documentation/mainboard/amd/pademelon/pademelon.jpg diff --git a/Documentation/mainboard/amd/padmelon/padmelon.md b/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 Binary files differindex ed715d4577..ed715d4577 100644 --- a/Documentation/mainboard/amd/padmelon/padmelon_io.jpg +++ b/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 index c296285277..c296285277 100644 --- a/src/mainboard/amd/padmelon/BiosCallOuts.c +++ b/src/mainboard/amd/pademelon/BiosCallOuts.c diff --git a/src/mainboard/amd/padmelon/BiosCallOuts.h b/src/mainboard/amd/pademelon/BiosCallOuts.h index 7fa5675678..7fa5675678 100644 --- a/src/mainboard/amd/padmelon/BiosCallOuts.h +++ b/src/mainboard/amd/pademelon/BiosCallOuts.h diff --git a/src/mainboard/amd/padmelon/Kconfig b/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 index 30fd82c293..30fd82c293 100644 --- a/src/mainboard/amd/padmelon/Makefile.inc +++ b/src/mainboard/amd/pademelon/Makefile.inc diff --git a/src/mainboard/amd/padmelon/OemCustomize.c b/src/mainboard/amd/pademelon/OemCustomize.c index e65f750cd5..e65f750cd5 100644 --- a/src/mainboard/amd/padmelon/OemCustomize.c +++ b/src/mainboard/amd/pademelon/OemCustomize.c diff --git a/src/mainboard/amd/padmelon/acpi/gpe.asl b/src/mainboard/amd/pademelon/acpi/gpe.asl index 96a221e5b9..96a221e5b9 100644 --- a/src/mainboard/amd/padmelon/acpi/gpe.asl +++ b/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 index de6ff3d92f..de6ff3d92f 100644 --- a/src/mainboard/amd/padmelon/acpi/routing.asl +++ b/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 index 0cbf8e3211..0cbf8e3211 100644 --- a/src/mainboard/amd/padmelon/acpi/sleep.asl +++ b/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 index a5846fe848..a5846fe848 100644 --- a/src/mainboard/amd/padmelon/acpi/usb_oc.asl +++ b/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 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 index 1f4bd3cb39..1f4bd3cb39 100644 --- a/src/mainboard/amd/padmelon/bootblock/OemCustomize.c +++ b/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 index 4b28e208c9..4b28e208c9 100644 --- a/src/mainboard/amd/padmelon/bootblock/bootblock.c +++ b/src/mainboard/amd/pademelon/bootblock/bootblock.c diff --git a/src/mainboard/amd/padmelon/devicetree.cb b/src/mainboard/amd/pademelon/devicetree.cb index a0ba7255bc..a0ba7255bc 100644 --- a/src/mainboard/amd/padmelon/devicetree.cb +++ b/src/mainboard/amd/pademelon/devicetree.cb diff --git a/src/mainboard/amd/padmelon/dsdt.asl b/src/mainboard/amd/pademelon/dsdt.asl index 1f7a5da27a..1f7a5da27a 100644 --- a/src/mainboard/amd/padmelon/dsdt.asl +++ b/src/mainboard/amd/pademelon/dsdt.asl diff --git a/src/mainboard/amd/padmelon/fan_init.c b/src/mainboard/amd/pademelon/fan_init.c index a2db5eaafc..a2db5eaafc 100644 --- a/src/mainboard/amd/padmelon/fan_init.c +++ b/src/mainboard/amd/pademelon/fan_init.c diff --git a/src/mainboard/amd/padmelon/gpio.c b/src/mainboard/amd/pademelon/gpio.c index 0de2c0a190..0de2c0a190 100644 --- a/src/mainboard/amd/padmelon/gpio.c +++ b/src/mainboard/amd/pademelon/gpio.c diff --git a/src/mainboard/amd/padmelon/gpio.h b/src/mainboard/amd/pademelon/gpio.h index d01bdfd112..d01bdfd112 100644 --- a/src/mainboard/amd/padmelon/gpio.h +++ b/src/mainboard/amd/pademelon/gpio.h diff --git a/src/mainboard/amd/padmelon/hda_verb.c b/src/mainboard/amd/pademelon/hda_verb.c index 95758f0a4c..95758f0a4c 100644 --- a/src/mainboard/amd/padmelon/hda_verb.c +++ b/src/mainboard/amd/pademelon/hda_verb.c diff --git a/src/mainboard/amd/padmelon/mainboard.c b/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 index 640c31ac23..640c31ac23 100644 --- a/src/mainboard/amd/padmelon/override-merlinfalcon.cb +++ b/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 index e1ee1214df..e1ee1214df 100644 --- a/src/mainboard/amd/padmelon/override-prairiefalcon.cb +++ b/src/mainboard/amd/pademelon/override-prairiefalcon.cb diff --git a/src/mainboard/amd/padmelon/romstage.c b/src/mainboard/amd/pademelon/romstage.c index baa86d9966..baa86d9966 100644 --- a/src/mainboard/amd/padmelon/romstage.c +++ b/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" |