From e6d87036412b952cb083eff2dc716aee97a771f2 Mon Sep 17 00:00:00 2001 From: Roman Yeryomin Date: Fri, 17 May 2013 20:40:24 +0300 Subject: Move to rsdk 3.2.4. Compiles cleanly. Signed-off-by: Roman Yeryomin --- .../realtek/files/drivers/mtd/maps/rtl819x_flash.c | 72 ++++++++++++---------- 1 file changed, 39 insertions(+), 33 deletions(-) (limited to 'target/linux/realtek/files/drivers/mtd/maps') diff --git a/target/linux/realtek/files/drivers/mtd/maps/rtl819x_flash.c b/target/linux/realtek/files/drivers/mtd/maps/rtl819x_flash.c index f5a160974..a57f0cf3f 100644 --- a/target/linux/realtek/files/drivers/mtd/maps/rtl819x_flash.c +++ b/target/linux/realtek/files/drivers/mtd/maps/rtl819x_flash.c @@ -164,39 +164,45 @@ static struct mtd_partition rtl8196_parts1[] = { }, }; -#elif defined( CONFIG_ROOTFS_SQUASH ) -#ifndef CONFIG_RTL_FLASH_DUAL_IMAGE_ENABLE -static struct mtd_partition rtl8196_parts1[] = { - { - name: "boot+cfg", - size: (CONFIG_RTL_LINUX_IMAGE_OFFSET - 0), - offset: 0x00000000, - }, - { - name: "kernel", - size: (CONFIG_RTL_ROOT_IMAGE_OFFSET - CONFIG_RTL_LINUX_IMAGE_OFFSET), - offset: CONFIG_RTL_LINUX_IMAGE_OFFSET, - }, - { - name: "rootfs", -#ifdef CONFIG_RTL_TWO_SPI_FLASH_ENABLE -#ifdef CONFIG_MTD_CONCAT - size: (CONFIG_RTL_SPI_FLASH1_SIZE + CONFIG_RTL_SPI_FLASH2_SIZE - CONFIG_RTL_ROOT_IMAGE_OFFSET), -#else - size: (CONFIG_RTL_SPI_FLASH1_SIZE - CONFIG_RTL_ROOT_IMAGE_OFFSET), -#endif -#else - size: (CONFIG_RTL_FLASH_SIZE - CONFIG_RTL_ROOT_IMAGE_OFFSET), -#endif - offset: CONFIG_RTL_ROOT_IMAGE_OFFSET, - }, - { - name: "firmware", - size: (CONFIG_RTL_FLASH_SIZE - CONFIG_RTL_LINUX_IMAGE_OFFSET), - offset: CONFIG_RTL_LINUX_IMAGE_OFFSET, - }, -}; - +#elif defined( CONFIG_ROOTFS_SQUASH ) +#ifndef CONFIG_RTL_FLASH_DUAL_IMAGE_ENABLE +static struct mtd_partition rtl8196_parts1[] = { + { + name: "boot+cfg+linux", + size: (CONFIG_RTL_ROOT_IMAGE_OFFSET-0), + offset: 0x00000000, + }, + { + name: "root fs", +#ifdef CONFIG_RTL_TWO_SPI_FLASH_ENABLE +#ifdef CONFIG_MTD_CONCAT + size: (CONFIG_RTL_SPI_FLASH1_SIZE+CONFIG_RTL_SPI_FLASH2_SIZE-CONFIG_RTL_ROOT_IMAGE_OFFSET), +#else + size: (CONFIG_RTL_SPI_FLASH1_SIZE-CONFIG_RTL_ROOT_IMAGE_OFFSET), +#endif +#else +#if !defined(CONFIG_MTD_CHAR) + size: (CONFIG_RTL_FLASH_SIZE-CONFIG_RTL_ROOT_IMAGE_OFFSET), +#else + size: (CONFIG_RTL_FLATFS_IMAGE_OFFSET-CONFIG_RTL_ROOT_IMAGE_OFFSET), +#endif +#endif + offset: (CONFIG_RTL_ROOT_IMAGE_OFFSET), + } +#if defined(CONFIG_MTD_CHAR) + , + { + name: "flatfs", + + size: (CONFIG_RTL_FLASH_SIZE-CONFIG_RTL_FLATFS_IMAGE_OFFSET), + offset: (CONFIG_RTL_FLATFS_IMAGE_OFFSET), + } +#endif + + + +}; + #else //!CONFIG_RTL_FLASH_DUAL_IMAGE_ENABLE static struct mtd_partition rtl8196_parts1[] = { { -- cgit v1.2.3