mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
Fix the uboot for rock-3a (#3271)
* Sync kernel config with radxa and remove packaging patch * Merge the rockchip64 legacy config as well * Lower priority of EFI partitioning against DOS partitioning which is used by Armbian Co-authored-by: Catalin Toda <catalinii@yahoo.com>
This commit is contained in:
catalinii
File diff suppressed because it is too large
Load Diff
@@ -34,7 +34,7 @@ prepare_boot_configuration
|
|||||||
|
|
||||||
uboot_custom_postprocess()
|
uboot_custom_postprocess()
|
||||||
{
|
{
|
||||||
tools/mkimage -n rk356x -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img
|
tools/mkimage -n rk3568 -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img
|
||||||
}
|
}
|
||||||
|
|
||||||
family_tweaks_bsp()
|
family_tweaks_bsp()
|
||||||
|
|||||||
@@ -58,12 +58,18 @@ compilation_prepare()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${version}" == "4.19."* ]] && [[ "$LINUXFAMILY" == sunxi* || "$LINUXFAMILY" == meson64 || \
|
if [[ "${version}" == "4.19."* ]] && [[ "$LINUXFAMILY" == sunxi* || "$LINUXFAMILY" == meson64 || \
|
||||||
"$LINUXFAMILY" == mvebu64 || "$LINUXFAMILY" == mt7623 || "$LINUXFAMILY" == mvebu || "$LINUXFAMILY" == rk35xx ]]; then
|
"$LINUXFAMILY" == mvebu64 || "$LINUXFAMILY" == mt7623 || "$LINUXFAMILY" == mvebu ]]; then
|
||||||
display_alert "Adjusting" "packaging" "info"
|
display_alert "Adjusting" "packaging" "info"
|
||||||
cd "$kerneldir" || exit
|
cd "$kerneldir" || exit
|
||||||
process_patch_file "${SRC}/patch/misc/general-packaging-4.19.y.patch" "applying"
|
process_patch_file "${SRC}/patch/misc/general-packaging-4.19.y.patch" "applying"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "${version}" == "4.19."* ]] && [[ "$LINUXFAMILY" == rk35xx ]]; then
|
||||||
|
display_alert "Adjusting" "packaging" "info"
|
||||||
|
cd "$kerneldir" || exit
|
||||||
|
process_patch_file "${SRC}/patch/misc/general-packaging-4.19.y-rk35xx.patch" "applying"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "${version}" == "4.14."* ]] && [[ "$LINUXFAMILY" == s5p6818 || "$LINUXFAMILY" == mvebu64 || \
|
if [[ "${version}" == "4.14."* ]] && [[ "$LINUXFAMILY" == s5p6818 || "$LINUXFAMILY" == mvebu64 || \
|
||||||
"$LINUXFAMILY" == imx7d || "$LINUXFAMILY" == odroidxu4 || "$LINUXFAMILY" == mvebu ]]; then
|
"$LINUXFAMILY" == imx7d || "$LINUXFAMILY" == odroidxu4 || "$LINUXFAMILY" == mvebu ]]; then
|
||||||
display_alert "Adjusting" "packaging" "info"
|
display_alert "Adjusting" "packaging" "info"
|
||||||
|
|||||||
@@ -1,57 +0,0 @@
|
|||||||
Remove after move to Rockchip's kernel source
|
|
||||||
|
|
||||||
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
|
|
||||||
index 0b31f4f1f92c..f6b96d8507f4 100755
|
|
||||||
--- a/scripts/package/builddeb
|
|
||||||
+++ b/scripts/package/builddeb
|
|
||||||
@@ -153,10 +209,50 @@ EOF
|
|
||||||
chmod 755 "$tmpdir/DEBIAN/$script"
|
|
||||||
done
|
|
||||||
|
|
||||||
+##
|
|
||||||
+## Create sym link to kernel image
|
|
||||||
+##
|
|
||||||
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
|
|
||||||
+cat >> $tmpdir/DEBIAN/postinst <<EOT
|
|
||||||
+ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || mv /$installed_image_path /boot/$image_name
|
|
||||||
+touch /boot/.next
|
|
||||||
+exit 0
|
|
||||||
+EOT
|
|
||||||
+
|
|
||||||
+##
|
|
||||||
+## FAT install workaround
|
|
||||||
+##
|
|
||||||
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
|
|
||||||
+cat >> $tmpdir/DEBIAN/preinst <<EOT
|
|
||||||
+# exit if we are running chroot
|
|
||||||
+if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
|
|
||||||
+
|
|
||||||
+check_and_unmount (){
|
|
||||||
+ boot_device=\$(mountpoint -d /boot)
|
|
||||||
+
|
|
||||||
+ for file in /dev/* ; do
|
|
||||||
+ CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
|
|
||||||
+ if [[ "\$CURRENT_DEVICE" = "\$boot_device" ]]; then
|
|
||||||
+ boot_partition=\$file
|
|
||||||
+ break
|
|
||||||
+ fi
|
|
||||||
+ done
|
|
||||||
+
|
|
||||||
+ bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
|
|
||||||
+ if [ "\$bootfstype" = "vfat" ]; then
|
|
||||||
+ # we have to keep it mounted! umount /boot
|
|
||||||
+ rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
|
|
||||||
+ fi
|
|
||||||
+}
|
|
||||||
+mountpoint -q /boot && check_and_unmount
|
|
||||||
+EOT
|
|
||||||
+echo "exit 0" >> $tmpdir/DEBIAN/preinst
|
|
||||||
+
|
|
||||||
# Build kernel header package
|
|
||||||
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
|
|
||||||
(cd $srctree; find arch/*/include tools/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
|
|
||||||
(cd $srctree; find security/selinux/include tools/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
|
|
||||||
+(cd $srctree; find security/*/include -type f) >> "$objtree/debian/hdrsrcfiles"
|
|
||||||
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
|
|
||||||
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
|
|
||||||
if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
|
|
||||||
236
patch/misc/general-packaging-4.19.y-rk35xx.patch
Normal file
236
patch/misc/general-packaging-4.19.y-rk35xx.patch
Normal file
@@ -0,0 +1,236 @@
|
|||||||
|
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
|
||||||
|
index 5b3908880..7a0869261 100644
|
||||||
|
--- a/arch/arm64/Makefile
|
||||||
|
+++ b/arch/arm64/Makefile
|
||||||
|
@@ -126,7 +126,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
|
||||||
|
|
||||||
|
# Default target when executing plain make
|
||||||
|
boot := arch/arm64/boot
|
||||||
|
-KBUILD_IMAGE := $(boot)/Image.gz
|
||||||
|
+KBUILD_IMAGE := $(boot)/Image
|
||||||
|
KBUILD_DTBS := dtbs
|
||||||
|
|
||||||
|
all: Image.gz $(KBUILD_DTBS)
|
||||||
|
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
|
||||||
|
index 4c2b84132..1d51c17cd 100755
|
||||||
|
--- a/scripts/package/builddeb
|
||||||
|
+++ b/scripts/package/builddeb
|
||||||
|
@@ -29,6 +29,44 @@ create_package() {
|
||||||
|
# in case we are in a restrictive umask environment like 0077
|
||||||
|
chmod -R a+rX "$pdir"
|
||||||
|
|
||||||
|
+ # Create preinstall and post install script to remove dtb
|
||||||
|
+ if [[ "$1" == *dtb* ]]; then
|
||||||
|
+
|
||||||
|
+ cat >> $pdir/DEBIAN/preinst <<EOT
|
||||||
|
+rm -rf /boot/dtb-$version; rm -rf /boot/dtb
|
||||||
|
+exit 0
|
||||||
|
+EOT
|
||||||
|
+
|
||||||
|
+ cat >> $pdir/DEBIAN/postinst <<EOT
|
||||||
|
+cd /boot
|
||||||
|
+ln -sfT dtb-$version dtb 2> /dev/null || mv dtb-$version dtb
|
||||||
|
+exit 0
|
||||||
|
+EOT
|
||||||
|
+
|
||||||
|
+ chmod 775 $pdir/DEBIAN/preinst ; chmod 775 $pdir/DEBIAN/postinst
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ # Create postinst prerm scripts for headers
|
||||||
|
+ if [[ "$1" == *headers* ]]; then
|
||||||
|
+
|
||||||
|
+cat >> $pdir/DEBIAN/postinst << EOT
|
||||||
|
+cd /usr/src/linux-headers-$version
|
||||||
|
+echo "Compiling headers - please wait ..."
|
||||||
|
+find -type f -exec touch {} +
|
||||||
|
+make -s scripts >/dev/null
|
||||||
|
+make -s M=scripts/mod/ >/dev/null
|
||||||
|
+exit 0
|
||||||
|
+EOT
|
||||||
|
+
|
||||||
|
+cat >> $pdir/DEBIAN/prerm << EOT
|
||||||
|
+cd /usr/src/linux-headers-$version
|
||||||
|
+rm -rf scripts .config.old
|
||||||
|
+exit 0
|
||||||
|
+EOT
|
||||||
|
+
|
||||||
|
+ chmod 775 $pdir/DEBIAN/postinst ; chmod 775 $pdir/DEBIAN/prerm
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
# Create the package
|
||||||
|
dpkg-gencontrol -p$pname -P"$pdir"
|
||||||
|
dpkg --build "$pdir" ..
|
||||||
|
@@ -39,9 +77,11 @@ tmpdir="$objtree/debian/tmp"
|
||||||
|
kernel_headers_dir="$objtree/debian/hdrtmp"
|
||||||
|
libc_headers_dir="$objtree/debian/headertmp"
|
||||||
|
dbg_dir="$objtree/debian/dbgtmp"
|
||||||
|
-packagename=linux-image-$version
|
||||||
|
-kernel_headers_packagename=linux-headers-$version
|
||||||
|
-libc_headers_packagename=linux-libc-dev
|
||||||
|
+dtb_dir="$objtree/debian/dtbtmp"
|
||||||
|
+packagename=linux-image-"$BRANCH$LOCALVERSION"
|
||||||
|
+kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
|
||||||
|
+dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
|
||||||
|
+libc_headers_packagename=linux-libc-dev-"$BRANCH$LOCALVERSION"
|
||||||
|
dbg_packagename=$packagename-dbg
|
||||||
|
|
||||||
|
if [ "$ARCH" = "um" ] ; then
|
||||||
|
@@ -52,6 +92,15 @@ fi
|
||||||
|
# XXX: have each arch Makefile export a variable of the canonical image install
|
||||||
|
# path instead
|
||||||
|
case $ARCH in
|
||||||
|
+aarch64|arm64)
|
||||||
|
+ image_name=Image
|
||||||
|
+ installed_image_path="boot/vmlinuz-$version"
|
||||||
|
+
|
||||||
|
+ ;;
|
||||||
|
+arm*)
|
||||||
|
+ image_name=zImage
|
||||||
|
+ installed_image_path="boot/vmlinuz-$version"
|
||||||
|
+ ;;
|
||||||
|
um)
|
||||||
|
installed_image_path="usr/bin/linux-$version"
|
||||||
|
;;
|
||||||
|
@@ -65,7 +114,9 @@ esac
|
||||||
|
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
|
||||||
|
|
||||||
|
# Setup the directory structure
|
||||||
|
-rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
|
||||||
|
+rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
|
||||||
|
+mkdir -m 755 -p "$dtb_dir/DEBIAN"
|
||||||
|
+mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
|
||||||
|
mkdir -m 755 -p "$tmpdir/DEBIAN"
|
||||||
|
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
|
||||||
|
mkdir -p "$kernel_headers_dir/lib/modules/$version/"
|
||||||
|
@@ -118,6 +169,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
+if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
|
||||||
|
+ #mkdir -p "$tmpdir/boot/dtb"
|
||||||
|
+ INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
if [ "$ARCH" != "um" ]; then
|
||||||
|
$MAKE headers_check KBUILD_SRC=
|
||||||
|
$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
|
||||||
|
@@ -137,7 +193,7 @@ fi
|
||||||
|
for script in postinst postrm preinst prerm ; do
|
||||||
|
mkdir -p "$tmpdir$debhookdir/$script.d"
|
||||||
|
cat <<EOF > "$tmpdir/DEBIAN/$script"
|
||||||
|
-#!/bin/sh
|
||||||
|
+#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
@@ -153,10 +209,50 @@ EOF
|
||||||
|
chmod 755 "$tmpdir/DEBIAN/$script"
|
||||||
|
done
|
||||||
|
|
||||||
|
+##
|
||||||
|
+## Create sym link to kernel image
|
||||||
|
+##
|
||||||
|
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
|
||||||
|
+cat >> $tmpdir/DEBIAN/postinst <<EOT
|
||||||
|
+ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || mv /$installed_image_path /boot/$image_name
|
||||||
|
+touch /boot/.next
|
||||||
|
+exit 0
|
||||||
|
+EOT
|
||||||
|
+
|
||||||
|
+##
|
||||||
|
+## FAT install workaround
|
||||||
|
+##
|
||||||
|
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
|
||||||
|
+cat >> $tmpdir/DEBIAN/preinst <<EOT
|
||||||
|
+# exit if we are running chroot
|
||||||
|
+if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
|
||||||
|
+
|
||||||
|
+check_and_unmount (){
|
||||||
|
+ boot_device=\$(mountpoint -d /boot)
|
||||||
|
+
|
||||||
|
+ for file in /dev/* ; do
|
||||||
|
+ CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
|
||||||
|
+ if [[ "\$CURRENT_DEVICE" = "\$boot_device" ]]; then
|
||||||
|
+ boot_partition=\$file
|
||||||
|
+ break
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
+ bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
|
||||||
|
+ if [ "\$bootfstype" = "vfat" ]; then
|
||||||
|
+ # we have to keep it mounted! umount /boot
|
||||||
|
+ rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
+mountpoint -q /boot && check_and_unmount
|
||||||
|
+EOT
|
||||||
|
+echo "exit 0" >> $tmpdir/DEBIAN/preinst
|
||||||
|
+
|
||||||
|
# Build kernel header package
|
||||||
|
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
|
||||||
|
(cd $srctree; find arch/*/include tools/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
|
||||||
|
(cd $srctree; find security/selinux/include tools/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
|
||||||
|
+(cd $srctree; find security/*/include -type f) >> "$objtree/debian/hdrsrcfiles"
|
||||||
|
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
|
||||||
|
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
|
||||||
|
if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
|
||||||
|
@@ -168,15 +264,19 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
|
||||||
|
fi
|
||||||
|
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
|
||||||
|
mkdir -p "$destdir"
|
||||||
|
+(cd $destdir; patch -p1 < /tmp/headers-debian-byteshift.patch)
|
||||||
|
(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
|
||||||
|
(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
|
||||||
|
(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
|
||||||
|
ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
|
||||||
|
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
|
||||||
|
|
||||||
|
+(cd $destdir; make M=scripts clean)
|
||||||
|
+
|
||||||
|
if [ "$ARCH" != "um" ]; then
|
||||||
|
create_package "$kernel_headers_packagename" "$kernel_headers_dir"
|
||||||
|
- create_package "$libc_headers_packagename" "$libc_headers_dir"
|
||||||
|
+ # create_package "$libc_headers_packagename" "$libc_headers_dir"
|
||||||
|
+ create_package "$dtb_packagename" "$dtb_dir"
|
||||||
|
fi
|
||||||
|
|
||||||
|
create_package "$packagename" "$tmpdir"
|
||||||
|
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
|
||||||
|
index edcad61fe..8a49f4329 100755
|
||||||
|
--- a/scripts/package/mkdebian
|
||||||
|
+++ b/scripts/package/mkdebian
|
||||||
|
@@ -94,10 +94,12 @@ else
|
||||||
|
packageversion=$version-$revision
|
||||||
|
fi
|
||||||
|
sourcename=$KDEB_SOURCENAME
|
||||||
|
-packagename=linux-image-$version
|
||||||
|
-kernel_headers_packagename=linux-headers-$version
|
||||||
|
+packagename=linux-image-"$BRANCH$LOCALVERSION"
|
||||||
|
+kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
|
||||||
|
+dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
|
||||||
|
dbg_packagename=$packagename-dbg
|
||||||
|
debarch=
|
||||||
|
+image_name=
|
||||||
|
set_debarch
|
||||||
|
|
||||||
|
if [ "$ARCH" = "um" ] ; then
|
||||||
|
@@ -181,6 +183,7 @@ Description: Linux kernel, version $version
|
||||||
|
|
||||||
|
Package: $kernel_headers_packagename
|
||||||
|
Architecture: $debarch
|
||||||
|
+Depends: make, gcc, libc6-dev, flex, bison, libssl-dev
|
||||||
|
Description: Linux kernel headers for $version on $debarch
|
||||||
|
This package provides kernel header files for $version on $debarch
|
||||||
|
.
|
||||||
|
@@ -200,6 +203,11 @@ Architecture: $debarch
|
||||||
|
Description: Linux kernel debugging symbols for $version
|
||||||
|
This package will come in handy if you need to debug the kernel. It provides
|
||||||
|
all the necessary debug symbols for the kernel and its modules.
|
||||||
|
+
|
||||||
|
+Package: $dtb_packagename
|
||||||
|
+Architecture: $debarch
|
||||||
|
+Description: Linux DTB, version $version
|
||||||
|
+ This package contains device blobs from the Linux kernel, version $version
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat <<EOF > debian/rules
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
From c0b53188414ab176eb7cdaee5794c0e3975b2b12 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Catalin Toda <catalinii@yahoo.com>
|
||||||
|
Date: Thu, 16 Dec 2021 19:06:27 -0800
|
||||||
|
Subject: [PATCH] Lower the priority of EFI to be after DOS partition
|
||||||
|
|
||||||
|
---
|
||||||
|
disk/part_efi.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/disk/part_efi.c b/disk/part_efi.c
|
||||||
|
index 27f3e4dda3..019f1e7cd3 100644
|
||||||
|
--- a/disk/part_efi.c
|
||||||
|
+++ b/disk/part_efi.c
|
||||||
|
@@ -1264,7 +1264,7 @@ static int is_pte_valid(gpt_entry * pte)
|
||||||
|
* check EFI first, since a DOS partition is often used as a 'protective MBR'
|
||||||
|
* with EFI.
|
||||||
|
*/
|
||||||
|
-U_BOOT_PART_TYPE(a_efi) = {
|
||||||
|
+U_BOOT_PART_TYPE(efi) = {
|
||||||
|
.name = "EFI",
|
||||||
|
.part_type = PART_TYPE_EFI,
|
||||||
|
.max_entries = GPT_ENTRY_NUMBERS,
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
@@ -1,13 +1,12 @@
|
|||||||
diff --git a/tools/rkcommon.c b/tools/rkcommon.c
|
diff --git a/tools/rkcommon.c b/tools/rkcommon.c
|
||||||
index af2a483..87ef80a 100644
|
index 738e365d74..4655de9b4d 100644
|
||||||
--- a/tools/rkcommon.c
|
--- a/tools/rkcommon.c
|
||||||
+++ b/tools/rkcommon.c
|
+++ b/tools/rkcommon.c
|
||||||
@@ -137,6 +137,8 @@ static struct spl_info spl_infos[] = {
|
@@ -136,6 +136,7 @@ static struct spl_info spl_infos[] = {
|
||||||
|
{ "rv1108", "RK11", 0x1800, false, RK_HEADER_V1 },
|
||||||
{ "rv1126", "110B", 0x10000 - 0x1000, false, RK_HEADER_V1 },
|
{ "rv1126", "110B", 0x10000 - 0x1000, false, RK_HEADER_V1 },
|
||||||
{ "rk1808", "RK18", 0x200000 - 0x2000, false, RK_HEADER_V1 },
|
{ "rk1808", "RK18", 0x200000 - 0x2000, false, RK_HEADER_V1 },
|
||||||
{ "rk356x", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
|
|
||||||
+ { "rk3566", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
|
+ { "rk3566", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
|
||||||
+ { "rk3568", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
|
{ "rk3568", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
|
|||||||
Reference in New Issue
Block a user