Skip to contentSkip to conversation

tisdk-bundle: fix prebuilt-images U-Boot binary name for HS

PATCH In review Andrew Davis 2 participants 3 messages Jun 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tisdk-bundle: fix prebuilt-images U-Boot binary name for HS

HS builds do not generate a -${MACHINE} version of the u-boot.img binary. Not sure why we deploy these named this way to begin with, maybe a left- over from when we had multiple machines per SDK.. To fix the HS builds lets ship the binary named as-is for all platforms.

---
 meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arago-distro/classes/tisdk-bundle.bbclass +2 -2
index 7e3f4c26..9e961e1b 100644
@@ -777,9 +777,9 @@ tisdk_image_build () {
     fi
 
     # Copy the U-Boot image if it exists
-    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ]
+    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot.img ]
     then
-        cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ${prebuilt_dir}/
+        cp ${DEPLOY_DIR_IMAGE}/u-boot.img ${prebuilt_dir}/
     elif [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ]
     then
         cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${prebuilt_dir}/
Signature · 1 line
2.36.1
#1 lore raw
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org

HS builds do not generate a -${MACHINE} version of the u-boot.img binary. Not sure why we deploy these named this way to begin with, maybe a left- over from when we had multiple machines per SDK.. To fix the HS builds lets ship the binary named as-is for all platforms.

This could potentially mess up with the way Processor SDK (installer, setup scripts, etc.) expects U-boot binary to be called. I.e. the stuff outside of CoreSDK and the Yocto build... But I'm not sure, just speculating here.

Quoted 23 lines
---
 meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arago-distro/classes/tisdk-bundle.bbclass +2 -2
index 7e3f4c26..9e961e1b 100644
@@ -777,9 +777,9 @@ tisdk_image_build () {
     fi
 
     # Copy the U-Boot image if it exists
-    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ]
+    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot.img ]
     then
-        cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ${prebuilt_dir}/
+        cp ${DEPLOY_DIR_IMAGE}/u-boot.img ${prebuilt_dir}/
     elif [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ]
     then
         cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${prebuilt_dir}/
Signature · 1 line
2.36.1
#2 lore raw
Quoted 10 lines · Denys Dmytriyenko
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org

HS builds do not generate a -${MACHINE} version of the u-boot.img binary. Not sure why we deploy these named this way to begin with, maybe a left- over from when we had multiple machines per SDK.. To fix the HS builds lets ship the binary named as-is for all platforms.

This could potentially mess up with the way Processor SDK (installer, setup scripts, etc.) expects U-boot binary to be called. I.e. the stuff outside of CoreSDK and the Yocto build... But I'm not sure, just speculating here.

What the installers expect U-Boot to be called doesn't change what it should be called. To boot from filesystem it should be called 'u-boot.img`, this is the name made by U-Boot build, this is how it is called in the public u-boot docs, and the name we should use.

I cannot check every workflow, if it is different outside of Yocto build, then it is wrong there and should be fixed at that level.

Andrew

Quoted 24 lines
Quoted 24 lines
---
  meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta-arago-distro/classes/tisdk-bundle.bbclass +2 -2
index 7e3f4c26..9e961e1b 100644
@@ -777,9 +777,9 @@ tisdk_image_build () {
      fi
 
      # Copy the U-Boot image if it exists
-    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ]
+    if [ -e ${DEPLOY_DIR_IMAGE}/u-boot.img ]
      then
-        cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ${prebuilt_dir}/
+        cp ${DEPLOY_DIR_IMAGE}/u-boot.img ${prebuilt_dir}/
      elif [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ]
      then
          cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${prebuilt_dir}/
Signature · 1 line
2.36.1