summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2015-05-20 17:01:27 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2015-05-22 15:40:23 +0100
commitb2f75e19d5cec68173af3a6aed723abfec0c55a4 (patch)
tree0ba315c03e8d6946462a5ab2ff4a3949e729427a
parent4ec0f298f2cc74cbee618533d490120c380d0d5e (diff)
expoect Android ramdisk.img to live in TOP_DIR
Before packaging, the user should copy the Android ramdisk.img file into the TOP_DIR of their workspace, eg: cd <workspace> wget https://releases.linaro.org/15.04/android/lcr/armv8-android-juno-lsk/ramdisk.img Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rwxr-xr-xbuild-target-bins.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build-target-bins.sh b/build-target-bins.sh
index e09a903..5105e4a 100755
--- a/build-target-bins.sh
+++ b/build-target-bins.sh
@@ -61,7 +61,7 @@ populate_variant()
if [ "$boot_type" = "uboot" ]; then
cp ${OUTDIR}/uInitrd-android.$TARGET_BINS_UINITRD_ADDRS $outdir/ramdisk.img
else
- cp ${OUTDIR}/ramdisk-android.img $outdir/ramdisk.img
+ cp ${TOP_DIR}/ramdisk.img $outdir/ramdisk.img
fi
fi
@@ -134,7 +134,7 @@ do_package()
pushd ${OUTDIR}
if [ "$TARGET_BINS_HAS_ANDROID" = "1" ]; then
for addr in $TARGET_BINS_UINITRD_ADDRS; do
- ${uboot_mkimage} ${common_flags} -T ramdisk -n ramdisk -a $addr -e $addr -n "Android ramdisk" -d ramdisk-android.img uInitrd-android.$addr
+ ${uboot_mkimage} ${common_flags} -T ramdisk -n ramdisk -a $addr -e $addr -n "Android ramdisk" -d ${TOP_DIR}/ramdisk.img uInitrd-android.$addr
done
fi
if [ "$TARGET_BINS_HAS_OE" = "1" ]; then
@@ -152,7 +152,7 @@ do_package()
pushd ${OUTDIR}
for item in $DEVTREE_TREES; do
if [ "$TARGET_BINS_HAS_ANDROID" = "1" ]; then
- append_chosen_node ${item}-chosen-android ramdisk-android.img $item
+ append_chosen_node ${item}-chosen-android ${TOP_DIR}/ramdisk.img $item
fi
if [ "$TARGET_BINS_HAS_OE" = "1" ]; then
append_chosen_node ${item}-chosen-oe ramdisk-oe.img $item