Skip to contentSkip to conversation

Introduce UBOOT_INITIAL_ENV/coding style fixes

PATCH Superseded Ming Liu 2 participants 6 messages May 26, 2020 – May 27, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Ming Liu

author
#0 lore raw

v2 cover Introduce UBOOT_INITIAL_ENV/coding style fixes

From: Ming Liu <[email protected]>

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(-)
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH v2 1/2 u-boot.inc: fix some inconsistent coding style

From: Ming Liu <[email protected]>

---
 meta/recipes-bsp/u-boot/u-boot.inc | 44 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 23 deletions(-)
meta/recipes-bsp/u-boot/u-boot.inc +21 -23
index 80f828df52..718435f13f 100644
@@ -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}
Signature · 1 line
2.26.2
#2 lore raw

Re: [oe] [OE-core] [PATCH V2 1/2] u-boot.inc: fix some inconsistent coding style

this should go to oe-core ml.

Quoted 122 lines · Ming Liu

From: Ming Liu <[email protected]>

---
 meta/recipes-bsp/u-boot/u-boot.inc | 44 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 23 deletions(-)
meta/recipes-bsp/u-boot/u-boot.inc +21 -24
index 80f828df52..718435f13f 100644
@@ -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

author
#3 lore raw

PATCH v2 2/2 u-boot: introduce UBOOT_INITIAL_ENV

In reply to Ming Liu

From: Ming Liu <[email protected]>

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.

---
 meta/recipes-bsp/u-boot/u-boot.inc | 32 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 14 deletions(-)
meta/recipes-bsp/u-boot/u-boot.inc +18 -14
index 718435f13f..e408549424 100644
@@ -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
Signature · 1 line
2.26.2
#4 lore raw

Re: [oe] [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV

send to oe-core ml please

Quoted 105 lines · Ming Liu

From: Ming Liu <[email protected]>

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.

---
 meta/recipes-bsp/u-boot/u-boot.inc | 32 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 14 deletions(-)
meta/recipes-bsp/u-boot/u-boot.inc +18 -15
index 718435f13f..e408549424 100644
@@ -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

author
#5 lore raw

Re: [oe] [OE-core] [PATCH V2 2/2] u-boot: introduce UBOOT_INITIAL_ENV

Sorry, my bad, will resend it to OE mail list.

//Ming Liu

Khem Raj <[email protected]> 於 2020年5月27日 週三 上午1:16寫道:

Quoted 154 lines

send to oe-core ml please

Quoted 16 lines · Ming Liu

From: Ming Liu <[email protected]>

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.

Review

Quoted 6 lines
---
 meta/recipes-bsp/u-boot/u-boot.inc | 32 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 14 deletions(-)
(quoted diff) +0 -0

b/meta/recipes-bsp/u-boot/u-boot.inc

meta/recipes-bsp/u-boot/u-boot.inc UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" · line 60

Quoted 5 lines

index 718435f13f..e408549424 100644

meta/recipes-bsp/u-boot/u-boot.inc +0 -0
@@ -60,6 +60,10 @@ UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}"
 UBOOT_ENV_IMAGE ?=

"${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}"

meta/recipes-bsp/u-boot/u-boot.inc UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}"

Quoted 3 lines
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
 UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}"
 
+# Default name of u-boot initial env, but enable individual recipes to

change

meta/recipes-bsp/u-boot/u-boot.inc UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}"

Quoted 4 lines
meta/recipes-bsp/u-boot/u-boot.inc +3 -0
+# this value.
+UBOOT_INITIAL_ENV ?= "${PN}-initial-env"
+
 # U-Boot EXTLINUX variables. U-Boot searches for

/boot/extlinux/extlinux.conf

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 159

Quoted 4 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -0
 # 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}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 157

Quoted 3 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
                     # 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}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 158

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
-                    ln -sf

${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 159

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
-                    ln -sf

${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 160

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
-                    ln -sf

${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 161

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+                    install -D -m 644

${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 162

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+                    ln -sf

${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 163

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+                    ln -sf

${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 164

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+                    ln -sf

${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 172

Quoted 8 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
                 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}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 173

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
-        ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}

${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 174

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
-        ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}

${D}/${sysconfdir}/${PN}-initial-env

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 176

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+        install -D -m 644 ${B}/u-boot-initial-env

${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 177

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}

${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}

meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 178

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}

${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}

Quoted 13 lines
meta/recipes-bsp/u-boot/u-boot.inc +1 -1
     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 \
 "
 

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 271

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -0
@@ -267,10 +271,10 @@ do_deploy () {
                     ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}

${UBOOT_BINARY}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 269

Quoted 3 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
                     # Deploy the uboot-initial-env
-                    install -D -m 644

${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 273

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+                    install -D -m 644

${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 271

Quoted 2 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
                     cd ${DEPLOYDIR}
-                    ln -sf

${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${PN}-initial-env-${MACHINE}-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 272

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
-                    ln -sf

${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 275

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+                    ln -sf

${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 276

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+                    ln -sf

${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 288

Quoted 8 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
                 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}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 292

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+        install -D -m 644 ${B}/u-boot-initial-env

${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 290

Quoted 2 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
         cd ${DEPLOYDIR}
-        ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}

${PN}-initial-env-${MACHINE}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 291

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
-        ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}

${PN}-initial-env

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 294

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}

${UBOOT_INITIAL_ENV}-${MACHINE}

meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 295

Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1 -0
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}

${UBOOT_INITIAL_ENV}

Quoted 7 lines
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
     fi
 
     if [ -e ${WORKDIR}/fw_env.config ] ; then
--

2.26.2