mb/amd/padmelon: use override devicetrees for the different APUs

Since the devicetree files are passed to util/sconfig without being
processed by the C preprocessor, using #if in the devicetree won't give
the behavior that might be expected. Instead sconfig treats the #if as a
comment, but still processes all other lines. To get the intended
behavior, replace the C preprocessor usage in the devicetree by moving
the APU-specific parts to override devicetrees that get selected
according to the selected APU type.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Iddd317b27a838849fa40c0fb77d942609104cf04
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68312
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/amd/padmelon/Kconfig

@@ -38,6 +38,11 @@ config PADMELON_PRAIRIE_FALCON
 
 endchoice
 
+
+config OVERRIDE_DEVICETREE
+	default "override-merlinfalcon.cb" if PADMELON_MERLIN_FALCON
+	default "override-prairiefalcon.cb" if PADMELON_PRAIRIE_FALCON
+
 config MAX_CPUS
 	int
 	default 4

src/mainboard/amd/padmelon/devicetree.cb

@@ -1,16 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 chip soc/amd/stoneyridge
-
-	register "spd_addr_lookup" = "
-	{
-#if CONFIG(AMD_APU_MERLINFALCON)
-		{ {0xA0, 0x00}, {0xA4, 0x00} }, // socket 0 - Channel 0 & 1, slot 0
-#else
-		{ {0xA0, 0x00} }, // socket 0 - Channel 0, slot 0
-#endif
-	}"
-
 	register "uma_mode" = "UMAMODE_AUTO_LEGACY"
 
 	device cpu_cluster 0 on

src/mainboard/amd/padmelon/override-merlinfalcon.cb

@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+chip soc/amd/stoneyridge
+	register "spd_addr_lookup" = "
+	{
+		{ {0xA0, 0x00}, {0xA4, 0x00} }, // socket 0 - Channel 0 & 1, slot 0
+	}"
+
+	device domain 0 on end
+end

src/mainboard/amd/padmelon/override-prairiefalcon.cb

@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+chip soc/amd/stoneyridge
+	register "spd_addr_lookup" = "
+	{
+		{ {0xA0, 0x00} }, // socket 0 - Channel 0, slot 0
+	}"
+
+	device domain 0 on end
+end