board: siemens: iot2050: Stop using special spl DT sources

We can simply use the default DT, Basic PG1, because no nodes that are
different between the variants play a role for SPL. Will help with the
migration to OF_UPSTREAM.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 8b9ced128b6f9a26d8d8ead833c3c95c0afb6cb9..077a36c07a410c44a84f7752da6b543ab360f336 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1163,7 +1163,6 @@ dtb-$(CONFIG_STM32MP25X) += \
 dtb-$(CONFIG_SOC_K3_AM654) += \
        k3-am654-base-board.dtb \
        k3-am654-r5-base-board.dtb \
-       k3-am65-iot2050-spl.dtb \
        k3-am6528-iot2050-basic.dtb \
        k3-am6528-iot2050-basic-pg2.dtb \
        k3-am6548-iot2050-advanced.dtb \

diff --git a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
index 3a6db91e132531eaaca95d3b567b837bfe6ee511..e17cd78e56ce0355fd93a16aec242ec79a2a44ed 100644 (file)
--- a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
+++ b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
@@ -84,12 +84,12 @@
                                };
 
                                fdt-0 {
-                                       description = "k3-am65-iot2050-spl.dtb";
+                                       description = "k3-am6528-iot2050-basic.dtb";
                                        type = "flat_dt";
                                        arch = "arm";
                                        compression = "none";
                                        blob-ext {
-                                               filename = "spl/dts/k3-am65-iot2050-spl.dtb";
+                                               filename = "spl/dts/k3-am6528-iot2050-basic.dtb";
                                        };
                                };
                        };

diff --git a/arch/arm/dts/k3-am65-iot2050-spl.dts b/arch/arm/dts/k3-am65-iot2050-spl.dts
deleted file mode 100644 (file)
index 4e668fa..0000000
--- a/arch/arm/dts/k3-am65-iot2050-spl.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) Siemens AG, 2018-2021
- *
- * Authors:
- *   Jan Kiszka <jan.kiszka@siemens.com>
- */
-
-/dts-v1/;
-
-#include "k3-am65-iot2050-common.dtsi"
-#include "k3-am65-iot2050-common-u-boot.dtsi"
-
-/ {
-       compatible = "siemens,iot2050", "ti,am654";
-       model = "Siemens IOT2050";
-};

diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig
index 401e57adecad87c09a75d34083f81607f281c254..22990ba1f9611c430151cbda33f875b26f88cc6d 100644 (file)
--- a/configs/iot2050_defconfig
+++ b/configs/iot2050_defconfig
@@ -80,7 +80,6 @@ CONFIG_CMD_TIME=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_SPL_MULTI_DTB_FIT=y
-CONFIG_SPL_OF_LIST="k3-am65-iot2050-spl"
 CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y