mtd: fixup CFI on ixp4xx

commit 603362b4a58393061dcfed1c7f0d0fd4aba61126 upstream.

drivers/mtd/maps/ixp4xx.c requires MTD_CFI_BE_BYTE_SWAP to be set
in order to compile.

drivers/mtd/maps/ixp4xx.c:57:4: error: #error CONFIG_MTD_CFI_BE_BYTE_SWAP required

This patch avoids the #error output by enforcing the policy in
Kconfig. Not sure if this is the right approach, but it helps doing
randconfig builds.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210927141045.1597593-1-arnd@kernel.org
Cc: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann
2021-09-27 16:10:37 +02:00
committed by Greg Kroah-Hartman
parent f50803b519
commit bed97c9036
2 changed files with 3 additions and 1 deletions

View File

@@ -55,12 +55,14 @@ choice
LITTLE_ENDIAN_BYTE, if the bytes are reversed. LITTLE_ENDIAN_BYTE, if the bytes are reversed.
config MTD_CFI_NOSWAP config MTD_CFI_NOSWAP
depends on !ARCH_IXP4XX || CPU_BIG_ENDIAN
bool "NO" bool "NO"
config MTD_CFI_BE_BYTE_SWAP config MTD_CFI_BE_BYTE_SWAP
bool "BIG_ENDIAN_BYTE" bool "BIG_ENDIAN_BYTE"
config MTD_CFI_LE_BYTE_SWAP config MTD_CFI_LE_BYTE_SWAP
depends on !ARCH_IXP4XX
bool "LITTLE_ENDIAN_BYTE" bool "LITTLE_ENDIAN_BYTE"
endchoice endchoice

View File

@@ -325,7 +325,7 @@ config MTD_DC21285
config MTD_IXP4XX config MTD_IXP4XX
tristate "CFI Flash device mapped on Intel IXP4xx based systems" tristate "CFI Flash device mapped on Intel IXP4xx based systems"
depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX && MTD_CFI_ADV_OPTIONS
help help
This enables MTD access to flash devices on platforms based This enables MTD access to flash devices on platforms based
on Intel's IXP4xx family of network processors such as the on Intel's IXP4xx family of network processors such as the