summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2019-04-10 14:08:37 -0500
committerJohn Klug <john.klug@multitech.com>2019-04-10 14:08:37 -0500
commitf69b06e77e3640ecb470efeb4861dbdbfbed83b4 (patch)
treea01a5b767b97e30e27dcd11f4cad06c5d8cd0c12
parent34c9bd4ad5b15ac69bc8cb941038f6681657b6e1 (diff)
downloadmeta-multitech-f69b06e77e3640ecb470efeb4861dbdbfbed83b4.tar.gz
meta-multitech-f69b06e77e3640ecb470efeb4861dbdbfbed83b4.tar.bz2
meta-multitech-f69b06e77e3640ecb470efeb4861dbdbfbed83b4.zip
Clean up the comments, and remove PATCHLEVEL, which does not work.
-rw-r--r--recipes-bsp/u-boot/u-boot.inc11
1 files changed, 5 insertions, 6 deletions
diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc
index d4fa04a..b2adbe2 100644
--- a/recipes-bsp/u-boot/u-boot.inc
+++ b/recipes-bsp/u-boot/u-boot.inc
@@ -67,8 +67,9 @@ UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}"
UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}"
FILES_${PN}-dev += "${includedir}/u-boot/* ${includedir}/u-boot/configs/* ${includedir}/u-boot/asm/*"
-# Put the PR into the U-Boot image. If you can think of a better way, be my guest.
-# Why must it be written in python?
+# Put the PR into the U-Boot image. u-boot allows a local
+# version in a file called localversion.*
+# For some reason, this must be written in python.
do_patch_append () {
try:
S = d.getVar("S",True)
@@ -108,8 +109,7 @@ do_compile () {
j=`expr $j + 1`;
if [ $j -eq $i ]
then
- echo 'JAK was here'
- oe_runmake PATCHLEVEL=${PR} O=${config} ${config} --defconfig mtconfig
+ oe_runmake O=${config} ${config} --defconfig mtconfig
oe_runmake O=${config} ${UBOOT_MAKE_TARGET}
cp ${S}/${config}/${UBOOT_BINARY} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}
fi
@@ -118,8 +118,7 @@ do_compile () {
done
unset i
else
- echo 'JAK 2 was here'
- oe_runmake PATCHLEVEL=${PR} ${UBOOT_MACHINE}
+ oe_runmake ${UBOOT_MACHINE}
oe_runmake ${UBOOT_MAKE_TARGET}
fi