From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/classes/tisdk-image.bbclass | 26 ++++++++++++++++------
.../recipes-core/images/arago-amsdk-image.bb | 2 +-
.../recipes-core/images/arago-core-tisdk-image.bb | 2 +-
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/meta-arago-distro/classes/tisdk-image.bbclass
b/meta-arago-distro/classes/tisdk-image.bbclass
index f533a90..d3b97ee 100644
--- a/meta-arago-distro/classes/tisdk-image.bbclass
+++ b/meta-arago-distro/classes/tisdk-image.bbclass
@@ -46,8 +46,11 @@ TARGET_IMAGE_TYPES ?= "tar.bz2 tar.gz ubi"
# the variable is in the BB_ENV_EXTRAWHITE list.
EXTRA_TISDK_FILES ?= ""
-# Variable to specify the name of the secondary bootloader
-SECONDARY_BOOTLOADER_NAME ?= "MLO-${MACHINE}"
+# Variable to specify the name of SPL
+DEPLOY_SPL_NAME ?= "MLO-${MACHINE}"
+
+# Variable to specify the name of SPL/UART
+DEPLOY_SPL_UART_NAME ?= "u-boot-spl.bin-${MACHINE}"
# Manifest file location which will be created as part of the image build
# process.
@@ -541,18 +544,27 @@ do_sdk_image () {
done
fi
- if [ "${SECONDARY_BOOTLOADER_NAME}" != "" ]
+ if [ "${DEPLOY_SPL_NAME}" != "" ]
then
- # Copy the secondary bootloader image if it exists
- if [ -e ${DEPLOY_DIR_IMAGE}/${SECONDARY_BOOTLOADER_NAME} ]
+ # Copy the SPL image if it exists
+ if [ -e ${DEPLOY_DIR_IMAGE}/${DEPLOY_SPL_NAME} ]
then
- cp ${DEPLOY_DIR_IMAGE}/${SECONDARY_BOOTLOADER_NAME}
${prebuilt_dir}/
+ cp ${DEPLOY_DIR_IMAGE}/${DEPLOY_SPL_NAME} ${prebuilt_dir}/
else
- echo "Could not find the secondary bootloader image"
+ echo "Could not find the SPL image"
return 1
fi
fi
+ if [ "${DEPLOY_SPL_UART_NAME}" != "" ]
+ then
+ # Copy the SPL/UART image if it exists
+ if [ -e ${DEPLOY_DIR_IMAGE}/${DEPLOY_SPL_UART_NAME} ]
+ then
+ cp ${DEPLOY_DIR_IMAGE}/${DEPLOY_SPL_UART_NAME} ${prebuilt_dir}/
+ fi
+ fi
+
# Add the EXTRA_TISDK_FILES contents if they exist
# Make sure EXTRA_TISDK_FILES is not empty so we don't accidentaly
# copy the root directory.
diff --git a/meta-arago-distro/recipes-core/images/arago-amsdk-image.bb
b/meta-arago-distro/recipes-core/images/arago-amsdk-image.bb
index 5cb2bc5..5995507 100644
--- a/meta-arago-distro/recipes-core/images/arago-amsdk-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-amsdk-image.bb
@@ -1,5 +1,5 @@
require arago-core-tisdk-image.inc
-SECONDARY_BOOTLOADER_NAME_omapl138 = ""
+DEPLOY_SPL_NAME_omapl138 = ""
export IMAGE_BASENAME = "arago-amsdk-image"
diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb
b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb
index 608386f..33bfc11 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb
@@ -1,5 +1,5 @@
require arago-core-tisdk-image.inc
-SECONDARY_BOOTLOADER_NAME_omapl138 = ""
+DEPLOY_SPL_NAME_omapl138 = ""
export IMAGE_BASENAME = "arago-core-tisdk-image"
--
1.8.2.1
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
