| Message ID | 20190401111127.4359-1-sbabic@denx.de |
|---|---|
| State | Rejected |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot] mx6: colibri: fix build due to missing DTB | expand |
On Mon, 2019-04-01 at 13:11 +0200, Stefano Babic wrote: > This fix colibri (imx6) build due to: > > Device Tree Source is not correctly specified. > Please define 'CONFIG_DEFAULT_DEVICE_TREE' > or build with 'DEVICE_TREE=<device_tree>' argument > > CONFIG_DEFAULT_DEVICE_TREE is set in default config, but it is not > built > because the target is missing in dts/Makefile I already did send that one: https://patchwork.ozlabs.org/patch/1064558/ > Signed-off-by: Stefano Babic <sbabic@denx.de> > CC: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > > I got build error after rebasing on current Tom's master - colibri- > imx6.dtb > is missing from dts/Makefile. > > This is to fix -next on u-boot-imx. > > arch/arm/dts/Makefile | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index e67b3bd767..0b39721dbc 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -500,6 +500,9 @@ dtb-$(CONFIG_MX6Q) += \ > imx6q-display5.dtb \ > imx6q-logicpd.dtb > > +dtb-$(CONFIG_TARGET_COLIBRI_IMX6) += \ > + imx6-colibri.dtb > + > dtb-$(CONFIG_MX6QDL) += \ > imx6dl-icore.dtb \ > imx6dl-icore-mipi.dtb \
On 01/04/19 13:28, Marcel Ziswiler wrote: > On Mon, 2019-04-01 at 13:11 +0200, Stefano Babic wrote: >> This fix colibri (imx6) build due to: >> >> Device Tree Source is not correctly specified. >> Please define 'CONFIG_DEFAULT_DEVICE_TREE' >> or build with 'DEVICE_TREE=<device_tree>' argument >> >> CONFIG_DEFAULT_DEVICE_TREE is set in default config, but it is not >> built >> because the target is missing in dts/Makefile > > I already did send that one: > > https://patchwork.ozlabs.org/patch/1064558/ > Ouch, shame on me, I could fix it easier. I have already fixed apalis, I put your to fix colibri. Anyway, I wonder why your board do not set the i.MX6 variant, at least colibri should set MC6DL and apalis MX6Q. This led to use the specific target (as I did) or ARCH_MX6 (as you did), but not CONFIG_MX6QDL as most boards. Anyway, I will merge this on -next, thanks. Regards, Stefano >> Signed-off-by: Stefano Babic <sbabic@denx.de> >> CC: Marcel Ziswiler <marcel.ziswiler@toradex.com> >> --- >> >> I got build error after rebasing on current Tom's master - colibri- >> imx6.dtb >> is missing from dts/Makefile. >> >> This is to fix -next on u-boot-imx. >> >> arch/arm/dts/Makefile | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index e67b3bd767..0b39721dbc 100644 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -500,6 +500,9 @@ dtb-$(CONFIG_MX6Q) += \ >> imx6q-display5.dtb \ >> imx6q-logicpd.dtb >> >> +dtb-$(CONFIG_TARGET_COLIBRI_IMX6) += \ >> + imx6-colibri.dtb >> + >> dtb-$(CONFIG_MX6QDL) += \ >> imx6dl-icore.dtb \ >> imx6dl-icore-mipi.dtb \
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index e67b3bd767..0b39721dbc 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -500,6 +500,9 @@ dtb-$(CONFIG_MX6Q) += \ imx6q-display5.dtb \ imx6q-logicpd.dtb +dtb-$(CONFIG_TARGET_COLIBRI_IMX6) += \ + imx6-colibri.dtb + dtb-$(CONFIG_MX6QDL) += \ imx6dl-icore.dtb \ imx6dl-icore-mipi.dtb \
This fix colibri (imx6) build due to: Device Tree Source is not correctly specified. Please define 'CONFIG_DEFAULT_DEVICE_TREE' or build with 'DEVICE_TREE=<device_tree>' argument CONFIG_DEFAULT_DEVICE_TREE is set in default config, but it is not built because the target is missing in dts/Makefile Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- I got build error after rebasing on current Tom's master - colibri-imx6.dtb is missing from dts/Makefile. This is to fix -next on u-boot-imx. arch/arm/dts/Makefile | 3 +++ 1 file changed, 3 insertions(+)