Author: nbd Date: 2015-03-27 22:22:17 +0100 (Fri, 27 Mar 2015) New Revision: 45072
Modified: trunk/target/linux/rb532/image/Makefile trunk/target/linux/rb532/image/gen_image.sh Log: rb532: align partitions to 128KB because block2mtd wants "erasesize must be a divisor of device size" since 3.15 Signed-off-by: Roman Yeryomin <[email protected]> Modified: trunk/target/linux/rb532/image/Makefile =================================================================== --- trunk/target/linux/rb532/image/Makefile 2015-03-27 21:22:10 UTC (rev 45071) +++ trunk/target/linux/rb532/image/Makefile 2015-03-27 21:22:17 UTC (rev 45072) @@ -63,10 +63,18 @@ root=/dev/mtdblock1 rootfstype=yaffs2 endef +define Image/Build/squashfs + $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) +endef + define Image/Build + $(call Image/Build/$(1),$(1)) $(CP) $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel $(STAGING_DIR_HOST)/bin/patch-cmdline $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel '$(strip $(call Image/cmdline/$(1))) ' - ./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).bin 4 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) + ./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).bin \ + 4 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ + 128 endef $(eval $(call BuildImage)) Modified: trunk/target/linux/rb532/image/gen_image.sh =================================================================== --- trunk/target/linux/rb532/image/gen_image.sh 2015-03-27 21:22:10 UTC (rev 45071) +++ trunk/target/linux/rb532/image/gen_image.sh 2015-03-27 21:22:17 UTC (rev 45072) @@ -4,11 +4,12 @@ KERNELIMAGE="$3" ROOTFSSIZE="$4" ROOTFSIMAGE="$5" +ALIGN="$6" rm -f "$OUTPUT" # create partition table -set `ptgen -o "$OUTPUT" -h 16 -s 32 -t 0x27 -p ${KERNELSIZE}m -t 0x83 -p ${ROOTFSSIZE}m` +set `ptgen -o "$OUTPUT" -h 16 -s 32 -l ${ALIGN} -t 0x27 -p ${KERNELSIZE}m -t 0x83 -p ${ROOTFSSIZE}m` KERNELOFFSET="$(($1 / 512))" ROOTFSOFFSET="$(($3 / 512))" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
