From c987cb4d902e68cc142b63fce409c1e254bab22b Mon Sep 17 00:00:00 2001 From: rk-zero Date: Thu, 17 Sep 2020 09:45:23 +0000 Subject: [PATCH] Increase Kernel Size Image and Partition to 64MB --- filesystem/resources/InstallResources/mmc.partmap | 4 ++-- filesystem/resources/InstallResources/mmc_type2.partmap | 4 ++-- scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh | 2 +- scripts/BuildScripts/KernelScripts/buildKernel.sh | 2 +- scripts/InstallScripts/InstallPrawnOS.sh | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/filesystem/resources/InstallResources/mmc.partmap b/filesystem/resources/InstallResources/mmc.partmap index 28c33de93..2d5326687 100644 --- a/filesystem/resources/InstallResources/mmc.partmap +++ b/filesystem/resources/InstallResources/mmc.partmap @@ -5,5 +5,5 @@ unit: sectors first-lba: 34 last-lba: 30785502 -/dev/mmcblk2p1 : start= 20480, size= 65536, type=FE3A2A5D-4F32-41A7-B725-ACCC3285A309, uuid=89B31CDB-1147-5241-8271-C1ADBB9BBB44, name="Kernel", attrs="GUID:49,51,52,54,56" -/dev/mmcblk2p2 : start= 86016, size= 30699486, type=EBD0A0A2-B9E5-4433-87C0-68B6B72699C7, uuid=63DB8E49-63C4-984E-90A0-8AC3222C4771, name="Root" +/dev/mmcblk2p1 : start= 20480, size= 131072, type=FE3A2A5D-4F32-41A7-B725-ACCC3285A309, uuid=89B31CDB-1147-5241-8271-C1ADBB9BBB44, name="Kernel", attrs="GUID:49,51,52,54,56" +/dev/mmcblk2p2 : start= 151552, size= 30633950, type=EBD0A0A2-B9E5-4433-87C0-68B6B72699C7, uuid=63DB8E49-63C4-984E-90A0-8AC3222C4771, name="Root" diff --git a/filesystem/resources/InstallResources/mmc_type2.partmap b/filesystem/resources/InstallResources/mmc_type2.partmap index b3b8ae7b2..4f002d28f 100644 --- a/filesystem/resources/InstallResources/mmc_type2.partmap +++ b/filesystem/resources/InstallResources/mmc_type2.partmap @@ -5,5 +5,5 @@ unit: sectors first-lba: 34 last-lba: 30777310 -/dev/mmcblk2p1 : start= 20480, size= 65536, type=FE3A2A5D-4F32-41A7-B725-ACCC3285A309, uuid=89B31CDB-1147-5241-8271-C1ADBB9BBB44, name="Kernel", attrs="GUID:49,51,52,54,56" -/dev/mmcblk2p2 : start= 86016, size= 30691294, type=EBD0A0A2-B9E5-4433-87C0-68B6B72699C7, uuid=63DB8E49-63C4-984E-90A0-8AC3222C4771, name="Root" +/dev/mmcblk2p1 : start= 20480, size= 131072, type=FE3A2A5D-4F32-41A7-B725-ACCC3285A309, uuid=89B31CDB-1147-5241-8271-C1ADBB9BBB44, name="Kernel", attrs="GUID:49,51,52,54,56" +/dev/mmcblk2p2 : start= 151552, size= 30625758, type=EBD0A0A2-B9E5-4433-87C0-68B6B72699C7, uuid=63DB8E49-63C4-984E-90A0-8AC3222C4771, name="Root" diff --git a/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh b/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh index a24e642a3..fa8c8032c 100755 --- a/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh +++ b/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh @@ -161,7 +161,7 @@ create_image() { parted --script $1 mklabel gpt cgpt create $1 kernel_start=8192 - kernel_size=65536 + kernel_size=131072 cgpt add -i 1 -t kernel -b $kernel_start -s $kernel_size -l Kernel -S 1 -T 5 -P 10 $1 #Now the main filesystem root_start=$(($kernel_start + $kernel_size)) diff --git a/scripts/BuildScripts/KernelScripts/buildKernel.sh b/scripts/BuildScripts/KernelScripts/buildKernel.sh index d175fe5c5..6f6d8d979 100755 --- a/scripts/BuildScripts/KernelScripts/buildKernel.sh +++ b/scripts/BuildScripts/KernelScripts/buildKernel.sh @@ -58,7 +58,7 @@ ARCH_ARMHF=armhf ARCH_ARM64=arm64 #this is the same as the kernel partition size -MAX_KERNEL_SIZE=$(expr 65536 \* 512) +MAX_KERNEL_SIZE=$(expr 131072 \* 512) cd $BUILD_DIR make mrproper diff --git a/scripts/InstallScripts/InstallPrawnOS.sh b/scripts/InstallScripts/InstallPrawnOS.sh index 2d5edf4ba..16daadead 100755 --- a/scripts/InstallScripts/InstallPrawnOS.sh +++ b/scripts/InstallScripts/InstallPrawnOS.sh @@ -161,7 +161,7 @@ install() { CRYPTO=false echo Writing kernel partition - dd if=/dev/zero of=$KERNEL_PARTITION bs=512 count=65536 + dd if=/dev/zero of=$KERNEL_PARTITION bs=512 count=131072 dd if=${BOOT_DEVICE}1 of=$KERNEL_PARTITION conv=notrunc #Handle full disk encryption @@ -249,7 +249,7 @@ emmc_partition() { sfdisk /dev/mmcblk2 < $RESOURCES/mmc_type2.partmap || true else echo ERROR! Not a known EMMC type, please open an issue on github or send SolidHal an email with the Total disk size reported above - echo Try a fallback value? This will allow installation to continue, at the cost of a very small amoutnt of disk space. This may not work. + echo Try a fallback value? This will allow installation to continue, at the cost of a very small amount of disk space. This may not work. select yn in "Yes" "No" do case $yn,$REPLY in @@ -271,7 +271,7 @@ emmc_partition() { external_partition() { EXTERNAL_TARGET=$1 kernel_start=8192 - kernel_size=65536 + kernel_size=131072 #wipe the partition map, cgpt doesn't like anything weird in the primary or backup partition maps sgdisk -Z $EXTERNAL_TARGET partprobe $EXTERNAL_TARGET