diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-01-20 11:59:19 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-01-21 10:40:15 +0100 |
| commit | 062c56d2367bdef42dc269421e8665bba66576f4 (patch) | |
| tree | 0eef7175bdf5d00af6b3dae92aeb639ef25cf0e2 | |
| parent | ea8df27d342d9e81ac11d47f6bf2916e19fcf8c6 (diff) | |
Revert "colibri-imx8x: modify device tree name for mainline/upstream"
This reverts commit 1811f925aa4bf28c706fbab529cc20661bcf307a.
With the uprev of the downstream kernel the default device tree name
is now the same for mainline and downstream and the needed changes
are done in U-Boot. The patch is thus no longer needed.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit cf6263859fa0b39276fa0f535c2333027db19db7)
| -rw-r--r-- | recipes-bsp/u-boot/files/0001-colibri-imx8x-modify-device-tree-name-for-mainline-u.patch | 26 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex_2020.04.bb | 2 |
2 files changed, 0 insertions, 28 deletions
diff --git a/recipes-bsp/u-boot/files/0001-colibri-imx8x-modify-device-tree-name-for-mainline-u.patch b/recipes-bsp/u-boot/files/0001-colibri-imx8x-modify-device-tree-name-for-mainline-u.patch deleted file mode 100644 index ccb0de3..0000000 --- a/recipes-bsp/u-boot/files/0001-colibri-imx8x-modify-device-tree-name-for-mainline-u.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4b90e67383d07be1475d1613c426cbb2b317b969 Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler <marcel.ziswiler@toradex.com> -Date: Sun, 22 Mar 2020 03:44:55 +0100 -Subject: [PATCH] colibri-imx8x: modify device tree name for mainline/upstream - -Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> ---- - include/configs/colibri-imx8qxp.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h -index 0d40042b8e..26a5991c42 100644 ---- a/include/configs/colibri-imx8qxp.h -+++ b/include/configs/colibri-imx8qxp.h -@@ -81,7 +81,7 @@ - - #define CONFIG_SKIP_RESOURCE_CHECING - --#define FDT_FILE "fsl-imx8qxp-colibri-eval-v3.dtb" -+#define FDT_FILE "imx8qxp-colibri-eval-v3.dtb" - - /* Initial environment variables */ - #define CONFIG_EXTRA_ENV_SETTINGS \ --- -2.25.1 - diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb index 364395d..47630b1 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb @@ -8,6 +8,4 @@ B = "${WORKDIR}/build" PROVIDES += "u-boot" DEPENDS_append = " dtc-native" -SRC_URI_append_use-mainline-bsp_colibri-imx8x = " file://0001-colibri-imx8x-modify-device-tree-name-for-mainline-u.patch" - BOOT_TOOLS = "imx-boot-tools" |