AT91 Kconfig rework

Hi Russell,

This is AT91 Kconfig rework for next merge window. After discussing it on the mailing-list and Ack by Andrew Victor, I send you this patchset. You can pull it from:

git://github.com/at91linux/linux-2.6-at91.git for-rmk

And you will receive:

Jean-Christophe PLAGNIOL-VILLARD (2):
at91: remove not needed depends on
at91: Kconfig simplification

Nicolas Ferre (2):
at91: at91sam9g20ek modify dual slot evaluation kit atmel_lcdfb Kconfig: remove long dependency line

 arch/arm/mach-at91/Kconfig                     |  107 ++++++++++++++----------
 arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c |   23 ++++--
 arch/avr32/Kconfig                             |    1 +
 drivers/video/Kconfig                          |    5 +-
 4 files changed, 83 insertions(+), 53 deletions(-)

The patch
"at91: at91sam9g20ek modify dual slot evaluation kit" is also already sent directly to Linus for .32-final (not sure it can reach). Anyway, I guess that git can handle that...

Thanks. Best regards,

Nicolas Ferre

FYI:

$ git pull git://github.com/at91linux/linux-2.6-at91.git for-rmk
remote: Counting objects: 41, done.
remote: Compressing objects: 100% (28/28), done.
remote: Total 30 (delta 26), reused 2 (delta 2)
Unpacking objects: 100% (30/30), done.

From: [email protected] ()
Date: Fri, 06 Nov 2009 18:01:15 -0000
Subject: No subject
Message-ID: <[email protected]>

Auto-merging arch/arm/mach-at91/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig Recorded preimage for 'arch/arm/mach-at91/Kconfig' Automatic merge failed; fix conflicts and then commit the result.

$ git diff-files -u
diff --cc arch/arm/mach-at91/Kconfig
index 2fd8843,3df124e..0000000
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@@ -320,7 -337,7 +337,11 @@@ config MACH_AT91SAM9G20E

config MACH_AT91SAM9G20EK_2MMC
bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"
++<<<<<<< HEAD:arch/arm/mach-at91/Kconfig
+ depends on ARCH_AT91SAM9G20
++=======
+ select HAVE_NAND_ATMEL_BUSWIDTH_16
++>>>>>>> 0912e5359f89f303f53fd4874dadab77a4949a8a:arch/arm/mach-at91/Kconfig
help
Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and
@@@ -394,7 -411,7 +415,11 @@@ config MTD_AT91_DATAFLASH_CAR

config MTD_NAND_ATMEL_BUSWIDTH_16
bool "Enable 16-bit data bus interface to NAND flash"
++<<<<<<< HEAD:arch/arm/mach-at91/Kconfig
+ depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK)
++=======
+ depends on HAVE_NAND_ATMEL_BUSWIDTH_16
++>>>>>>> 0912e5359f89f303f53fd4874dadab77a4949a8a:arch/arm/mach-at91/Kconfig
help
On AT91SAM926x boards both types of NAND flash can be present (8 and 16 bit data bus width).

What's the resolution? I think the first is just to include both, but the second looks like the first depends needs deleting to leave only the second?

Russell King - ARM Linux :

Well, in fact the resolution for both is to keep the second line only.

Thanks.

Best regards,

Nicolas Ferre