Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d40f6eea authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMiquel 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1451deb1

drivers/mtd/chips/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -55,12 +55,14 @@ choice 
	  LITTLE_ENDIAN_BYTE, if the bytes are reversed.



config MTD_CFI_NOSWAP

	depends on !ARCH_IXP4XX || CPU_BIG_ENDIAN

	bool "NO"



config MTD_CFI_BE_BYTE_SWAP

	bool "BIG_ENDIAN_BYTE"



config MTD_CFI_LE_BYTE_SWAP

	depends on !ARCH_IXP4XX

	bool "LITTLE_ENDIAN_BYTE"



endchoice

drivers/mtd/maps/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ config MTD_DC21285 


config MTD_IXP4XX

	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

	  This enables MTD access to flash devices on platforms based

	  on Intel's IXP4xx family of network processors such as the