Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions filesystem/resources/InstallResources/mmc.partmap
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions filesystem/resources/InstallResources/mmc_type2.partmap
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion scripts/BuildScripts/KernelScripts/buildKernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scripts/InstallScripts/InstallPrawnOS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down