From 44bef6729bd047ec5bbd656394fcc8e15f6a0f13 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Thu, 19 Nov 2020 14:27:01 +0000 Subject: [PATCH] release: Switch the Allwinner board to GPT Allwinner bootrom have an alternate location for u-boot at 128k. Work was made recently in u-boot to relocate correctly if loaded from there. The advantage of this offset is that we can now use a GPT scheme. --- release/arm64/PINE64-LTS.conf | 4 ++-- release/arm64/PINE64.conf | 4 ++-- release/arm64/PINEBOOK.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/release/arm64/PINE64-LTS.conf b/release/arm64/PINE64-LTS.conf index 39fff59563f..60de485703c 100644 --- a/release/arm64/PINE64-LTS.conf +++ b/release/arm64/PINE64-LTS.conf @@ -13,7 +13,7 @@ IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 -PART_SCHEME="MBR" +PART_SCHEME="GPT" FDT_OVERLAYS="sun50i-a64-timer,sun50i-a64-opp" export BOARDNAME="PINE64-LTS" @@ -21,7 +21,7 @@ arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64-lts" UBOOT_FILES="u-boot-sunxi-with-spl.bin" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=1k seek=8 conv=sync + of=/dev/${mddev} bs=128k seek=1 conv=sync return 0 } diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf index ed433f78caf..12435e38730 100644 --- a/release/arm64/PINE64.conf +++ b/release/arm64/PINE64.conf @@ -13,7 +13,7 @@ IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 -PART_SCHEME="MBR" +PART_SCHEME="GPT" FDT_OVERLAYS="sun50i-a64-timer,sun50i-a64-opp" export BOARDNAME="PINE64" @@ -21,7 +21,7 @@ arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64" UBOOT_FILES="u-boot-sunxi-with-spl.bin" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=1k seek=8 conv=sync + of=/dev/${mddev} bs=128k seek=1 conv=sync return 0 } diff --git a/release/arm64/PINEBOOK.conf b/release/arm64/PINEBOOK.conf index f513290ed97..20e5b771316 100644 --- a/release/arm64/PINEBOOK.conf +++ b/release/arm64/PINEBOOK.conf @@ -13,7 +13,7 @@ IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 -PART_SCHEME="MBR" +PART_SCHEME="GPT" FDT_OVERLAYS="sun50i-a64-timer,sun50i-a64-opp" export BOARDNAME="PINEBOOK" @@ -21,7 +21,7 @@ arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-pinebook" UBOOT_FILES="u-boot-sunxi-with-spl.bin" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=1k seek=8 conv=sync + of=/dev/${mddev} bs=128k seek=1 conv=sync return 0 } -- 2.45.0