diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-05-13 14:52:49 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-05-13 19:32:22 +0200 |
commit | 258adbe3d2ac9c7c8d31e5071c0689a4227dae09 (patch) | |
tree | 79c9c1168904b56bc9a1611f39ff31c3aefe4795 /recipes-bsp/u-boot-mainline/files/0004-apalis_imx6-add-device-tree-to-makefile.patch | |
parent | dc4a695bba8f4becb8b821515e16079453ccd135 (diff) |
u-boot: provide a mainline u-boot, based on 2019.07 rc1
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp/u-boot-mainline/files/0004-apalis_imx6-add-device-tree-to-makefile.patch')
-rw-r--r-- | recipes-bsp/u-boot-mainline/files/0004-apalis_imx6-add-device-tree-to-makefile.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot-mainline/files/0004-apalis_imx6-add-device-tree-to-makefile.patch b/recipes-bsp/u-boot-mainline/files/0004-apalis_imx6-add-device-tree-to-makefile.patch new file mode 100644 index 0000000..7f285fd --- /dev/null +++ b/recipes-bsp/u-boot-mainline/files/0004-apalis_imx6-add-device-tree-to-makefile.patch @@ -0,0 +1,48 @@ +From 949abc726eab7477cee095d7696eca57247c8572 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler <marcel.ziswiler@toradex.com> +Date: Sun, 24 Mar 2019 03:31:04 +0100 +Subject: [PATCH 04/19] apalis_imx6: add device tree to makefile + +Add device tree to Makefile to avoid newly introduced error: + +Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument + +make[1]: *** [dts/Makefile:28: arch/arm/dts/imx6-apalis.dtb] Error 1 +make: *** [Makefile:1009: dts/dt.dtb] Error 2 + +Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> +Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com> + +Series-to: u-boot@lists.denx.de +Series-cc: Stefano Babic <sbabic@denx.de> + +Series-version: 3 + +Series-changes: 2 +- Drop adding the colibri-imx6 device tree as Stefano already pulled v1 + 75992d0e7dfc ("apalis/colibri_imx6: add device trees to makefile") but + somehow dropped adding the apalis-imx6 one as well. + +Series-changes: 3 +- Added Igor's reviewed-by tag. +--- + arch/arm/dts/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index dfa5b02958..e56a39e0b1 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -561,6 +561,7 @@ dtb-$(CONFIG_MX6ULL) += \ + imx6ull-dart-6ul.dtb + + dtb-$(CONFIG_ARCH_MX6) += \ ++ imx6-apalis.dtb \ + imx6-colibri.dtb + + dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \ +-- +2.14.5 + |