sandbox: Update dts files to reduce SPL size

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>

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 8b50a4028983b3222008e848d7a0a45d85b5f497..a8938a3accb25275e8e137ac494adb946fe1a0cb 100644 (file)
--- 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@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 7b4fc94495a9eaac688e27a5a80ce764fe67d5cd..d842f021760d29d1ab6afe9edcaeec9814904d4d 100644 (file)
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -56,7 +56,7 @@
        };
 
        gpio_a: gpios@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@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@0 {
                firmware_storage_spi: flash@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;
        };
 };