[PATCH 04/26] sandbox: Update dts files to reduce SPL size

Simon Glass
2020-12-19T17:39:56Z

At present there are require a few devices in the devicetree which are
not actually used in SPL. This will cause problems with the new
of-platdata, since it will try to instantiate devices which are not
compiled into U-Boot.

Update the devicetree to remove these devices from SPL.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

arch/sandbox/dts/sandbox.dts | 4 ++--
arch/sandbox/dts/sandbox.dtsi | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 8b50a402898..a8938a3accb 100644
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -41,7 +41,7 @@

cros_ec: cros-ec {
reg = <0 0>;
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-proper;
compatible = "google,cros-ec-sandbox";
};

@@ -83,7 +83,7 @@
};

spi: spi at 0 {
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-proper;
#address-cells = <1>;
#size-cells = <0>;
reg = <0 0>;
diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index 7b4fc94495a..d842f021760 100644
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -56,7 +56,7 @@
};

gpio_a: gpios at 0 {
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-proper;
gpio-controller;
compatible = "sandbox,gpio";
#gpio-cells = <1>;
@@ -65,7 +65,7 @@
};

gpio_b: gpios at 1 {
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-proper;
gpio-controller;
compatible = "sandbox,gpio";
#gpio-cells = <2>;
@@ -120,7 +120,7 @@
};

lcd {
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-proper;
compatible = "sandbox,lcd-sdl";
xres = <1366>;
yres = <768>;
@@ -209,7 +209,7 @@

spi at 0 {
firmware_storage_spi: flash at 0 {
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-proper;
reg = <0>;
compatible = "spansion,m25p16", "jedec,spi-nor";
spi-max-frequency = <40000000>;
@@ -278,7 +278,6 @@
};

tpm {
- u-boot,dm-pre-reloc;
compatible = "google,sandbox-tpm";
};

@@ -415,6 +414,6 @@
};

keyboard-controller {
- u-boot,dm-pre-reloc;
+ u-boot,dm-pre-proper;
};
};
--
2.29.2.684.gfbc64c5ab5-goog