summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2015-01-15 17:03:01 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2015-01-15 17:03:01 +0200
commitc6f4191ed0dba2353ae067698343e2dd94b976d0 (patch)
tree27c2a736ab5549539a8ff87d5ae802df9ecbe303
parentbfc72209763f445ef83b97932628eeef75d1cd49 (diff)
downloadlci-build-tools-c6f4191ed0dba2353ae067698343e2dd94b976d0.tar.gz
bootwrapper: use configure --with-dtb parameter
Change-Id: I63fab543a70316c2accdbc855360c3387d44c634 Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rwxr-xr-xjenkins_common_lib12
1 files changed, 8 insertions, 4 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib
index 8c6ced9..005a75d 100755
--- a/jenkins_common_lib
+++ b/jenkins_common_lib
@@ -143,22 +143,26 @@ build_instructions()
git clone ${boot_wrapper_repo} ${pkg_dir}/boot-wrapper
cd ${pkg_dir}/boot-wrapper/
autoreconf -vfi
+ kernel_dtb=`find ${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/ -type f -name 'foundation-v8.dtb'`
./configure \
--host=aarch64-linux-gnu \
--with-kernel-dir=${WORKSPACE}/${pkg_dir} \
- --with-cmdline="console=ttyAMA0 earlyprintk=pl011,0x1c090000 consolelog=9 rw root=/dev/vda2"
+ --with-cmdline="console=ttyAMA0 earlyprintk=pl011,0x1c090000 consolelog=9 rw root=/dev/vda2" \
+ --with-dtb=${kernel_dtb}
make IMAGE=img-foundation.axf clean
make DTC=${WORKSPACE}/${pkg_dir}/scripts/dtc/dtc \
IMAGE=img-foundation.axf \
- KERNEL_DTB=`find ${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/ -type f -name 'foundation-v8.dtb'`
+ KERNEL_DTB=${kernel_dtb}
+ kernel_dtb=`find ${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/ -type f -name 'rtsm_ve-aemv8a.dtb'`
./configure \
--host=aarch64-linux-gnu \
--with-kernel-dir=${WORKSPACE}/${pkg_dir} \
- --with-cmdline="console=ttyAMA0 earlyprintk=pl011,0x1c090000 consolelog=9 rw root=/dev/mmcblk0p2"
+ --with-cmdline="console=ttyAMA0 earlyprintk=pl011,0x1c090000 consolelog=9 rw root=/dev/mmcblk0p2" \
+ --with-dtb=${kernel_dtb}
make IMAGE=img.axf clean
make DTC=${WORKSPACE}/${pkg_dir}/scripts/dtc/dtc \
IMAGE=img.axf \
- KERNEL_DTB=`find ${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/ -type f -name 'rtsm_ve-aemv8a.dtb'`
+ KERNEL_DTB=${kernel_dtb}
cd ${WORKSPACE}
cp -a ${pkg_dir}/boot-wrapper/*.axf ${pkg_dir}/arch/arm64/boot/
fi