Change /boot to ext2
- Change /boot to ext2, this makes dpkg happy about symlinking.
- Add genext2fs to prereqs
- Also, fix the partition sizes on sdcard. They never caught up to the
128M boot partition.
Change-Id: If77a8fb2361d16733b7d2500d4938ef99a32b2a6
diff --git a/boot.mk b/boot.mk
index 9ed86d3..463ef4d 100644
--- a/boot.mk
+++ b/boot.mk
@@ -7,10 +7,9 @@
boot: $(PRODUCT_OUT)/boot.img
$(PRODUCT_OUT)/boot.img: $(PRODUCT_OUT)/u-boot.imx $(PRODUCT_OUT)/fsl-imx8mq-phanbell.dtb $(PRODUCT_OUT)/obj/BOOT_OBJ/boot.scr
- fallocate -l 128M $(PRODUCT_OUT)/boot.img
- mkfs.fat $(PRODUCT_OUT)/boot.img
- mcopy -i $(PRODUCT_OUT)/boot.img $(PRODUCT_OUT)/obj/BOOT_OBJ/boot.scr "::"
- mcopy -i $(PRODUCT_OUT)/boot.img $(PRODUCT_OUT)/fsl-imx8mq-phanbell.dtb "::"
+ mkdir -p $(PRODUCT_OUT)/boot
+ cp $(PRODUCT_OUT)/obj/BOOT_OBJ/boot.scr $(PRODUCT_OUT)/fsl-imx8mq-phanbell.dtb $(PRODUCT_OUT)/boot/
+ genext2fs -d $(PRODUCT_OUT)/boot/ -B 4096 -b 32768 $(PRODUCT_OUT)/boot.img
$(PRODUCT_OUT)/obj/BOOT_OBJ/boot.scr: $(HOST_OUT)/bin/mkimage
mkdir -p $(PRODUCT_OUT)/obj/BOOT_OBJ
diff --git a/boot.txt b/boot.txt
index 5f5eff9..8d6c872 100644
--- a/boot.txt
+++ b/boot.txt
@@ -14,7 +14,7 @@
cmdline="console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 root=${root} rootfstype=ext4 rw rootwait init=/sbin/init"
-fatload mmc ${bootdev}:1 ${loadaddr} ${image}
-fatload mmc ${bootdev}:1 ${fdt_addr} ${fdt_file}
+ext2load mmc ${bootdev}:1 ${loadaddr} ${image}
+ext2load mmc ${bootdev}:1 ${fdt_addr} ${fdt_file}
setenv bootargs ${cmdline}
booti ${loadaddr} - ${fdt_addr}
diff --git a/prereqs.mk b/prereqs.mk
index 90ec503..0de7995 100644
--- a/prereqs.mk
+++ b/prereqs.mk
@@ -12,6 +12,7 @@
debootstrap \
device-tree-compiler \
fakeroot \
+ genext2fs \
kernel-package \
kpartx \
mtools \
diff --git a/sdcard.mk b/sdcard.mk
index 5b5da2b..a90ac7b 100644
--- a/sdcard.mk
+++ b/sdcard.mk
@@ -12,12 +12,12 @@
+make -f $(ROOTDIR)/Makefile rootfs
fallocate -l 4G $(PRODUCT_OUT)/sdcard.img
parted -s $(PRODUCT_OUT)/sdcard.img mklabel msdos
- parted -s $(PRODUCT_OUT)/sdcard.img unit MiB mkpart primary fat32 8 40
- parted -s $(PRODUCT_OUT)/sdcard.img unit MiB mkpart primary 40 4095
+ parted -s $(PRODUCT_OUT)/sdcard.img unit MiB mkpart primary ext2 8 136
+ parted -s $(PRODUCT_OUT)/sdcard.img unit MiB mkpart primary ext4 136 4095
dd if=$(PRODUCT_OUT)/u-boot.imx of=$(PRODUCT_OUT)/sdcard.img conv=notrunc seek=66 bs=512
dd if=$(PRODUCT_OUT)/boot.img of=$(PRODUCT_OUT)/sdcard.img conv=notrunc seek=8 bs=1M
dd if=$(PRODUCT_OUT)/obj/ROOTFS/rootfs.patched.img \
- of=$(PRODUCT_OUT)/sdcard.img conv=notrunc seek=40 bs=1M
+ of=$(PRODUCT_OUT)/sdcard.img conv=notrunc seek=136 bs=1M
$(PRODUCT_OUT)/sdcard.img.xz: $(PRODUCT_OUT)/sdcard.img
xz -k -T0 -0 $(PRODUCT_OUT)/sdcard.img
