diff options
Diffstat (limited to 'external/poky/meta/recipes-bsp/u-boot')
7 files changed, 597 insertions, 0 deletions
diff --git a/external/poky/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch b/external/poky/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch new file mode 100644 index 00000000..fed3c3dc --- /dev/null +++ b/external/poky/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch @@ -0,0 +1,59 @@ +From 7346c1e192d63cd35f99c7e845e53c5d4d0bdc24 Mon Sep 17 00:00:00 2001 +From: Teddy Reed <teddy.reed@gmail.com> +Date: Sat, 9 Jun 2018 11:45:20 -0400 +Subject: [PATCH] vboot: Do not use hashed-strings offset + +The hashed-strings signature property includes two uint32_t values. +The first is unneeded as there should never be a start offset into the +strings region. The second, the size, is needed because the added +signature node appends to this region. + +See tools/image-host.c, where a static 0 value is used for the offset. + +Signed-off-by: Teddy Reed <teddy.reed@gmail.com> +Reviewed-by: Simon Glass <sjg@chromium.org> + +Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; + h=7346c1e192d63cd35f99c7e845e53c5d4d0bdc24] + +CVE: CVE-2018-1000205 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + common/image-sig.c | 7 +++++-- + tools/image-host.c | 1 + + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/common/image-sig.c b/common/image-sig.c +index 8d2fd10..5a269d3 100644 +--- a/common/image-sig.c ++++ b/common/image-sig.c +@@ -377,8 +377,11 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode, + /* Add the strings */ + strings = fdt_getprop(fit, noffset, "hashed-strings", NULL); + if (strings) { +- fdt_regions[count].offset = fdt_off_dt_strings(fit) + +- fdt32_to_cpu(strings[0]); ++ /* ++ * The strings region offset must be a static 0x0. ++ * This is set in tool/image-host.c ++ */ ++ fdt_regions[count].offset = fdt_off_dt_strings(fit); + fdt_regions[count].size = fdt32_to_cpu(strings[1]); + count++; + } +diff --git a/tools/image-host.c b/tools/image-host.c +index 8e43671..be2d59b 100644 +--- a/tools/image-host.c ++++ b/tools/image-host.c +@@ -135,6 +135,7 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value, + + ret = fdt_setprop(fit, noffset, "hashed-nodes", + region_prop, region_proplen); ++ /* This is a legacy offset, it is unused, and must remain 0. */ + strdata[0] = 0; + strdata[1] = cpu_to_fdt32(string_size); + if (!ret) { +-- +2.7.4 + diff --git a/external/poky/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch b/external/poky/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch new file mode 100644 index 00000000..bb79af1c --- /dev/null +++ b/external/poky/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch @@ -0,0 +1,143 @@ +From 72239fc85f3eda078547956608c063ab965e90e9 Mon Sep 17 00:00:00 2001 +From: Teddy Reed <teddy.reed@gmail.com> +Date: Sat, 9 Jun 2018 11:38:05 -0400 +Subject: [PATCH] vboot: Add FIT_SIGNATURE_MAX_SIZE protection + +This adds a new config value FIT_SIGNATURE_MAX_SIZE, which controls the +max size of a FIT header's totalsize field. The field is checked before +signature checks are applied to protect from reading past the intended +FIT regions. + +This field is not part of the vboot signature so it should be sanity +checked. If the field is corrupted then the structure or string region +reads may have unintended behavior, such as reading from device memory. +A default value of 256MB is set and intended to support most max storage +sizes. + +Suggested-by: Simon Glass <sjg@chromium.org> +Signed-off-by: Teddy Reed <teddy.reed@gmail.com> +Reviewed-by: Simon Glass <sjg@chromium.org> + +Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; + h=72239fc85f3eda078547956608c063ab965e90e9] + +CVE: CVE-2018-1000205 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Kconfig | 10 ++++++++++ + common/image-sig.c | 5 +++++ + test/py/tests/test_vboot.py | 33 +++++++++++++++++++++++++++++++++ + tools/Makefile | 1 + + 4 files changed, 49 insertions(+) + +diff --git a/Kconfig b/Kconfig +index 5a82c95..c8b86cd 100644 +--- a/Kconfig ++++ b/Kconfig +@@ -267,6 +267,16 @@ config FIT_SIGNATURE + format support in this case, enable it using + CONFIG_IMAGE_FORMAT_LEGACY. + ++config FIT_SIGNATURE_MAX_SIZE ++ hex "Max size of signed FIT structures" ++ depends on FIT_SIGNATURE ++ default 0x10000000 ++ help ++ This option sets a max size in bytes for verified FIT uImages. ++ A sane value of 256MB protects corrupted DTB structures from overlapping ++ device memory. Assure this size does not extend past expected storage ++ space. ++ + config FIT_VERBOSE + bool "Show verbose messages when FIT images fail" + help +diff --git a/common/image-sig.c b/common/image-sig.c +index f65d883..8d2fd10 100644 +--- a/common/image-sig.c ++++ b/common/image-sig.c +@@ -156,6 +156,11 @@ static int fit_image_setup_verify(struct image_sign_info *info, + { + char *algo_name; + ++ if (fdt_totalsize(fit) > CONFIG_FIT_SIGNATURE_MAX_SIZE) { ++ *err_msgp = "Total size too large"; ++ return 1; ++ } ++ + if (fit_image_hash_get_algo(fit, noffset, &algo_name)) { + *err_msgp = "Can't get hash algo property"; + return -1; +diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py +index ee939f2..3d25ec3 100644 +--- a/test/py/tests/test_vboot.py ++++ b/test/py/tests/test_vboot.py +@@ -26,6 +26,7 @@ Tests run with both SHA1 and SHA256 hashing. + + import pytest + import sys ++import struct + import u_boot_utils as util + + @pytest.mark.boardspec('sandbox') +@@ -105,6 +106,26 @@ def test_vboot(u_boot_console): + util.run_and_log(cons, [mkimage, '-F', '-k', tmpdir, '-K', dtb, + '-r', fit]) + ++ def replace_fit_totalsize(size): ++ """Replace FIT header's totalsize with something greater. ++ ++ The totalsize must be less than or equal to FIT_SIGNATURE_MAX_SIZE. ++ If the size is greater, the signature verification should return false. ++ ++ Args: ++ size: The new totalsize of the header ++ ++ Returns: ++ prev_size: The previous totalsize read from the header ++ """ ++ total_size = 0 ++ with open(fit, 'r+b') as handle: ++ handle.seek(4) ++ total_size = handle.read(4) ++ handle.seek(4) ++ handle.write(struct.pack(">I", size)) ++ return struct.unpack(">I", total_size)[0] ++ + def test_with_algo(sha_algo): + """Test verified boot with the given hash algorithm. + +@@ -146,6 +167,18 @@ def test_vboot(u_boot_console): + util.run_and_log(cons, [fit_check_sign, '-f', fit, '-k', tmpdir, + '-k', dtb]) + ++ # Replace header bytes ++ bcfg = u_boot_console.config.buildconfig ++ max_size = int(bcfg.get('config_fit_signature_max_size', 0x10000000), 0) ++ existing_size = replace_fit_totalsize(max_size + 1) ++ run_bootm(sha_algo, 'Signed config with bad hash', 'Bad Data Hash', False) ++ cons.log.action('%s: Check overflowed FIT header totalsize' % sha_algo) ++ ++ # Replace with existing header bytes ++ replace_fit_totalsize(existing_size) ++ run_bootm(sha_algo, 'signed config', 'dev+', True) ++ cons.log.action('%s: Check default FIT header totalsize' % sha_algo) ++ + # Increment the first byte of the signature, which should cause failure + sig = util.run_and_log(cons, 'fdtget -t bx %s %s value' % + (fit, sig_node)) +diff --git a/tools/Makefile b/tools/Makefile +index 5dd33ed..0c3341e 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -133,6 +133,7 @@ ifdef CONFIG_FIT_SIGNATURE + # This affects include/image.h, but including the board config file + # is tricky, so manually define this options here. + HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE ++HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE_MAX_SIZE=$(CONFIG_FIT_SIGNATURE_MAX_SIZE) + endif + + ifdef CONFIG_SYS_U_BOOT_OFFS +-- +2.7.4 + diff --git a/external/poky/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc b/external/poky/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc new file mode 100644 index 00000000..22b44dcc --- /dev/null +++ b/external/poky/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc @@ -0,0 +1,18 @@ +HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" +SECTION = "bootloaders" +DEPENDS += "flex-native bison-native" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" +PE = "1" + +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "8c5d4fd0ec222701598a27b26ab7265d4cee45a3" + +SRC_URI = "git://git.denx.de/u-boot.git \ + file://CVE-2018-1000205-1.patch \ + file://CVE-2018-1000205-2.patch \ +" + +S = "${WORKDIR}/git" diff --git a/external/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb b/external/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb new file mode 100644 index 00000000..52c13e75 --- /dev/null +++ b/external/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb @@ -0,0 +1,34 @@ +require u-boot-common_${PV}.inc + +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +DEPENDS += "mtd-utils" + +INSANE_SKIP_${PN} = "already-stripped" +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' +EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake envtools +} + +do_install () { + install -d ${D}${base_sbindir} + install -d ${D}${sysconfdir} + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv + install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config +} + +do_install_class-cross () { + install -d ${D}${bindir_cross} + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv +} + +SYSROOT_DIRS_append_class-cross = " ${bindir_cross}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/external/poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb b/external/poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb new file mode 100644 index 00000000..08bff1d1 --- /dev/null +++ b/external/poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb @@ -0,0 +1,29 @@ +require u-boot-common_${PV}.inc + +SUMMARY = "U-Boot bootloader image creation tool" +DEPENDS += "openssl" + +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' + +do_compile () { + oe_runmake sandbox_defconfig + + # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and + # generating it requires bin2header tool, which for target build + # is built with target tools and thus cannot be executed on host. + sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config + + oe_runmake cross_tools NO_SDL=1 +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage + ln -sf uboot-mkimage ${D}${bindir}/mkimage +} + +RDEPENDS_${PN} += "dtc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-bsp/u-boot/u-boot.inc b/external/poky/meta/recipes-bsp/u-boot/u-boot.inc new file mode 100644 index 00000000..48fbc572 --- /dev/null +++ b/external/poky/meta/recipes-bsp/u-boot/u-boot.inc @@ -0,0 +1,310 @@ +SUMMARY = "Universal Boot Loader for embedded devices" +PROVIDES = "virtual/bootloader" + +B = "${WORKDIR}/build" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit uboot-config uboot-extlinux-config uboot-sign deploy + +DEPENDS += "swig-native python-native" + +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' +EXTRA_OEMAKE += 'PYTHON=nativepython STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' + +PACKAGECONFIG ??= "openssl" +# u-boot will compile its own tools during the build, with specific +# configurations (aka when CONFIG_FIT_SIGNATURE is enabled) openssl is needed as +# a host build dependency. +PACKAGECONFIG[openssl] = ",,openssl-native" + +# Allow setting an additional version string that will be picked up by the +# u-boot build system and appended to the u-boot version. If the .scmversion +# file already exists it will not be overwritten. +UBOOT_LOCALVERSION ?= "" + +# Some versions of u-boot use .bin and others use .img. By default use .bin +# but enable individual recipes to change this value. +UBOOT_SUFFIX ??= "bin" +UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}" +UBOOT_MAKE_TARGET ?= "all" + +# Output the ELF generated. Some platforms can use the ELF file and directly +# load it (JTAG booting, QEMU) additionally the ELF can be used for debugging +# purposes. +UBOOT_ELF ?= "" +UBOOT_ELF_SUFFIX ?= "elf" +UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}" +UBOOT_ELF_BINARY ?= "u-boot.${UBOOT_ELF_SUFFIX}" +UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}" + +# Some versions of u-boot build an SPL (Second Program Loader) image that +# should be packaged along with the u-boot binary as well as placed in the +# deploy directory. For those versions they can set the following variables +# to allow packaging the SPL. +SPL_BINARY ?= "" +SPL_BINARYNAME ?= "${@os.path.basename(d.getVar("SPL_BINARY"))}" +SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}" +SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}" + +# Additional environment variables or a script can be installed alongside +# u-boot to be used automatically on boot. This file, typically 'uEnv.txt' +# or 'boot.scr', should be packaged along with u-boot as well as placed in the +# deploy directory. Machine configurations needing one of these files should +# include it in the SRC_URI and set the UBOOT_ENV parameter. +UBOOT_ENV_SUFFIX ?= "txt" +UBOOT_ENV ?= "" +UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" +UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" +UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" + +# U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf +# to find EXTLINUX conf file. +UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" +UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" +UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" + +do_compile () { + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk + fi + + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] + then + echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion + echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion + fi + + if [ -n "${UBOOT_CONFIG}" ] + then + unset i j k + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + oe_runmake -C ${S} O=${B}/${config} ${config} + oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} + for binary in ${UBOOT_BINARIES}; do + k=$(expr $k + 1); + if [ $k -eq $i ]; then + cp ${B}/${config}/${binary} ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} + fi + done + unset k + fi + done + unset j + done + unset i + else + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} + oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} + fi + +} + +do_install () { + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -d ${D}/boot + install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -d ${D}/boot + install -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + fi + + if [ -n "${UBOOT_ELF}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} + fi + fi + + if [ -e ${WORKDIR}/fw_env.config ] ; then + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + fi + + if [ -n "${SPL_BINARY}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} + ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME} + fi + fi + + if [ -n "${UBOOT_ENV}" ] + then + install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} + ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY} + fi + + if [ "${UBOOT_EXTLINUX}" = "1" ] + then + install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME} + fi + +} + +FILES_${PN} = "/boot ${sysconfdir}" + +do_deploy () { + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -d ${DEPLOYDIR} + install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + cd ${DEPLOYDIR} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -d ${DEPLOYDIR} + install -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + cd ${DEPLOYDIR} + rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} + fi + + if [ -n "${UBOOT_ELF}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + fi + fi + + + if [ -n "${SPL_BINARY}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} + rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} + rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + fi + + + if [ -n "${UBOOT_ENV}" ] + then + install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} + rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} + ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY} + ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} + fi + + if [ "${UBOOT_EXTLINUX}" = "1" ] + then + install -m 644 ${UBOOT_EXTLINUX_CONFIG} ${DEPLOYDIR}/${UBOOT_EXTLINUX_SYMLINK} + ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE} + ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME} + fi +} + +addtask deploy before do_build after do_compile diff --git a/external/poky/meta/recipes-bsp/u-boot/u-boot_2018.07.bb b/external/poky/meta/recipes-bsp/u-boot/u-boot_2018.07.bb new file mode 100644 index 00000000..37c21dca --- /dev/null +++ b/external/poky/meta/recipes-bsp/u-boot/u-boot_2018.07.bb @@ -0,0 +1,4 @@ +require u-boot-common_${PV}.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native" |