* [PATCH] ARM: dts: Remove skeleton.dtsi
@ 2014-06-06 12:01 Alexander Shiyan
2014-07-07 6:25 ` Sascha Hauer
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Shiyan @ 2014-06-06 12:01 UTC (permalink / raw)
To: barebox
Reuse basic "skeleton.dtsi" template for some DTS targets.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/dts/dm365.dtsi | 2 +-
arch/arm/dts/imx25.dtsi | 1 -
arch/arm/dts/k1879hb1ya.dtsi | 2 +-
arch/arm/dts/skeleton.dtsi | 13 -------------
arch/arm/dts/socfpga.dtsi | 2 +-
arch/arm/dts/tegra30.dtsi | 2 +-
6 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 arch/arm/dts/skeleton.dtsi
diff --git a/arch/arm/dts/dm365.dtsi b/arch/arm/dts/dm365.dtsi
index ea69007..c571908 100644
--- a/arch/arm/dts/dm365.dtsi
+++ b/arch/arm/dts/dm365.dtsi
@@ -1,4 +1,4 @@
-#include "skeleton.dtsi"
+#include <arm/skeleton.dtsi>
/ {
soc {
diff --git a/arch/arm/dts/imx25.dtsi b/arch/arm/dts/imx25.dtsi
index 13fbcc4..082429a 100644
--- a/arch/arm/dts/imx25.dtsi
+++ b/arch/arm/dts/imx25.dtsi
@@ -9,7 +9,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-#include "skeleton.dtsi"
#include <arm/imx25.dtsi>
/ {
diff --git a/arch/arm/dts/k1879hb1ya.dtsi b/arch/arm/dts/k1879hb1ya.dtsi
index 83ba7fb..87a0faa 100644
--- a/arch/arm/dts/k1879hb1ya.dtsi
+++ b/arch/arm/dts/k1879hb1ya.dtsi
@@ -1,4 +1,4 @@
-#include "skeleton.dtsi"
+#include <arm/skeleton.dtsi>
/ {
soc {
diff --git a/arch/arm/dts/skeleton.dtsi b/arch/arm/dts/skeleton.dtsi
deleted file mode 100644
index b41d241..0000000
--- a/arch/arm/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 = <1>;
- #size-cells = <1>;
- chosen { };
- aliases { };
- memory { device_type = "memory"; reg = <0 0>; };
-};
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 3368b45..192b6de 100644
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/include/ "skeleton.dtsi"
+#include <arm/skeleton.dtsi>
/ {
#address-cells = <1>;
diff --git a/arch/arm/dts/tegra30.dtsi b/arch/arm/dts/tegra30.dtsi
index 19a84e9..023db9f 100644
--- a/arch/arm/dts/tegra30.dtsi
+++ b/arch/arm/dts/tegra30.dtsi
@@ -3,7 +3,7 @@
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
+#include <arm/skeleton.dtsi>
/ {
compatible = "nvidia,tegra30";
--
1.8.5.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: Remove skeleton.dtsi
2014-06-06 12:01 [PATCH] ARM: dts: Remove skeleton.dtsi Alexander Shiyan
@ 2014-07-07 6:25 ` Sascha Hauer
2014-07-09 5:39 ` Sascha Hauer
0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2014-07-07 6:25 UTC (permalink / raw)
To: Alexander Shiyan; +Cc: barebox
On Fri, Jun 06, 2014 at 04:01:55PM +0400, Alexander Shiyan wrote:
> Reuse basic "skeleton.dtsi" template for some DTS targets.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Applied, thanks
Sascha
> ---
> arch/arm/dts/dm365.dtsi | 2 +-
> arch/arm/dts/imx25.dtsi | 1 -
> arch/arm/dts/k1879hb1ya.dtsi | 2 +-
> arch/arm/dts/skeleton.dtsi | 13 -------------
> arch/arm/dts/socfpga.dtsi | 2 +-
> arch/arm/dts/tegra30.dtsi | 2 +-
> 6 files changed, 4 insertions(+), 18 deletions(-)
> delete mode 100644 arch/arm/dts/skeleton.dtsi
>
> diff --git a/arch/arm/dts/dm365.dtsi b/arch/arm/dts/dm365.dtsi
> index ea69007..c571908 100644
> --- a/arch/arm/dts/dm365.dtsi
> +++ b/arch/arm/dts/dm365.dtsi
> @@ -1,4 +1,4 @@
> -#include "skeleton.dtsi"
> +#include <arm/skeleton.dtsi>
>
> / {
> soc {
> diff --git a/arch/arm/dts/imx25.dtsi b/arch/arm/dts/imx25.dtsi
> index 13fbcc4..082429a 100644
> --- a/arch/arm/dts/imx25.dtsi
> +++ b/arch/arm/dts/imx25.dtsi
> @@ -9,7 +9,6 @@
> * http://www.gnu.org/copyleft/gpl.html
> */
>
> -#include "skeleton.dtsi"
> #include <arm/imx25.dtsi>
>
> / {
> diff --git a/arch/arm/dts/k1879hb1ya.dtsi b/arch/arm/dts/k1879hb1ya.dtsi
> index 83ba7fb..87a0faa 100644
> --- a/arch/arm/dts/k1879hb1ya.dtsi
> +++ b/arch/arm/dts/k1879hb1ya.dtsi
> @@ -1,4 +1,4 @@
> -#include "skeleton.dtsi"
> +#include <arm/skeleton.dtsi>
>
> / {
> soc {
> diff --git a/arch/arm/dts/skeleton.dtsi b/arch/arm/dts/skeleton.dtsi
> deleted file mode 100644
> index b41d241..0000000
> --- a/arch/arm/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 = <1>;
> - #size-cells = <1>;
> - chosen { };
> - aliases { };
> - memory { device_type = "memory"; reg = <0 0>; };
> -};
> diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
> index 3368b45..192b6de 100644
> --- a/arch/arm/dts/socfpga.dtsi
> +++ b/arch/arm/dts/socfpga.dtsi
> @@ -15,7 +15,7 @@
> * along with this program. If not, see <http://www.gnu.org/licenses/>.
> */
>
> -/include/ "skeleton.dtsi"
> +#include <arm/skeleton.dtsi>
>
> / {
> #address-cells = <1>;
> diff --git a/arch/arm/dts/tegra30.dtsi b/arch/arm/dts/tegra30.dtsi
> index 19a84e9..023db9f 100644
> --- a/arch/arm/dts/tegra30.dtsi
> +++ b/arch/arm/dts/tegra30.dtsi
> @@ -3,7 +3,7 @@
> #include <dt-bindings/pinctrl/pinctrl-tegra.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
>
> -#include "skeleton.dtsi"
> +#include <arm/skeleton.dtsi>
>
> / {
> compatible = "nvidia,tegra30";
> --
> 1.8.5.5
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: dts: Remove skeleton.dtsi
2014-07-07 6:25 ` Sascha Hauer
@ 2014-07-09 5:39 ` Sascha Hauer
0 siblings, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2014-07-09 5:39 UTC (permalink / raw)
To: Alexander Shiyan; +Cc: barebox
On Mon, Jul 07, 2014 at 08:25:30AM +0200, Sascha Hauer wrote:
> On Fri, Jun 06, 2014 at 04:01:55PM +0400, Alexander Shiyan wrote:
> > Reuse basic "skeleton.dtsi" template for some DTS targets.
> >
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
>
> Applied, thanks
And dropped it again. It breaks socfpga_defconfig:
FATAL ERROR: Unable to parse input tree
Error: arch/arm/dts/socfpga.dtsi:18.1-9 syntax error
scripts/Makefile.lib:231: recipe for target 'arch/arm/dts/socfpga_cyclone5_sockit.dtb' failed
make[1]: *** [arch/arm/dts/socfpga_cyclone5_sockit.dtb] Error 1
make[1]: *** Waiting for unfinished jobs....
FATAL ERROR: Unable to parse input tree
Error: arch/arm/dts/socfpga.dtsi:18.1-9 syntax error
scripts/Makefile.lib:231: recipe for target 'arch/arm/dts/socfpga_cyclone5_socrates.dtb' failed
make[1]: *** [arch/arm/dts/socfpga_cyclone5_socrates.dtb] Error 1
Makefile:769: recipe for target 'arch/arm/dts' failed
make: *** [arch/arm/dts] Error 2
make: *** Waiting for unfinished jobs....
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-09 5:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-06 12:01 [PATCH] ARM: dts: Remove skeleton.dtsi Alexander Shiyan
2014-07-07 6:25 ` Sascha Hauer
2014-07-09 5:39 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox