summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/amd/padmelon/Kconfig5
-rw-r--r--src/mainboard/amd/padmelon/devicetree.cb10
-rw-r--r--src/mainboard/amd/padmelon/override-merlinfalcon.cb10
-rw-r--r--src/mainboard/amd/padmelon/override-prairiefalcon.cb10
4 files changed, 25 insertions, 10 deletions
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig
index 3c6449753bbb..08bc797e2c89 100644
--- a/src/mainboard/amd/padmelon/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/padmelon/devicetree.cb b/src/mainboard/amd/padmelon/devicetree.cb
index 87d2b1ae04d0..a80539029e98 100644
--- a/src/mainboard/amd/padmelon/devicetree.cb
+++ b/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
diff --git a/src/mainboard/amd/padmelon/override-merlinfalcon.cb b/src/mainboard/amd/padmelon/override-merlinfalcon.cb
new file mode 100644
index 000000000000..160b4588574f
--- /dev/null
+++ b/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
diff --git a/src/mainboard/amd/padmelon/override-prairiefalcon.cb b/src/mainboard/amd/padmelon/override-prairiefalcon.cb
new file mode 100644
index 000000000000..e1ee1214df4b
--- /dev/null
+++ b/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