瀏覽代碼

rb532: really fix squashfs images

The previous attempt (r40717) to fix squashfx made the system bootable but
overlayfs remained broken.
This enables block2mtd again using the right partition number and naming
and adds MTD_ROOTFS_SPLIT option.
However onboard rootfs partition name had to be renamed to place overlay on
CF instead of onboard NAND.

Signed-off-by: Roman Yeryomin <[email protected]>

SVN-Revision: 41541
Felix Fietkau 11 年之前
父節點
當前提交
d4158338c9

+ 1 - 1
target/linux/rb532/config-3.10

@@ -103,7 +103,7 @@ CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
-# CONFIG_MTD_ROOTFS_SPLIT is not set
+CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_SPLIT is not set
 CONFIG_NEED_DMA_MAP_STATE=y

+ 1 - 1
target/linux/rb532/image/Makefile

@@ -56,7 +56,7 @@ root=/dev/sda2 rootfstype=ext4
 endef
 
 define Image/cmdline/squashfs
-root=/dev/sda2 rootfstype=squashfs
+block2mtd.block2mtd=/dev/sda2,65536,rootfs root=/dev/mtdblock2 rootfstype=squashfs
 endef
 
 define Image/cmdline/yaffs2

+ 11 - 0
target/linux/rb532/patches-3.10/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch

@@ -0,0 +1,11 @@
+--- a/arch/mips/rb532/devices.c	2014-07-07 01:05:10.000000000 +0300
++++ b/arch/mips/rb532/devices.c	2014-07-07 01:05:27.268505016 +0300
+@@ -202,7 +202,7 @@ static struct mtd_partition rb532_partit
+ 		.offset = 0,
+ 		.size = 4 * 1024 * 1024,
+ 	}, {
+-		.name = "rootfs",
++		.name = "rootfs_onboard",
+ 		.offset = MTDPART_OFS_NXTBLK,
+ 		.size = MTDPART_SIZ_FULL,
+ 	}