24 files changed, 15 insertions, 15 deletions
diff --git a/src/mainboard/amd/padmelon/BiosCallOuts.c b/src/mainboard/amd/pademelon/BiosCallOuts.c
index c29628527781..c29628527781 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 7fa5675678ee..7fa5675678ee 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 08bc797e2c89..9890d7f61cc4 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 000000000000..5a9020b42ecc
--- /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 30fd82c293f7..30fd82c293f7 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 e65f750cd58d..e65f750cd58d 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 96a221e5b9bc..96a221e5b9bc 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 de6ff3d92fa0..de6ff3d92fa0 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 0cbf8e321179..0cbf8e321179 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 a5846fe8482a..a5846fe8482a 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 4bca78cd84b6..845e211a3e2b 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 1f4bd3cb3900..1f4bd3cb3900 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 4b28e208c97e..4b28e208c97e 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 a0ba7255bcbd..a0ba7255bcbd 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 1f7a5da27a5f..1f7a5da27a5f 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 a2db5eaafca7..a2db5eaafca7 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 0de2c0a1904f..0de2c0a1904f 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 d01bdfd11267..d01bdfd11267 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 95758f0a4c56..95758f0a4c56 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 3b643ed3fefb..a013e6ce892e 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 640c31ac23a9..640c31ac23a9 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 e1ee1214df4b..e1ee1214df4b 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 baa86d9966a3..baa86d9966a3 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 fb88c3906ca3..000000000000
--- a/src/mainboard/amd/padmelon/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_AMD_PADMELON
-	bool "Padmelon"