[PATCH linux dev-4.10] arm: configs: aspeed: Disable CONFIG_MTD_SPI_NOR_USE_4K_SECTORS

[Joel Stanley]

On Mon, May 29, 2017 at 4:43 AM, Adriana Kobylak
<anoo at linux.vnet.ibm.com> wrote:
> Disable the 4KB erase block size from the spi nor to be able to
> use UBIFS, since UBIFS requires the erase size to be at least 15KB.
>
> Signed-off-by: Adriana Kobylak <anoo at linux.vnet.ibm.com>

As we discussed, I will take this into the tree later in the week.
Once we do that everyone will need to do a full system update to
ensure they re-write their JFFS2 ro partitions, as the old ones will
not work.

Cheers,

Joel


> ---
>  arch/arm/configs/aspeed_g4_defconfig | 1 +
>  arch/arm/configs/aspeed_g5_defconfig | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig
> index 806004d..47f284c 100644
> --- a/arch/arm/configs/aspeed_g4_defconfig
> +++ b/arch/arm/configs/aspeed_g4_defconfig
> @@ -68,6 +68,7 @@ CONFIG_MTD=y
>  CONFIG_MTD_BLOCK=y
>  CONFIG_MTD_PARTITIONED_MASTER=y
>  CONFIG_MTD_SPI_NOR=y
> +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
>  CONFIG_SPI_ASPEED_SMC=y
>  CONFIG_MTD_UBI=y
>  CONFIG_MTD_UBI_FASTMAP=y
> diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig
> index 25332b0..17f8825 100644
> --- a/arch/arm/configs/aspeed_g5_defconfig
> +++ b/arch/arm/configs/aspeed_g5_defconfig
> @@ -61,6 +61,7 @@ CONFIG_MTD=y
>  CONFIG_MTD_BLOCK=y
>  CONFIG_MTD_PARTITIONED_MASTER=y
>  CONFIG_MTD_SPI_NOR=y
> +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
>  CONFIG_SPI_ASPEED_SMC=y
>  CONFIG_MTD_UBI=y
>  CONFIG_MTD_UBI_FASTMAP=y
> --
> 1.8.2.2
>