Verified Commit d8648f53 authored by Michal Hrusecky's avatar Michal Hrusecky 🦎

compile_fw: Don't try to rebuild sdcard image, use the safe one

parent 8940ef8d
......@@ -173,15 +173,6 @@ fi
COMMIT_DATE="`git log --format=format:%cD -1`"
if [ "$TARGET_BOARD" = turris ]; then
#Build initramfs
echo -e "CONFIG_TARGET_ROOTFS_INITRAMFS=y\nCONFIG_TARGET_INITRAMFS_COMPRESSION_XZ=y" >> .config
make_defconfig
make target/linux/compile "$@"
[ \! -d ./logs ] || cp ./.config logs/config
[ \! -d ./logs ] || mv ./logs ./logs-initram
cp build_dir/target-powerpc_*/linux-mpc85xx_p2020-nand/zImage-initramfs bin/mpc85xx/turris-initramfs-zimage
# Preserve the uncompressed image too
mv build_dir/target-powerpc_*/root-mpc85xx bin/mpc85xx/root
cd bin/mpc85xx/root
......@@ -281,20 +272,7 @@ if [ "$TARGET_BOARD" = "omnia" ]; then
done
fi
if [ "$TARGET_BOARD" = turris ]; then
# Build NOR FW
cp configs/config-turris-nor .config
[ -n "$USE_CCACHE" ] && echo "CONFIG_CCACHE=y" >> .config
make defconfig
make clean
make "$@"
[ \! -d ./logs ] || cp ./.config logs/config
[ \! -d ./logs ] || mv ./logs ./logs-nor
[ -d ./bin/mpc85xx/packages ] && rm -rf ./bin/mpc85xx/packages
[ -d ./bin-nor ] && rm -rf ./bin-nor
mv ./bin ./bin-nor
elif [ "$TARGET_BOARD" = omnia ]; then
if [ "$TARGET_BOARD" = omnia ]; then
cp configs/config-omnia-rescue .config
[ -n "$USE_CCACHE" ] && echo "CONFIG_CCACHE=y" >> .config
# Ugly hack, make python compile first to avoid possible race
......@@ -325,4 +303,6 @@ elif [ "$TARGET_BOARD" = omnia ]; then
cp build_dir/host/uboot-turris-omnia*/turris-omnia-uboot/* bin/mvebu-musl/x86-64
mv bin bin-nor
rm -rf bin-nor/mvebu-musl/packages
elif [ "$TARGET_BOARD" = turris ]; then
cp -r turris-legacy/* .
fi
f8cf3603d6d54e7808474e7dc0cfac7d *openwrt-mpc85xx-p2020-nor-jffs2-128k.img
9a677a9d4c8af4e98e8f56e728bde769 *openwrt-mpc85xx-p2020-nor-turris-nor-uboot.bin
ee745abb09fa95d4f262fda3c561f460 *openwrt-mpc85xx-p2020-nor-turris-nor.bin
a47c25fd81367fe296fe1716852980a8 *openwrt-mpc85xx-p2020-nor-turris-nor.fdt
5d17a0c1dbb575480d121a80358246df *openwrt-mpc85xx-p2020-nor-zImage
SHA256(openwrt-mpc85xx-p2020-nor-jffs2-128k.img)= daab1738737d2f04fe073ed2e06ff5dd04b52ef4f9618d76e31dd90e8c473084
SHA256(openwrt-mpc85xx-p2020-nor-turris-nor-uboot.bin)= 0c80c86d555b13f1df695944c873a8b2b5bd24a39d3cc2d0fff543cb372f1673
SHA256(openwrt-mpc85xx-p2020-nor-turris-nor.bin)= 30c1ed617ebd3189acc75cf685688e5bb65439642978921149e8b4de34b98c98
SHA256(openwrt-mpc85xx-p2020-nor-turris-nor.fdt)= 6627c6e3b1c870f6e004db3db6145cf150c55b9f59713cb205b1c6a44d5b3e6c
SHA256(openwrt-mpc85xx-p2020-nor-zImage)= aee40cb03691143a72a3f812a72b49018d00dfa4be5129b99137e6e8570d22b5
SHA256(sha256sums)= e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment