Reserve 50MB for boot

This commit is contained in:
Calin Crisan 2018-11-21 23:45:41 +02:00
parent a89765b09b
commit f4dd731eca
5 changed files with 11 additions and 10 deletions

View File

@ -11,19 +11,21 @@ function msg() {
echo " * $1" echo " * $1"
} }
PART_START=${PART_START:-2048} # 2048 sectors = 1MB BOOT_START=${BOOT_START:-2048} # 2048 sectors = 1MB
BOOT_SRC=$IMG_DIR/boot BOOT_SRC=$IMG_DIR/boot
BOOT=$IMG_DIR/.boot BOOT=$IMG_DIR/.boot
BOOT_IMG=$IMG_DIR/boot.img BOOT_IMG=$IMG_DIR/boot.img
BOOT_SIZE="20" # MB BOOT_SIZE="20" # MB - reserved up to 50 MB
ROOT_START=$((50 * 2048)) # 50 MB
ROOT_SRC=$IMG_DIR/rootfs.tar ROOT_SRC=$IMG_DIR/rootfs.tar
ROOT=$IMG_DIR/.root ROOT=$IMG_DIR/.root
ROOT_IMG=$IMG_DIR/root.img ROOT_IMG=$IMG_DIR/root.img
ROOT_SIZE="180" # MB ROOT_SIZE="180" # MB
DISK_SIZE=$((BOOT_SIZE + ROOT_SIZE + 10)) GUARD_SIZE="10" # MB
DISK_SIZE=$((BOOT_SIZE + ROOT_SIZE + GUARD_SIZE))
COMMON_DIR=$(cd $IMG_DIR/../../../board/common; pwd) COMMON_DIR=$(cd $IMG_DIR/../../../board/common; pwd)
OS_NAME=$(source $COMMON_DIR/overlay/etc/version && echo $os_short_name) OS_NAME=$(source $COMMON_DIR/overlay/etc/version && echo $os_short_name)
@ -118,19 +120,18 @@ fi
loop_dev=$(losetup -f --show $DISK_IMG) loop_dev=$(losetup -f --show $DISK_IMG)
msg "partitioning disk" msg "partitioning disk"
root_part_start=$(($PART_START + $BOOT_SIZE * 2048))
set +e set +e
fdisk -u=sectors $loop_dev <<END fdisk -u=sectors $loop_dev <<END
o o
n n
p p
1 1
${PART_START} ${BOOT_START}
+${BOOT_SIZE}M +${BOOT_SIZE}M
n n
p p
2 2
${root_part_start} ${ROOT_START}
+${ROOT_SIZE}M +${ROOT_SIZE}M
t t

View File

@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/ export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin
export UBOOT_SEEK=16 export UBOOT_SEEK=16
export PART_START=40960 export BOOT_START=40960
source $COMMON_DIR/mkimage.sh source $COMMON_DIR/mkimage.sh

View File

@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/ export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin
export UBOOT_SEEK=16 export UBOOT_SEEK=16
export PART_START=40960 export BOOT_START=40960
source $COMMON_DIR/mkimage.sh source $COMMON_DIR/mkimage.sh

View File

@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/ export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
export UBOOT_BIN=$IMG_DIR/u-boot-sunxi-with-spl.bin export UBOOT_BIN=$IMG_DIR/u-boot-sunxi-with-spl.bin
export UBOOT_SEEK=16 export UBOOT_SEEK=16
export PART_START=40960 export BOOT_START=40960
source $COMMON_DIR/mkimage.sh source $COMMON_DIR/mkimage.sh

View File

@ -7,7 +7,7 @@ export BOARD=$(basename $BOARD_DIR)
export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/ export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
export UBOOT_BIN=$BOARD_DIR/u-boot-with-dtb.bin export UBOOT_BIN=$BOARD_DIR/u-boot-with-dtb.bin
export UBOOT_SEEK=38192 export UBOOT_SEEK=38192
export PART_START=40960 export BOOT_START=40960
BOOT0=$BOARD_DIR/boot0.bin BOOT0=$BOARD_DIR/boot0.bin
source $COMMON_DIR/mkimage.sh source $COMMON_DIR/mkimage.sh