diff --git a/boards/cubieboard2.sh b/boards/cubieboard2.sh index 19e5a67..49fa514 100644 --- a/boards/cubieboard2.sh +++ b/boards/cubieboard2.sh @@ -34,14 +34,13 @@ parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" extra_packages+=() -custmodules=(sunxi_emac) +custmodules=() -gitkernel="https://github.com/linux-sunxi/linux-sunxi.git" -gitbranch="sunxi-3.4" -sunxi_tools="https://github.com/linux-sunxi/sunxi-tools.git" -sunxi_uboot="https://github.com/linux-sunxi/u-boot-sunxi.git" -sunxi_boards="https://github.com/linux-sunxi/sunxi-boards.git" +gitkernel="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" +gitbranch="linux-4.10.y" +uboot=mainline +sunxi_uboot="git://git.denx.de/u-boot.git" prebuild() { fn prebuild @@ -53,18 +52,6 @@ prebuild() { copy-root-overlay mkdir -p $R/tmp/kernels/$device_name - - clone-git $sunxi_boards "$R/tmp/kernels/$device_name/sunxi-boards" || zerr - clone-git $sunxi_tools "$R/tmp/kernels/$device_name/sunxi-tools" || zerr - clone-git $sunxi_uboot "$R/tmp/kernels/$device_name/sunxi-uboot" "mirror/next" || zerr - - pushd $R/tmp/kernels/$device_name/sunxi-tools - act "running fex2bin" - make fex2bin || zerr - sudo ./fex2bin \ - $R/tmp/kernels/$device_name/sunxi-boards/sys_config/a20/cubieboard2.fex \ - $strapdir/boot/script.bin || zerr - popd } postbuild() { @@ -73,31 +60,30 @@ postbuild() { notice "executing $device_name postbuild" notice "building u-boot" - pushd $R/tmp/kernels/$device_name/sunxi-uboot + clone-git $sunxi_uboot "$R/tmp/kernels/$device_name/u-boot" || zerr + pushd $R/tmp/kernels/$device_name/u-boot make distclean make \ $MAKEOPTS \ ARCH=arm \ CROSS_COMPILE=$compiler \ - Cubieboard2_config || zerr + Cubieboard2_defconfig || zerr make \ $MAKEOPTS \ ARCH=arm \ CROSS_COMPILE=$compiler || zerr + act "dd-ing to image..." sudo dd if=u-boot-sunxi-with-spl.bin of=$loopdevice bs=1024 seek=8 || zerr popd - ## {{{ boot txts notice "creating boot.cmd" cat <