git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/master'
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
86xx
/
Kconfig
diff --git
a/arch/powerpc/platforms/86xx/Kconfig
b/arch/powerpc/platforms/86xx/Kconfig
index
053f49a
..
9355a52
100644
(file)
--- a/
arch/powerpc/platforms/86xx/Kconfig
+++ b/
arch/powerpc/platforms/86xx/Kconfig
@@
-1,7
+1,13
@@
-choice
- prompt "86xx Board Type"
- depends on PPC_86xx
- default MPC8641_HPCN
+config PPC_86xx
+menuconfig PPC_86xx
+ bool "86xx-based boards"
+ depends on 6xx && PPC_MULTIPLATFORM
+ select FSL_SOC
+ select ALTIVEC
+ help
+ The Freescale E600 SoCs have 74xx cores.
+
+if PPC_86xx
config MPC8641_HPCN
bool "Freescale MPC8641 HPCN"
config MPC8641_HPCN
bool "Freescale MPC8641 HPCN"
@@
-21,13
+27,15
@@
config SBC8641D
config MPC8610_HPCD
bool "Freescale MPC8610 HPCD"
select DEFAULT_UIMAGE
config MPC8610_HPCD
bool "Freescale MPC8610 HPCD"
select DEFAULT_UIMAGE
+ select FSL_ULI1575
help
This option enables support for the MPC8610 HPCD board.
help
This option enables support for the MPC8610 HPCD board.
-end
choice
+end
if
config MPC8641
bool
config MPC8641
bool
+ select PPC_PCI_CHOICE
select FSL_PCI if PCI
select PPC_UDBG_16550
select MPIC
select FSL_PCI if PCI
select PPC_UDBG_16550
select MPIC
@@
-35,6
+43,7
@@
config MPC8641
config MPC8610
bool
config MPC8610
bool
+ select PPC_PCI_CHOICE
select FSL_PCI if PCI
select PPC_UDBG_16550
select MPIC
select FSL_PCI if PCI
select PPC_UDBG_16550
select MPIC