diff --git a/boards/odroid-xu4.sh b/boards/odroid-xu4.sh index 58d09b4..347331a 100644 --- a/boards/odroid-xu4.sh +++ b/boards/odroid-xu4.sh @@ -1,5 +1,5 @@ #!/usr/bin/env zsh -# Copyright (c) 2017 Dyne.org Foundation +# Copyright (c) 2017-2018 Dyne.org Foundation # arm-sdk is written and maintained by Ivan J. # # This file is part of arm-sdk @@ -27,7 +27,7 @@ arrs+=(custmodules extra_packages) device_name="odroidxu4" arch="armhf" -size=1337 +size=1891 inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100") parted_type="dos" @@ -38,8 +38,8 @@ bootfs="vfat" extra_packages+=() custmodules=() -gitkernel="https://github.com/tobetter/linux" -gitbranch="odroidxu4-v4.8" +gitkernel="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" +gitbranch="linux-4.14.y" prebuild() { @@ -56,38 +56,53 @@ prebuild() { postbuild() { fn postbuild + req=(loopdevice) + ckreq || return 1 notice "executing $device_name postbuild" notice "building u-boot" - pushd "$R/extra/u-boot-hardkernel" - act "patching" - git checkout -- . - patch -p1 < "$R/extra/patches/uboothardkernel-tftp-path-len-bigger.patch" \ - || zerr - + pushd $R/extra/u-boot make distclean make \ $MAKEOPTS \ ARCH=arm \ CROSS_COMPILE=$compiler \ - odroid_config || zerr + odroid-xu3_config + make \ $MAKEOPTS \ ARCH=arm \ - CROSS_COMPILE=$compiler || zerr - - notice "dd-ing blobs and u-boot to the image" - sudo dd if=/dev/zero bs=512 count=4000 of=$loopdevice - sudo dd if=sd_fuse/hardkernel_1mb_uboot/bl1.bin.hardkernel \ - bs=512 seek=1 of=$loopdevice - sudo dd if=sd_fuse/hardkernel_1mb_uboot/bl2.bin.hardkernel.1mb_uboot \ - bs=512 seek=31 of=$loopdevice - sudo dd if=u-boot-dtb.bin bs=512 seek=63 of=$loopdevice - sudo dd if=sd_fuse/hardkernel_1mb_uboot/tzsw.bin.hardkernel \ - bs=512 seek=2111 of=$loopdevice + CROSS_COMPILE=$compiler || { + zerr + return 1 + } + mkdir -p "$R/tmp/xu4-uboot" + cp -v u-boot-dtb.bin "$R/tmp/xu4-uboot" popd + pushd $R/extra/u-boot-hardkernel/sd_fuse + git checkout odroidxu4-v2017.05 + cp -v * "$R/tmp/xu4-uboot" + popd + pushd $R/tmp/xu4-uboot + chmod +x sd_fusing.sh + sudo ./sd_fusing.sh $loopdevice + popd + rm -rf $R/tmp/xu4-uboot + notice "creating boot.cmd" + cat <