[PATCH v2 01/12] sandbox: dts: retire skeleton.dtsi

[Sascha Hauer]

On Mon, Oct 12, 2020 at 08:26:08AM +0200, Ahmad Fatoum wrote:
> Follow up commits will flesh out the sandbox.dts and make most of what's
> in the skeleton.dtsi redundant. Merge the .dtsi with the .dts to have
> all the code at one place.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
> ---
> v1 -> v2: no changes
> ---
>  arch/sandbox/dts/sandbox.dts   | 16 ++++++++++++++--
>  arch/sandbox/dts/skeleton.dtsi | 13 -------------
>  2 files changed, 14 insertions(+), 15 deletions(-)
>  delete mode 100644 arch/sandbox/dts/skeleton.dtsi

Applied, thanks

Sascha

> 
> diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
> index 4576e873d9cb..b3327837a38a 100644
> --- a/arch/sandbox/dts/sandbox.dts
> +++ b/arch/sandbox/dts/sandbox.dts
> @@ -1,8 +1,20 @@
>  /dts-v1/;
>  
> -#include "skeleton.dtsi"
> -
>  / {
>  	model = "Sandbox";
>  	compatible = "barebox,sandbox";
> +
> +	#address-cells = <2>;
> +	#size-cells = <2>;
> +
> +	aliases {
> +	};
> +
> +	chosen {
> +	};
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0 0 0 0>;
> +	};
>  };
> diff --git a/arch/sandbox/dts/skeleton.dtsi b/arch/sandbox/dts/skeleton.dtsi
> deleted file mode 100644
> index 8ba7663eb5c0..000000000000
> --- a/arch/sandbox/dts/skeleton.dtsi
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -/*
> - * Skeleton device tree; the bare minimum needed to boot; just include and
> - * add a compatible value.  The bootloader will typically populate the memory
> - * node.
> - */
> -
> -/ {
> -	#address-cells = <2>;
> -	#size-cells = <2>;
> -	chosen { };
> -	aliases { };
> -	memory { device_type = "memory"; reg = <0 0 0 0>; };
> -};
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |