diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-05-14 19:11:24 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-05-14 19:34:23 +0200 |
commit | 15badd4aac13483a4d6148af141cd54b2e1c2ebe (patch) | |
tree | 80af5174cb236e14f2ef6e55bd2c2a29f4e69809 /recipes-bsp/u-boot-mainline | |
parent | 73f99713095d3508c441580bd5487839420e13c1 (diff) |
u-boot: fix i.mx6 conflicting patches
Remove two patches which make the apalis-imx6, colibri-imx6 SPL build fail.
They are not needed for a working U-Boot.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp/u-boot-mainline')
3 files changed, 0 insertions, 90 deletions
diff --git a/recipes-bsp/u-boot-mainline/files/0001-configs-colibri_imx6-don-t-configure-video-in-spl.patch b/recipes-bsp/u-boot-mainline/files/0001-configs-colibri_imx6-don-t-configure-video-in-spl.patch deleted file mode 100644 index 674a186..0000000 --- a/recipes-bsp/u-boot-mainline/files/0001-configs-colibri_imx6-don-t-configure-video-in-spl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0db178f077486f63f5a83ed71e80734995306239 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Thu, 21 Sep 2017 15:21:33 +0200 -Subject: [PATCH 01/19] configs: colibri_imx6: don't configure video in spl - -The functionality is not needed in the SPL. It allows to remove -code conditionally in the spl case in some drivers. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - include/configs/colibri_imx6.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h -index 129a42466d..87b402505e 100644 ---- a/include/configs/colibri_imx6.h -+++ b/include/configs/colibri_imx6.h -@@ -66,6 +66,7 @@ - #define CONFIG_USBD_HS - - /* Framebuffer and LCD */ -+#if !defined(CONFIG_SPL_BUILD) - #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE - #define CONFIG_VIDEO_BMP_RLE8 - #define CONFIG_SPLASH_SCREEN -@@ -76,6 +77,7 @@ - #define CONFIG_CONSOLE_MUX - #define CONFIG_IMX_HDMI - #define CONFIG_IMX_VIDEO_SKIP -+#endif - - /* allow to overwrite serial and ethaddr */ - #define CONFIG_ENV_OVERWRITE --- -2.14.5 - diff --git a/recipes-bsp/u-boot-mainline/files/0002-configs-apalis_imx6-don-t-configure-video-in-spl.patch b/recipes-bsp/u-boot-mainline/files/0002-configs-apalis_imx6-don-t-configure-video-in-spl.patch deleted file mode 100644 index 5a395ff..0000000 --- a/recipes-bsp/u-boot-mainline/files/0002-configs-apalis_imx6-don-t-configure-video-in-spl.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a90cb933df44d2fa9ead3ce620313077f907b52a Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Thu, 21 Sep 2017 15:29:33 +0200 -Subject: [PATCH 02/19] configs: apalis_imx6: don't configure video in spl - -The functionality is not needed in the SPL. It allows to remove -code conditionally in the spl case in some drivers. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> - -Series-to: u-boot - -Series-cc: Anatolij Gustschin <agust@denx.de>, festevam@gmail.com <festevam@gmail.com>, sbabic@denx.de <sbabic@denx.de> -Series-cc: jagan@openedev.com <jagan@openedev.com>, otavio@ossystems.com.br <otavio@ossystems.com.br> -Series-cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>, Stefan Agner <stefan.agner@toradex.com> - -Cover-letter: -configs: apalis/colibri imx6: don't configure video in spl - -This series remove unneeded SPL config options. This is needed -to successfully compile with the following patch applied: -https://lists.denx.de/pipermail/u-boot/2017-August/304010.html - -This series is available at http://git.toradex.com/cgit/u-boot-toradex.git/log/?h=for-next -END ---- - include/configs/apalis_imx6.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 91054d8c05..84d7c4b4f0 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -74,6 +74,7 @@ - /* Client */ - #define CONFIG_USBD_HS - -+#if !defined(CONFIG_SPL_BUILD) - /* Framebuffer and LCD */ - #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE - #define CONFIG_VIDEO_BMP_RLE8 -@@ -85,6 +86,7 @@ - #define CONFIG_CONSOLE_MUX - #define CONFIG_IMX_HDMI - #define CONFIG_IMX_VIDEO_SKIP -+#endif - - /* allow to overwrite serial and ethaddr */ - #define CONFIG_ENV_OVERWRITE --- -2.14.5 - diff --git a/recipes-bsp/u-boot-mainline/u-boot-common.inc b/recipes-bsp/u-boot-mainline/u-boot-common.inc index 94bc91e..44a2382 100644 --- a/recipes-bsp/u-boot-mainline/u-boot-common.inc +++ b/recipes-bsp/u-boot-mainline/u-boot-common.inc @@ -13,8 +13,6 @@ SRCREV = "b4ee6daad7a2604ca9466b2ba48de86cc27d381f" SRC_URI = "git://git.denx.de/u-boot.git" SRC_URI += " \ - file://0001-configs-colibri_imx6-don-t-configure-video-in-spl.patch \ - file://0002-configs-apalis_imx6-don-t-configure-video-in-spl.patch \ file://0003-usb-limit-USB_MAX_XFER_BLK-to-256.patch \ file://0004-apalis_imx6-add-device-tree-to-makefile.patch \ file://0005-colibri-imx6ull-fix-usb-host-mode.patch \ |