[OE-core] [PATCH] u-boot: Upgrade to 2018.03 release
Martin Hundebøll
mnhu at prevas.dk
Tue Apr 10 09:49:07 UTC 2018
Hi,
I had to patch up our own u-boot recipe as shown in the attached patch
to make v2018.03 compile for qemu-x86.
The thing is that the build of pylibfdt became unconditional since
15b97f5c5e ('pylibfdt: move pylibfdt to scripts/dtc/pylibfdt and
refactor makefile')
In my case u-boot/pylibfdt failed to find the correct (native) headers,
because python setuptools / distutils looks into STAGING_{LIB,INC}DIR
when compiling the native extension for libfdt. I didn't find any other
way to specificy this in either the u-boot Makefile or some other magic
environment variable.
// Martin
On 2018-04-09 02:54, Khem Raj wrote:
>
> On Sun, Apr 8, 2018 at 4:10 PM Marek Vasut <marex at denx.de
> <mailto:marex at denx.de>> wrote:
>
> This upgrades the U-Boot from 2018.01 to 2018.03 release and drops
> patches accepted upstream, getting the patch count to zero.
>
>
>
> It fails for me if I have libfdt installed on build host
> It seems build is doing the include dance which goes all the way into
> hosts system include directories
>
>
>
> Signed-off-by: Marek Vasut <marex at denx.de <mailto:marex at denx.de>>
> Cc: Otavio Salvador <otavio at ossystems.com.br
> <mailto:otavio at ossystems.com.br>>
> Cc: Ross Burton <ross.burton at intel.com <mailto:ross.burton at intel.com>>
> Cc: Richard Purdie <richard.purdie at linuxfoundation.org
> <mailto:richard.purdie at linuxfoundation.org>>
> ---
> .../u-boot/files/MPC8315ERDB-enable-DHCP.patch | 19
> -------------------
> ...t-common_2018.01.inc => u-boot-common_2018.03.inc} | 6 ++----
> ...fw-utils_2018.01.bb <http://fw-utils_2018.01.bb> =>
> u-boot-fw-utils_2018.03.bb <http://u-boot-fw-utils_2018.03.bb>} | 0
> ...t-mkimage_2018.01.bb <http://t-mkimage_2018.01.bb> =>
> u-boot-mkimage_2018.03.bb <http://u-boot-mkimage_2018.03.bb>} | 0
> .../u-boot/{u-boot_2018.01.bb <http://u-boot_2018.01.bb> =>
> u-boot_2018.03.bb <http://u-boot_2018.03.bb>} | 0
> 5 files changed, 2 insertions(+), 23 deletions(-)
> delete mode 100644
> meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
> rename meta/recipes-bsp/u-boot/{u-boot-common_2018.01.inc =>
> u-boot-common_2018.03.inc} (68%)
> rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2018.01.bb
> <http://u-boot-fw-utils_2018.01.bb> => u-boot-fw-utils_2018.03.bb
> <http://u-boot-fw-utils_2018.03.bb>} (100%)
> rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.01.bb
> <http://u-boot-mkimage_2018.01.bb> => u-boot-mkimage_2018.03.bb
> <http://u-boot-mkimage_2018.03.bb>} (100%)
> rename meta/recipes-bsp/u-boot/{u-boot_2018.01.bb
> <http://u-boot_2018.01.bb> => u-boot_2018.03.bb
> <http://u-boot_2018.03.bb>} (100%)
>
> diff --git
> a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
> b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
> deleted file mode 100644
> index ecaa1796a4..0000000000
> --- a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -Enabled dhcp client functionality for Yocto reference
> -hardware MPC8315E-RDB.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com
> <mailto:ed.bartosh at linux.intel.com>>
> -
> -Index: git/configs/MPC8315ERDB_defconfig
> -===================================================================
> ---- git.orig/configs/MPC8315ERDB_defconfig
> -+++ git/configs/MPC8315ERDB_defconfig
> -@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y
> - CONFIG_CMD_SATA=y
> - CONFIG_CMD_USB=y
> - # CONFIG_CMD_SETEXPR is not set
> -+CONFIG_CMD_DHCP=y
> - CONFIG_CMD_MII=y
> - CONFIG_CMD_PING=y
> - CONFIG_CMD_DATE=y
> diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
> b/meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc
> similarity index 68%
> rename from meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
> rename to meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc
> index d2073ea0c7..8ffae365a9 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc
> @@ -7,10 +7,8 @@ PE = "1"
>
> # We use the revision in order to avoid having to fetch it from the
> # repo during parse
> -SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a"
> +SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890"
>
> -SRC_URI = "git://git.denx.de/u-boot.git
> <http://git.denx.de/u-boot.git> \
> - file://MPC8315ERDB-enable-DHCP.patch \
> -"
> +SRC_URI = "git://git.denx.de/u-boot.git
> <http://git.denx.de/u-boot.git>"
>
> S = "${WORKDIR}/git"
> diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb
> <http://u-boot-fw-utils_2018.01.bb>
> b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb
> <http://u-boot-fw-utils_2018.03.bb>
> similarity index 100%
> rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb
> <http://u-boot-fw-utils_2018.01.bb>
> rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb
> <http://u-boot-fw-utils_2018.03.bb>
> diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb
> <http://u-boot-mkimage_2018.01.bb>
> b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb
> <http://u-boot-mkimage_2018.03.bb>
> similarity index 100%
> rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb
> <http://u-boot-mkimage_2018.01.bb>
> rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb
> <http://u-boot-mkimage_2018.03.bb>
> diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.01.bb
> <http://u-boot_2018.01.bb>
> b/meta/recipes-bsp/u-boot/u-boot_2018.03.bb <http://u-boot_2018.03.bb>
> similarity index 100%
> rename from meta/recipes-bsp/u-boot/u-boot_2018.01.bb
> <http://u-boot_2018.01.bb>
> rename to meta/recipes-bsp/u-boot/u-boot_2018.03.bb
> <http://u-boot_2018.03.bb>
> --
> 2.16.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> <mailto:Openembedded-core at lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-u-boot-pil-fix-cross-compile-for-qemux86.patch
Type: text/x-patch
Size: 1207 bytes
Desc: not available
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180410/d2780961/attachment.bin>
More information about the Openembedded-core
mailing list