From fbc358204df213740a042468493b68b6868d7017 Mon Sep 17 00:00:00 2001 From: Gokul Sriram Palanisamy Date: Thu, 10 Aug 2017 17:13:01 +0530 Subject: [PATCH] ARM: eMMC: Updated number of alternate partitions Updated number of alternate partitions and alternate partition data structure to match smem entry. Change-Id: I62484e369ed3d35037237fde2d71f9af045e438a Signed-off-by: Gokul Sriram Palanisamy --- arch/arm/include/asm/arch-qca-common/smem.h | 2 -- include/configs/ipq40xx.h | 1 + include/configs/ipq806x.h | 1 + include/configs/ipq807x.h | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-qca-common/smem.h b/arch/arm/include/asm/arch-qca-common/smem.h index 34e782cbfe..661e0c8179 100644 --- a/arch/arm/include/asm/arch-qca-common/smem.h +++ b/arch/arm/include/asm/arch-qca-common/smem.h @@ -121,10 +121,8 @@ struct per_part_info { char name[ALT_PART_NAME_LENGTH]; uint32_t primaryboot; - uint32_t upgraded; }; -#define NUM_ALT_PARTITION 8 typedef struct { #define _SMEM_DUAL_BOOTINFO_MAGIC_START 0xA3A2A1A0 diff --git a/include/configs/ipq40xx.h b/include/configs/ipq40xx.h index 4ecec699dc..de615ec089 100644 --- a/include/configs/ipq40xx.h +++ b/include/configs/ipq40xx.h @@ -213,6 +213,7 @@ typedef struct { #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS +#define NUM_ALT_PARTITION 8 #define CONFIG_CMD_UBI #define CONFIG_RBTREE diff --git a/include/configs/ipq806x.h b/include/configs/ipq806x.h index 93b68b6563..3b60a2877d 100644 --- a/include/configs/ipq806x.h +++ b/include/configs/ipq806x.h @@ -281,6 +281,7 @@ typedef struct { #define QCA_SPI_NOR_DEVICE "nand1" #define CONFIG_FDT_FIXUP_PARTITIONS +#define NUM_ALT_PARTITION 8 #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/ipq807x.h b/include/configs/ipq807x.h index 81acbf5780..041f283696 100644 --- a/include/configs/ipq807x.h +++ b/include/configs/ipq807x.h @@ -210,6 +210,7 @@ extern loff_t board_env_size; #define CONFIG_MTD_DEVICE #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS +#define NUM_ALT_PARTITION 16 #define CONFIG_CMD_UBI #define CONFIG_RBTREE