diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-10-05 20:01:31 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-10-05 20:01:31 +0300 |
| commit | d127bc84361d03d87503ffef05382ff2eb23f23d (patch) | |
| tree | f19125a0f660d22e9f8119564eca0df5b93e1889 /jenkins_common_lib | |
| parent | 4a7ce184473d5bc9060af6f7cbe3967e20edd596 (diff) | |
Add support for Aarch64/arm64 boot wrapper
Diffstat (limited to 'jenkins_common_lib')
| -rwxr-xr-x | jenkins_common_lib | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib index 3919565..f3ec191 100755 --- a/jenkins_common_lib +++ b/jenkins_common_lib @@ -8,6 +8,7 @@ pkg_dir="builddir-${kernel_release}" conf_dir="linaro/configs" # Default gitweb access URL. default_git_url="http://git.linaro.org/gitweb?p=$conf_git;a=blob_plain;f=$conf_dir/$conf;hb=$conf_branch" +boot_wrapper_repo="git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git" echo > hwpack_info # start with empty echo KERNEL_CONFIG=$kernel_config >> hwpack_info @@ -122,11 +123,13 @@ build_instructions() kernel_img_cmd=zImage else kernel_img_cmd=uImage - kernel_debarch=armhf fi + kernel_debarch=armhf + kernel_image=arch/arm/boot/vmlinuz elif [ "${ARCH}" = "arm64" ]; then kernel_img_cmd=Image kernel_debarch=arm64 + kernel_image=arch/arm64/boot/Image fi eval 'make O=${pkg_dir} -j${j_count} ${kernel_img_cmd}'${redirect_output} if grep -Fxq 'CONFIG_MODULES=y' ${WORKSPACE}/${pkg_dir}/.config; then @@ -136,8 +139,31 @@ build_instructions() echo "Building with DTBS support..." eval 'make O=${pkg_dir} dtbs'${redirect_output} fi + if [ "${ARCH}" = "arm64" ]; then + echo "Building boot wrapper" + rm -rf ${pkg_dir}/boot-wrapper + git clone ${boot_wrapper_repo} ${pkg_dir}/boot-wrapper + cp -a ${WORKSPACE}/arch/arm64/boot/dts/*.dts* ${pkg_dir}/boot-wrapper/ + cp -a ${pkg_dir}/arch/arm64/boot/Image ${pkg_dir}/boot-wrapper/ + cd ${pkg_dir}/boot-wrapper/ + BOOTARGS_COMMON="console=ttyAMA0 earlyprintk=pl011,0x1c090000 consolelog=9 rw" + make IMAGE=img-foundation.axf FDT_SRC=foundation-v8.dts clean + make DTC=${WORKSPACE}/${pkg_dir}/scripts/dtc/dtc \ + CROSS_COMPILE=${CROSS_COMPILE} \ + IMAGE=img-foundation.axf \ + FDT_SRC=foundation-v8.dts \ + BOOTARGS='"${BOOTARGS_COMMON} root=/dev/vda2"' + make IMAGE=img.axf FDT_SRC=rtsm_ve-aemv8a.dts clean + make DTC=${WORKSPACE}/${pkg_dir}/scripts/dtc/dtc \ + CROSS_COMPILE=${CROSS_COMPILE} \ + IMAGE=img.axf \ + FDT_SRC=rtsm_ve-aemv8a.dts \ + BOOTARGS='"${BOOTARGS_COMMON} root=/dev/mmcblk0p2"' + cd ${WORKSPACE} + cp -a ${pkg_dir}/boot-wrapper/*.axf ${pkg_dir}/arch/arm64/boot/ + fi if [ "${make_deb}" = "true" ]; then - eval 'make O=${pkg_dir} KERNELRELEASE=${kernel_release} KBUILD_DEBARCH=${kernel_debarch} V=1 deb-pkg'${redirect_output} + eval 'make O=${pkg_dir} KERNELRELEASE=${kernel_release} KBUILD_DEBARCH=${kernel_debarch} KBUILD_IMAGE=${kernel_image} V=1 deb-pkg'${redirect_output} fi END=$(date +%s) EXECUTION_TIME_IN_SEC=$(( $END - $START )) |