Fixups for Pinephone.

This commit is contained in:
parazyd 2019-05-06 22:46:43 +02:00
parent 0835e8c46b
commit b906542dbe
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
1 changed files with 6 additions and 7 deletions

View File

@ -58,7 +58,7 @@ prebuild() {
postbuild() { postbuild() {
fn postbuild fn postbuild
req=(uboot_configs device_name compiler) req=(device_name compiler)
ckreq || return 1 ckreq || return 1
notice "executing $device_name postbuild" notice "executing $device_name postbuild"
@ -76,7 +76,7 @@ postbuild() {
cp "$R/tmp/kernels/arm-trusted-firmware/build/sun50i_a64/debug/bl31.bin" . cp "$R/tmp/kernels/arm-trusted-firmware/build/sun50i_a64/debug/bl31.bin" .
make $MAKEOPTS ARCH=arm CROSS_COMPILE=$compiler || zerr make $MAKEOPTS ARCH=arm CROSS_COMPILE=$compiler || zerr
mkdir -p "$R/dist" mkdir -p "$R/dist"
cat spl/sunxi-spl.bin u-boot.itb > "$R/dist" cat spl/sunxi-spl.bin u-boot.itb > "$R/dist/u-boot-sunxi-with-spl-sopine.bin"
popd popd
cat <<EOF | sudo tee "${strapdir}/boot/boot.txt" cat <<EOF | sudo tee "${strapdir}/boot/boot.txt"
@ -97,8 +97,8 @@ EOF
postbuild-clean postbuild-clean
} }
build_kernel_armhf() { build_kernel_arm64() {
fn build_kernel_armhf fn build_kernel_arm64
req=(R arch device_name gitkernel gitbranch MAKEOPTS) req=(R arch device_name gitkernel gitbranch MAKEOPTS)
req+=(strapdir) req+=(strapdir)
ckreq || return 1 ckreq || return 1
@ -116,7 +116,7 @@ build_kernel_armhf() {
$MAKEOPTS \ $MAKEOPTS \
ARCH=arm64 \ ARCH=arm64 \
CROSS_COMPILE=$compiler \ CROSS_COMPILE=$compiler \
Image modules sun50i-a64-dontbeevil.dtb || zerr Image modules allwinner/sun50i-a64-dontbeevil.dtb || zerr
# install kernel modules # install kernel modules
sudo -E PATH="$PATH" \ sudo -E PATH="$PATH" \
@ -131,9 +131,8 @@ build_kernel_armhf() {
pushd "$strapdir/boot" pushd "$strapdir/boot"
sudo gzip Image sudo gzip Image
popd popd
sudo mkdir -p $strapdir/boot/dtbs
sudo cp -v arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dtb \ sudo cp -v arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dtb \
$strapdir/boot/dtbs/ || zerr "$strapdir/boot/" || zerr
popd popd
postbuild || zerr postbuild || zerr