* [OE-core] [PATCH V2 0/2] Introduce UBOOT_INITIAL_ENV/coding style fixes
@ 2020-05-26 13:16 Ming Liu
2020-05-26 13:16 ` [OE-core] [PATCH V2 1/2] u-boot.inc: fix some inconsistent coding style Ming Liu
2020-05-26 13:16 ` [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV Ming Liu
0 siblings, 2 replies; 6+ messages in thread
From: Ming Liu @ 2020-05-26 13:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: stefan.agner, max.krummenacher, Ming Liu
From: Ming Liu <ming.liu@toradex.com>
Changes in V2:
1 Introduce UBOOT_INITIAL_ENV as suggested by Denys Dmytriyenko.
2 Add fix for some inconsistent coding style.
Ming Liu (2):
u-boot.inc: fix some inconsistent coding style
u-boot: introduce UBOOT_INITIAL_ENV
meta/recipes-bsp/u-boot/u-boot.inc | 76 +++++++++++++++---------------
1 file changed, 39 insertions(+), 37 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [OE-core] [PATCH V2 1/2] u-boot.inc: fix some inconsistent coding style
2020-05-26 13:16 [OE-core] [PATCH V2 0/2] Introduce UBOOT_INITIAL_ENV/coding style fixes Ming Liu
@ 2020-05-26 13:16 ` Ming Liu
2020-05-26 23:15 ` [oe] " Khem Raj
2020-05-26 13:16 ` [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV Ming Liu
1 sibling, 1 reply; 6+ messages in thread
From: Ming Liu @ 2020-05-26 13:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: stefan.agner, max.krummenacher, Ming Liu
From: Ming Liu <ming.liu@toradex.com>
Signed-off-by: Ming Liu <ming.liu@toradex.com>
---
meta/recipes-bsp/u-boot/u-boot.inc | 44 ++++++++++++++----------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 80f828df52..718435f13f 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -91,19 +91,19 @@ do_configure () {
}
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
+ 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
+ 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 [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
+ then
+ echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
+ echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
+ fi
if [ -n "${UBOOT_CONFIG}" ]
then
@@ -130,16 +130,15 @@ do_compile () {
unset k
fi
done
- unset j
+ unset j
done
- unset i
+ unset i
else
oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET}
# Generate the uboot-initial-env
oe_runmake -C ${S} O=${B} u-boot-initial-env
fi
-
}
do_install () {
@@ -162,9 +161,9 @@ do_install () {
ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env
fi
done
- unset j
+ unset j
done
- unset i
+ unset i
else
install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
@@ -219,9 +218,9 @@ do_install () {
ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}
fi
done
- unset j
+ unset j
done
- unset i
+ unset i
else
install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME}
@@ -238,7 +237,6 @@ do_install () {
then
install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME}
fi
-
}
PACKAGE_BEFORE_PN += "${PN}-env"
@@ -275,9 +273,9 @@ do_deploy () {
ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type}
fi
done
- unset j
+ unset j
done
- unset i
+ unset i
else
install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
@@ -346,9 +344,9 @@ do_deploy () {
ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}
fi
done
- unset j
+ unset j
done
- unset i
+ unset i
else
install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV
2020-05-26 13:16 [OE-core] [PATCH V2 0/2] Introduce UBOOT_INITIAL_ENV/coding style fixes Ming Liu
2020-05-26 13:16 ` [OE-core] [PATCH V2 1/2] u-boot.inc: fix some inconsistent coding style Ming Liu
@ 2020-05-26 13:16 ` Ming Liu
2020-05-26 23:16 ` [oe] " Khem Raj
1 sibling, 1 reply; 6+ messages in thread
From: Ming Liu @ 2020-05-26 13:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: stefan.agner, max.krummenacher, Ming Liu
From: Ming Liu <ming.liu@toradex.com>
It defaults to ${PN}-initial-env, no functional changes with current
implementation, but this allows it to be changed in individual u-boot
recipes.
The major purpose for introducing this, is that the users might have
some scripts on targets like:
```
/sbin/fw_setenv -f /etc/u-boot-initial-env
```
and it should be able to run against a identical path generated by
different u-boot recipes.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
---
meta/recipes-bsp/u-boot/u-boot.inc | 32 +++++++++++++++++-------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 718435f13f..e408549424 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -60,6 +60,10 @@ 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}"
+# Default name of u-boot initial env, but enable individual recipes to change
+# this value.
+UBOOT_INITIAL_ENV ?= "${PN}-initial-env"
+
# U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf
# to find EXTLINUX conf file.
UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux"
@@ -155,10 +159,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}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
+ ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
+ ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type}
+ ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
fi
done
unset j
@@ -169,9 +173,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}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
+ ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}
+ ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
fi
if [ -n "${UBOOT_ELF}" ]
@@ -243,7 +247,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
RPROVIDES_${PN}-env += "u-boot-default-env"
FILES_${PN}-env = " \
- ${sysconfdir}/${PN}-initial-env* \
+ ${sysconfdir}/${UBOOT_INITIAL_ENV}* \
${sysconfdir}/fw_env.config \
"
@@ -267,10 +271,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}/${UBOOT_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 ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
+ ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type}
fi
done
unset j
@@ -285,10 +289,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}/${UBOOT_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 ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}
+ ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}
fi
if [ -e ${WORKDIR}/fw_env.config ] ; then
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [oe] [OE-core] [PATCH V2 1/2] u-boot.inc: fix some inconsistent coding style
2020-05-26 13:16 ` [OE-core] [PATCH V2 1/2] u-boot.inc: fix some inconsistent coding style Ming Liu
@ 2020-05-26 23:15 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2020-05-26 23:15 UTC (permalink / raw)
To: Ming Liu; +Cc: openembeded-devel, Stefan Agner, Max Krummenacher, Ming Liu
this should go to oe-core ml.
On Tue, May 26, 2020 at 6:16 AM Ming Liu <liu.ming50@gmail.com> wrote:
>
> From: Ming Liu <ming.liu@toradex.com>
>
> Signed-off-by: Ming Liu <ming.liu@toradex.com>
> ---
> meta/recipes-bsp/u-boot/u-boot.inc | 44 ++++++++++++++----------------
> 1 file changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 80f828df52..718435f13f 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -91,19 +91,19 @@ do_configure () {
> }
>
> 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
> + 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
> + 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 [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
> + then
> + echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
> + echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
> + fi
>
> if [ -n "${UBOOT_CONFIG}" ]
> then
> @@ -130,16 +130,15 @@ do_compile () {
> unset k
> fi
> done
> - unset j
> + unset j
> done
> - unset i
> + unset i
> else
> oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET}
>
> # Generate the uboot-initial-env
> oe_runmake -C ${S} O=${B} u-boot-initial-env
> fi
> -
> }
>
> do_install () {
> @@ -162,9 +161,9 @@ do_install () {
> ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env
> fi
> done
> - unset j
> + unset j
> done
> - unset i
> + unset i
> else
> install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
> ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
> @@ -219,9 +218,9 @@ do_install () {
> ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}
> fi
> done
> - unset j
> + unset j
> done
> - unset i
> + unset i
> else
> install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
> ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME}
> @@ -238,7 +237,6 @@ do_install () {
> then
> install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME}
> fi
> -
> }
>
> PACKAGE_BEFORE_PN += "${PN}-env"
> @@ -275,9 +273,9 @@ do_deploy () {
> ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type}
> fi
> done
> - unset j
> + unset j
> done
> - unset i
> + unset i
> else
> install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
>
> @@ -346,9 +344,9 @@ do_deploy () {
> ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}
> fi
> done
> - unset j
> + unset j
> done
> - unset i
> + unset i
> else
> install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
> rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV
2020-05-26 13:16 ` [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV Ming Liu
@ 2020-05-26 23:16 ` Khem Raj
2020-05-27 6:46 ` Ming Liu
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-05-26 23:16 UTC (permalink / raw)
To: Ming Liu; +Cc: openembeded-devel, Stefan Agner, Max Krummenacher, Ming Liu
send to oe-core ml please
On Tue, May 26, 2020 at 6:16 AM Ming Liu <liu.ming50@gmail.com> wrote:
>
> From: Ming Liu <ming.liu@toradex.com>
>
> It defaults to ${PN}-initial-env, no functional changes with current
> implementation, but this allows it to be changed in individual u-boot
> recipes.
>
> The major purpose for introducing this, is that the users might have
> some scripts on targets like:
> ```
> /sbin/fw_setenv -f /etc/u-boot-initial-env
> ```
>
> and it should be able to run against a identical path generated by
> different u-boot recipes.
>
> Signed-off-by: Ming Liu <ming.liu@toradex.com>
> ---
> meta/recipes-bsp/u-boot/u-boot.inc | 32 +++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 718435f13f..e408549424 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -60,6 +60,10 @@ 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}"
>
> +# Default name of u-boot initial env, but enable individual recipes to change
> +# this value.
> +UBOOT_INITIAL_ENV ?= "${PN}-initial-env"
> +
> # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf
> # to find EXTLINUX conf file.
> UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux"
> @@ -155,10 +159,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}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
> + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type}
> + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
> fi
> done
> unset j
> @@ -169,9 +173,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}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}
> + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
> fi
>
> if [ -n "${UBOOT_ELF}" ]
> @@ -243,7 +247,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
>
> RPROVIDES_${PN}-env += "u-boot-default-env"
> FILES_${PN}-env = " \
> - ${sysconfdir}/${PN}-initial-env* \
> + ${sysconfdir}/${UBOOT_INITIAL_ENV}* \
> ${sysconfdir}/fw_env.config \
> "
>
> @@ -267,10 +271,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}/${UBOOT_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 ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
> + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type}
> fi
> done
> unset j
> @@ -285,10 +289,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}/${UBOOT_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 ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}
> + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}
> fi
>
> if [ -e ${WORKDIR}/fw_env.config ] ; then
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV
2020-05-26 23:16 ` [oe] " Khem Raj
@ 2020-05-27 6:46 ` Ming Liu
0 siblings, 0 replies; 6+ messages in thread
From: Ming Liu @ 2020-05-27 6:46 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel, Stefan Agner, Max Krummenacher, Ming Liu
[-- Attachment #1: Type: text/plain, Size: 6358 bytes --]
Sorry, my bad, will resend it to OE mail list.
//Ming Liu
Khem Raj <raj.khem@gmail.com> 於 2020年5月27日 週三 上午1:16寫道：
> send to oe-core ml please
>
> On Tue, May 26, 2020 at 6:16 AM Ming Liu <liu.ming50@gmail.com> wrote:
> >
> > From: Ming Liu <ming.liu@toradex.com>
> >
> > It defaults to ${PN}-initial-env, no functional changes with current
> > implementation, but this allows it to be changed in individual u-boot
> > recipes.
> >
> > The major purpose for introducing this, is that the users might have
> > some scripts on targets like:
> > ```
> > /sbin/fw_setenv -f /etc/u-boot-initial-env
> > ```
> >
> > and it should be able to run against a identical path generated by
> > different u-boot recipes.
> >
> > Signed-off-by: Ming Liu <ming.liu@toradex.com>
> > ---
> > meta/recipes-bsp/u-boot/u-boot.inc | 32 +++++++++++++++++-------------
> > 1 file changed, 18 insertions(+), 14 deletions(-)
> >
> > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
> b/meta/recipes-bsp/u-boot/u-boot.inc
> > index 718435f13f..e408549424 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> > @@ -60,6 +60,10 @@ 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}"
> >
> > +# Default name of u-boot initial env, but enable individual recipes to
> change
> > +# this value.
> > +UBOOT_INITIAL_ENV ?= "${PN}-initial-env"
> > +
> > # U-Boot EXTLINUX variables. U-Boot searches for
> /boot/extlinux/extlinux.conf
> > # to find EXTLINUX conf file.
> > UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux"
> > @@ -155,10 +159,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}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> > + ln -sf
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
> > + ln -sf
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type}
> > + ln -sf
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
> > fi
> > done
> > unset j
> > @@ -169,9 +173,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}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> > + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}
> > + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
> > fi
> >
> > if [ -n "${UBOOT_ELF}" ]
> > @@ -243,7 +247,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
> >
> > RPROVIDES_${PN}-env += "u-boot-default-env"
> > FILES_${PN}-env = " \
> > - ${sysconfdir}/${PN}-initial-env* \
> > + ${sysconfdir}/${UBOOT_INITIAL_ENV}* \
> > ${sysconfdir}/fw_env.config \
> > "
> >
> > @@ -267,10 +271,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}/${UBOOT_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
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
> > + ln -sf
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${UBOOT_INITIAL_ENV}-${type}
> > fi
> > done
> > unset j
> > @@ -285,10 +289,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}/${UBOOT_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 ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> ${UBOOT_INITIAL_ENV}-${MACHINE}
> > + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> ${UBOOT_INITIAL_ENV}
> > fi
> >
> > if [ -e ${WORKDIR}/fw_env.config ] ; then
> > --
> > 2.26.2
> >
> >
>
[-- Attachment #2: Type: text/html, Size: 7673 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-27 6:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 13:16 [OE-core] [PATCH V2 0/2] Introduce UBOOT_INITIAL_ENV/coding style fixes Ming Liu
2020-05-26 13:16 ` [OE-core] [PATCH V2 1/2] u-boot.inc: fix some inconsistent coding style Ming Liu
2020-05-26 23:15 ` [oe] " Khem Raj
2020-05-26 13:16 ` [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV Ming Liu
2020-05-26 23:16 ` [oe] " Khem Raj
2020-05-27 6:46 ` Ming Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.