diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2015-12-04 13:59:32 +0200 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2015-12-04 13:59:32 +0200 |
commit | 8537268359a54d0ab0fcb9b31073fc85159abbe1 (patch) | |
tree | 02fdad40985b90d7be677822b4ba73aa9b6703fd /96boards-hikey-mainline-rebase.yaml | |
parent | 822d2469f465dd2eb3ecd702f5c6f62e34d2b0a1 (diff) |
96boards-hikey-mainline-rebase: sync the build with 96boards-hikey job
* add OP-TEE
* update GRUB
Change-Id: If8da1483eaeeb26cc789e59b0e9cb572ddf1edd8
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to '96boards-hikey-mainline-rebase.yaml')
-rw-r--r-- | 96boards-hikey-mainline-rebase.yaml | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/96boards-hikey-mainline-rebase.yaml b/96boards-hikey-mainline-rebase.yaml index a399bdce72..4d87b732dd 100644 --- a/96boards-hikey-mainline-rebase.yaml +++ b/96boards-hikey-mainline-rebase.yaml @@ -46,7 +46,6 @@ { cd ${WORKSPACE} sudo kpartx -dv out/hikey-jessie_*.img || true - rm -rf lci-build-tools rm -rf builddir* rm -rf out } @@ -68,8 +67,8 @@ export kernel_config=defconfig export MAKE_DTBS=true export ARCH=arm64 - export tcbindir="${HOME}/srv/toolchain/arm64-tc-14.09/bin" - export toolchain_url=http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz + export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.08/bin" + export toolchain_url=http://releases.linaro.org/components/toolchain/binaries/5.1-2015.08/aarch64-linux-gnu/gcc-linaro-5.1-2015.08-x86_64_aarch64-linux-gnu.tar.xz rm -rf configs lci-build-tools git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git @@ -77,6 +76,13 @@ bash -x lci-build-tools/jenkins_kernel_build_inst rm -rf out/dtbs + git clone --depth 1 https://github.com/OP-TEE/optee_linuxdriver.git + export PATH=${WORKSPACE}/srv/toolchain/arm64-tc-15.08/bin:${PATH} + export CROSS_COMPILE=aarch64-linux-gnu- + make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver modules + make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver INSTALL_MOD_PATH=${WORKSPACE}/build-utilites/fs modules_install + cd ${WORKSPACE} + # Create the hardware pack cp -a configs/96boards-hikey/hwpacks/linaro-hikey . @@ -92,30 +98,6 @@ GRUB_EFI_URL="http://builds.96boards.org/snapshots/hikey/linaro/grub/latest" wget --progress=dot ${GRUB_EFI_URL}/grubaa64.efi -O grubaa64.efi - cat << EOF > grub.cfg - set default="0" - set timeout=1 - - menuentry 'Debian GNU/Linux (eMMC)' { - search.fs_label rootfs root - linux (\$root)/boot/Image console=tty0 console=ttyAMA3,115200 root=/dev/disk/by-partlabel/system rootwait rw quiet efi=noruntime - initrd (\$root)/boot/initrd.img - devicetree (\$root)/boot/hi6220-hikey.dtb - } - - menuentry 'Debian GNU/Linux (SD card)' { - search.fs_label rootfs root - linux (\$root)/boot/Image console=tty0 console=ttyAMA3,115200 root=/dev/mmcblk1p2 rootwait rw quiet efi=noruntime - initrd (\$root)/boot/initrd.img - devicetree (\$root)/boot/hi6220-hikey.dtb - } - - menuentry 'Fastboot' { - search.fs_label boot root - chainloader (\$root)/EFI/BOOT/fastboot.efi - } - EOF - cat > out/README.txt << EOF Build information: * build: ${BUILD_URL} @@ -229,7 +211,7 @@ rm -rf wl18xx_fw # ******** TI wl18xx R8.6 - out of tree firmware ******** - sudo make_ext4fs -o -L rootfs -l 2G -s out/hikey-jessie_${rootfs}_${VERSION}.emmc.img rootfs/ + sudo make_ext4fs -o -L rootfs -l 3206528512 -s out/hikey-jessie_${rootfs}_${VERSION}.emmc.img rootfs/ sudo umount boot rootfs sudo kpartx -dv out/hikey-jessie_${rootfs}_${VERSION}.img sudo rm -rf boot rootfs @@ -248,7 +230,7 @@ sudo mkdir -p boot-fat/EFI/BOOT sudo cp -a fastboot.efi boot-fat/EFI/BOOT/fastboot.efi || true sudo cp -a grubaa64.efi boot-fat/EFI/BOOT/grubaa64.efi || true - sudo cp -a grub.cfg boot-fat/EFI/BOOT/grub.cfg || true + sudo cp -a configs/96boards-hikey/boot/grub.cfg boot-fat/EFI/BOOT/grub.cfg || true sudo umount boot-fat sudo chmod 777 out/boot-fat.uefi.img |