On Sun, May 24, 2020 at 06:17:51PM +0200, Ming Liu wrote:
> From: Ming Liu <ming....@toradex.com>
>
> It's really inconvenient to have ${PN} as part of the name of
> u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc,
> u-boot-qoriq, u-boot-toradex, and so on.
>
> Considerring there is only one virtual/bootloader for a build, we could
> replace ${PN} with u-boot to not have to distinguish different names
> when accessing it.
Have you tried git log?
Have you heard of multi-stage bootloaders and chain-loading?
Assumption that there's a single u-boot per platform built is long since
outdated - please don't break other's use cases for a tiny bit of convenience.
A better approach here would be:
1. make it completely optional to build/install/deploy this u-boot-initial-env
2. make it fully configurable with vars like UBOOT_BINARY, SPL_BINARY,
UBOOT_ELF. UBOOT_ENV, etc.
--
Denys
> Signed-off-by: Ming Liu <ming....@toradex.com>
> ---
> meta/recipes-bsp/u-boot/u-boot.inc | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
> b/meta/recipes-bsp/u-boot/u-boot.inc
> index 80f828df52..188e5295cf 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -156,10 +156,10 @@ do_install () {
> ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
> ${D}/boot/${UBOOT_BINARY}
>
> # Install the uboot-initial-env
> - install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> - ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
> - ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${type}
> - ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env
> + install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> + ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}
> + ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env-${type}
> + ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env
> fi
> done
> unset j
> @@ -170,9 +170,9 @@ do_install () {
> ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
>
> # Install the uboot-initial-env
> - install -D -m 644 ${B}/u-boot-initial-env
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
> - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
> - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env
> + install -D -m 644 ${B}/u-boot-initial-env
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
> + ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}
> + ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env
> fi
>
> if [ -n "${UBOOT_ELF}" ]
> @@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
>
> RPROVIDES_${PN}-env += "u-boot-default-env"
> FILES_${PN}-env = " \
> - ${sysconfdir}/${PN}-initial-env* \
> + ${sysconfdir}/u-boot-initial-env* \
> ${sysconfdir}/fw_env.config \
> "
>
> @@ -269,10 +269,10 @@ do_deploy () {
> ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
> ${UBOOT_BINARY}
>
> # Deploy the uboot-initial-env
> - install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> + install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> cd ${DEPLOYDIR}
> - ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${PN}-initial-env-${MACHINE}-${type}
> - ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${PN}-initial-env-${type}
> + ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> u-boot-initial-env-${MACHINE}-${type}
> + ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> u-boot-initial-env-${type}
> fi
> done
> unset j
> @@ -287,10 +287,10 @@ do_deploy () {
> ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
>
> # Deploy the uboot-initial-env
> - install -D -m 644 ${B}/u-boot-initial-env
> ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
> + install -D -m 644 ${B}/u-boot-initial-env
> ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
> cd ${DEPLOYDIR}
> - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
> ${PN}-initial-env-${MACHINE}
> - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env
> + ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
> u-boot-initial-env-${MACHINE}
> + ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} u-boot-initial-env
> fi
>
> if [ -e ${WORKDIR}/fw_env.config ] ; then
> --
> 2.26.2
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138649):
https://lists.openembedded.org/g/openembedded-core/message/138649
Mute This Topic: https://lists.openembedded.org/mt/74439920/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
