From 135f7164094e2f7fd4ecf3245da6af8577893ad3 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 23 Nov 2018 22:08:11 +0200 Subject: [PATCH 1/2] mkimage.sh: fix total disk size --- board/common/mkimage.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/board/common/mkimage.sh b/board/common/mkimage.sh index 79fd04bb15..a681280f63 100755 --- a/board/common/mkimage.sh +++ b/board/common/mkimage.sh @@ -11,21 +11,21 @@ function msg() { echo " * $1" } -BOOT_START=${BOOT_START:-2048} # 2048 sectors = 1MB +BOOT_START=${BOOT_START:-1} # MB BOOT_SRC=$IMG_DIR/boot BOOT=$IMG_DIR/.boot BOOT_IMG=$IMG_DIR/boot.img -BOOT_SIZE="30" # MB - reserved up to 100 MB +BOOT_SIZE="30" # MB - reserved up to 100 MB -ROOT_START=$((100 * 2048)) # 100 MB +ROOT_START="100" # MB ROOT_SRC=$IMG_DIR/rootfs.tar ROOT=$IMG_DIR/.root ROOT_IMG=$IMG_DIR/root.img -ROOT_SIZE="180" # MB +ROOT_SIZE="180" # MB -GUARD_SIZE="10" # MB -DISK_SIZE=$((BOOT_SIZE + ROOT_SIZE + GUARD_SIZE)) +GUARD_SIZE="10" # MB +DISK_SIZE=$((ROOT_START + ROOT_SIZE + GUARD_SIZE)) COMMON_DIR=$(cd $IMG_DIR/../../../board/common; pwd) OS_NAME=$(source $COMMON_DIR/overlay/etc/version && echo $os_short_name) @@ -126,12 +126,12 @@ o n p 1 -${BOOT_START} +$((BOOT_START * 2048)) +${BOOT_SIZE}M n p 2 -${ROOT_START} +$((ROOT_START * 2048)) +${ROOT_SIZE}M t From e73fd3dc4b4858da935ff7d854373f2ac3919985 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 23 Nov 2018 22:10:27 +0200 Subject: [PATCH 2/2] overlay-initramfs: add /boot & /data --- board/common/overlay-initramfs/boot/.empty | 0 board/common/overlay-initramfs/data/.empty | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 board/common/overlay-initramfs/boot/.empty create mode 100644 board/common/overlay-initramfs/data/.empty diff --git a/board/common/overlay-initramfs/boot/.empty b/board/common/overlay-initramfs/boot/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/board/common/overlay-initramfs/data/.empty b/board/common/overlay-initramfs/data/.empty new file mode 100644 index 0000000000..e69de29bb2