diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2019-01-24 21:06:52 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2019-01-24 15:39:56 +0000 |
| commit | 1ee379421ca3ed7da75503df0fc26b097dce1fa2 (patch) | |
| tree | 763c093b423e8ad90d4c8b78136c58a057648f72 | |
| parent | d2dd15ca3c138acc5c7beddf109a4a09075d98ef (diff) | |
use clang and image.gz-dtb
Change-Id: I7315a8077cd4ce407cb85e6d25f4cec99be4304e
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | android-hikey-linaro-4.14-pmwg/builders.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/android-hikey-linaro-4.14-pmwg/builders.sh b/android-hikey-linaro-4.14-pmwg/builders.sh index 2a07a8ef27..def1cd765b 100644 --- a/android-hikey-linaro-4.14-pmwg/builders.sh +++ b/android-hikey-linaro-4.14-pmwg/builders.sh @@ -2,8 +2,11 @@ set -ex -git clone --depth=1 https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9 -export PATH=${PATH}:${PWD}/aarch64-linux-android-4.9/bin/ +git clone --depth=1 https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86 +export PATH=${PWD}/aarch64-linux-android-4.9/bin/:${PWD}/linux-x86/clang-r328903/bin/:${PATH} +export CLANG_TRIPLE=aarch64-linux-gnu- +export CROSS_COMPILE=aarch64-linux-android- + if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then echo "INFO: apt update error - try again in a moment" @@ -17,8 +20,8 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; th sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list} fi -make ARCH=arm64 ${DEFCONFIG} -make ARCH=arm64 CROSS_COMPILE=aarch64-linux-android- -j$(nproc) -s Image-dtb +make ARCH=arm64 CC=clang HOSTCC=clang ${DEFCONFIG} +make ARCH=arm64 CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg.py -O mkbootimg wget -q ${REFERENCE_BUILD_URL}/ramdisk.img -O ramdisk.img @@ -27,7 +30,7 @@ mkdir -p out case "${DEFCONFIG}" in hikey_defconfig) python mkbootimg \ - --kernel ${PWD}/arch/arm64/boot/Image-dtb \ + --kernel ${PWD}/arch/arm64/boot/Image.gz-dtb \ --cmdline "androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab" \ --os_version O \ --os_patch_level 2016-11-05 \ @@ -36,7 +39,7 @@ case "${DEFCONFIG}" in ;; hikey960_defconfig) python mkbootimg \ - --kernel ${PWD}/arch/arm64/boot/Image-dtb \ + --kernel ${PWD}/arch/arm64/boot/Image.gz-dtb \ --cmdline "androidboot.hardware=hikey960 console=ttyFIQ0 androidboot.console=ttyFIQ0 firmware_class.path=/vendor/firmware loglevel=15 buildvariant=userdebug overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab" \ --base 0x0 --tags_offset 0x07a00000 --kernel_offset 0x00080000 \ --ramdisk_offset 0x07c00000 \ |