Message ID | 1409942187-20631-1-git-send-email-festevam@gmail.com |
---|---|
State | Awaiting Upstream |
Delegated to: | Stefano Babic |
Headers | show |
On Fri, Sep 5, 2014 at 3:36 PM, Fabio Estevam <festevam@gmail.com> wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > Commit fa9c021632473 ("mx6: add example DTB for mx6qsabreauto") introduced > 'imx6q-sabreauto.dts' but it adds no real value as the dts file only contains > the 'model' and 'compatible' strings. > > After this commit the final binary is also changed from 'u-boot.imx' to > 'u-boot-dtb.imx', which may confuse users. > > So revert it until a more complete and useful device tree could be provided. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Hi Stefano, On Fri, 5 Sep 2014 16:26:48 -0300 Otavio Salvador <otavio@ossystems.com.br> wrote: > On Fri, Sep 5, 2014 at 3:36 PM, Fabio Estevam <festevam@gmail.com> wrote: > > From: Fabio Estevam <fabio.estevam@freescale.com> > > > > Commit fa9c021632473 ("mx6: add example DTB for mx6qsabreauto") introduced > > 'imx6q-sabreauto.dts' but it adds no real value as the dts file only contains > > the 'model' and 'compatible' strings. > > > > After this commit the final binary is also changed from 'u-boot.imx' to > > 'u-boot-dtb.imx', which may confuse users. > > > > So revert it until a more complete and useful device tree could be provided. > > > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > Acked-by: Otavio Salvador <otavio@ossystems.com.br> > Could you pick up this trivial one and send a pull-req? I am moving CONFIG_OF_SEPARATE and CONFIG_DEFAULT_DEVICE_TREE to Kconfig. Ideally, this patch should come first. See this thread: http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/ Best Regards Masahiro Yamada
Hi Masahiro, On 09/09/2014 07:11, Masahiro Yamada wrote: > Hi Stefano, > > > > On Fri, 5 Sep 2014 16:26:48 -0300 > Otavio Salvador <otavio@ossystems.com.br> wrote: > >> On Fri, Sep 5, 2014 at 3:36 PM, Fabio Estevam <festevam@gmail.com> wrote: >>> From: Fabio Estevam <fabio.estevam@freescale.com> >>> >>> Commit fa9c021632473 ("mx6: add example DTB for mx6qsabreauto") introduced >>> 'imx6q-sabreauto.dts' but it adds no real value as the dts file only contains >>> the 'model' and 'compatible' strings. >>> >>> After this commit the final binary is also changed from 'u-boot.imx' to >>> 'u-boot-dtb.imx', which may confuse users. >>> >>> So revert it until a more complete and useful device tree could be provided. >>> >>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> >> >> Acked-by: Otavio Salvador <otavio@ossystems.com.br> >> > > > Could you pick up this trivial one and send a pull-req? > > I am moving CONFIG_OF_SEPARATE and CONFIG_DEFAULT_DEVICE_TREE > to Kconfig. > > Ideally, this patch should come first. > > > See this thread: > http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/ > I am preparing the PR - it comes soon. Best regards, Stefano Babic
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 6e2e313..8b35bb8 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -8,7 +8,6 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ exynos5250-smdk5250.dtb \ exynos5420-smdk5420.dtb \ exynos5420-peach-pit.dtb -dtb-$(CONFIG_MX6) += imx6q-sabreauto.dtb dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ diff --git a/arch/arm/dts/imx6q-sabreauto.dts b/arch/arm/dts/imx6q-sabreauto.dts deleted file mode 100644 index 7af2a88..0000000 --- a/arch/arm/dts/imx6q-sabreauto.dts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2012 Freescale Semiconductor, Inc. - * Copyright 2011 Linaro Ltd. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/dts-v1/; - -/ { - model = "Freescale i.MX6 Quad SABRE Automotive Board"; - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; -}; diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index d1639c4..0ab3127 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -45,7 +45,4 @@ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_OF_SEPARATE -#define CONFIG_DEFAULT_DEVICE_TREE imx6q-sabreauto - #endif /* __MX6QSABREAUTO_CONFIG_H */