diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-24 08:42:11 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-24 08:42:11 +1000 |
commit | 445c9b5507b9d09a2e9b0b4dbb16517708aa40e6 (patch) | |
tree | d985e54552bebdf8ec1a7e4a0ed4cd289d9428ac /arch/powerpc/platforms/82xx | |
parent | 390cbb56a731546edc0f35fbc4c5045676467581 (diff) | |
parent | 98750261fbf6348517ef517f617014de8238475f (diff) | |
download | kernel-crypto-445c9b5507b9d09a2e9b0b4dbb16517708aa40e6.tar.gz kernel-crypto-445c9b5507b9d09a2e9b0b4dbb16517708aa40e6.tar.xz kernel-crypto-445c9b5507b9d09a2e9b0b4dbb16517708aa40e6.zip |
Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.22
Diffstat (limited to 'arch/powerpc/platforms/82xx')
-rw-r--r-- | arch/powerpc/platforms/82xx/Kconfig | 50 |
1 files changed, 15 insertions, 35 deletions
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig index 411071686f2..de7fce9cb6e 100644 --- a/arch/powerpc/platforms/82xx/Kconfig +++ b/arch/powerpc/platforms/82xx/Kconfig @@ -1,56 +1,36 @@ -menu "Platform support" - depends on PPC_82xx - choice - prompt "Machine Type" - default MPC82xx_ADS + prompt "Machine Type" + depends on PPC_82xx + default MPC82xx_ADS config MPC82xx_ADS - bool "Freescale MPC82xx ADS" - select DEFAULT_UIMAGE - select PQ2ADS - select 8272 - select 8260 - select CPM2 - select FSL_SOC - help - This option enables support for the MPC8272 ADS board + bool "Freescale MPC82xx ADS" + select DEFAULT_UIMAGE + select PQ2ADS + select 8272 + select 8260 + select FSL_SOC + help + This option enables support for the MPC8272 ADS board endchoice config PQ2ADS bool - depends on ADS8272 - default y - -config ADS8272 - bool + default n config 8260 - bool "CPM2 Support" if WILLOW + bool depends on 6xx - default y if PQ2FADS + select CPM2 help - The MPC8260 is a typical embedded CPU made by Motorola. Selecting + The MPC8260 is a typical embedded CPU made by Freescale. Selecting this option means that you wish to build a kernel for a machine with an 8260 class CPU. config 8272 bool - depends on 6xx - default y if ADS8272 select 8260 help The MPC8272 CPM has a different internal dpram setup than other CPM2 devices - -config CPM2 - bool - depends on 8260 || MPC8560 || MPC8555 - default y - help - The CPM2 (Communications Processor Module) is a coprocessor on - embedded CPUs made by Motorola. Selecting this option means that - you wish to build a kernel for a machine with a CPM2 coprocessor - on it (826x, 827x, 8560). -endmenu |