diff options
Diffstat (limited to 'meta-aspeed/recipes-bsp/u-boot')
5 files changed, 32 insertions, 21 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index 727c62d27..6f2d979bc 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -3,25 +3,31 @@ require u-boot-common-aspeed-sdk_${PV}.inc UBOOT_MAKE_TARGET ?= "DEVICE_TREE=${UBOOT_DEVICETREE}" require u-boot-aspeed.inc -inherit socsec-sign PROVIDES += "u-boot" DEPENDS += "bc-native dtc-native" -SRC_URI_append_df-phosphor-mmc = " file://u-boot-env-ast2600.txt" +SRC_URI:append:df-phosphor-mmc = " file://u-boot-env-ast2600.txt" SRC_URI += " \ file://rsa_oem_dss_key.pem;sha256sum=64a379979200d39949d3e5b0038e3fdd5548600b2f7077a17e35422336075ad4 \ file://rsa_pub_oem_dss_key.pem;sha256sum=40132a694a10af2d1b094b1cb5adab4d6b4db2a35e02d848b2b6a85e60738264 \ " -UBOOT_ENV_SIZE_df-phosphor-mmc = "0x10000" -UBOOT_ENV_df-phosphor-mmc = "u-boot-env" -UBOOT_ENV_SUFFIX_df-phosphor-mmc = "bin" +SOCSEC_SIGN_KEY ?= "${WORKDIR}/rsa_oem_dss_key.pem" +SOCSEC_SIGN_ALGO ?= "RSA4096_SHA512" +SOCSEC_SIGN_EXTRA_OPTS ?= "--stack_intersects_verification_region=false" + +inherit socsec-sign + +UBOOT_ENV_SIZE:df-phosphor-mmc = "0x10000" +UBOOT_ENV:df-phosphor-mmc = "u-boot-env" +UBOOT_ENV_SUFFIX:df-phosphor-mmc = "bin" +UBOOT_ENV_TXT:df-phosphor-mmc = "u-boot-env-ast2600.txt" -do_compile_append() { +do_compile:append() { if [ -n "${UBOOT_ENV}" ] then # Generate redundant environment image - ${B}/tools/mkenvimage -r -s ${UBOOT_ENV_SIZE} -o ${WORKDIR}/${UBOOT_ENV_BINARY} ${WORKDIR}/u-boot-env-ast2600.txt + ${B}/tools/mkenvimage -r -s ${UBOOT_ENV_SIZE} -o ${WORKDIR}/${UBOOT_ENV_BINARY} ${WORKDIR}/${UBOOT_ENV_TXT} fi } diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc index 0b9bc20d2..3028a9e19 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc @@ -182,7 +182,11 @@ do_install () { } -FILES_${PN} = "/boot ${sysconfdir} ${datadir}" +PACKAGE_BEFORE_PN += "${PN}-env" + +RPROVIDES:${PN}-env += "u-boot-default-env" +FILES:${PN} = "/boot ${sysconfdir} ${datadir}" +RDEPENDS:${PN} += "${PN}-env" do_deploy () { if [ -n "${UBOOT_CONFIG}" ] diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb index 8cebe5ab3..395f5ab57 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb @@ -6,4 +6,4 @@ DEPENDS += "dtc-native" # FIXME this can/should be removed when we have rebased off our # 2016 snapshot onto a more modern (circa late 2018) u-boot tree. -BUILD_CFLAGS_remove = "-isystem${STAGING_INCDIR_NATIVE}" +BUILD_CFLAGS:remove = "-isystem${STAGING_INCDIR_NATIVE}" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb index cebbee6e6..6c1470a5f 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb @@ -4,16 +4,17 @@ SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" DEPENDS += "mtd-utils" PROVIDES += "u-boot-fw-utils" +RPROVIDES:${PN} += "u-boot-fw-utils" SRC_URI += "file://fw_env_ast2600_nor.config" SRC_URI += "file://fw_env_ast2600_mmc.config" ENV_CONFIG_FILE = "fw_env_ast2600_nor.config" -ENV_CONFIG_FILE_df-phosphor-mmc = "fw_env_ast2600_mmc.config" +ENV_CONFIG_FILE:df-phosphor-mmc = "fw_env_ast2600_mmc.config" -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' +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 @@ -31,13 +32,13 @@ do_install () { install -m 644 ${WORKDIR}/${ENV_CONFIG_FILE} ${D}${sysconfdir}/fw_env.config } -do_install_class-cross () { +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}" +SYSROOT_DIRS:append:class-cross = " ${bindir_cross}" PACKAGE_ARCH = "${MACHINE_ARCH}" BBCLASSEXTEND = "cross" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb index e9f724df2..0ec64ce8e 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb @@ -9,9 +9,9 @@ DEPENDS += "mtd-utils" PROVIDES += "u-boot-fw-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 = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' +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 = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' inherit uboot-config @@ -30,15 +30,15 @@ do_install () { install -m 644 ${WORKDIR}/alt_fw_env.config ${D}${sysconfdir}/alt_fw_env.config } -do_install_class-cross () { +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}" +SYSROOT_DIRS:append:class-cross = " ${bindir_cross}" PACKAGE_ARCH = "${MACHINE_ARCH}" BBCLASSEXTEND = "cross" -RDEPENDS_${PN} = "udev-aspeed-mtd-partitions" +RDEPENDS:${PN} = "udev-aspeed-mtd-partitions" |