kernel config resync with generic-2.6
[openwrt.git] / target / linux / magicbox-2.6 / patches / 001-magicbox_support.patch
1 diff -urN linux.old/arch/ppc/platforms/4xx/Kconfig linux.dev/arch/ppc/platforms/4xx/Kconfig
2 --- linux.old/arch/ppc/platforms/4xx/Kconfig 2006-11-29 22:57:37.000000000 +0100
3 +++ linux.dev/arch/ppc/platforms/4xx/Kconfig 2006-12-14 08:49:18.000000000 +0100
4 @@ -52,6 +52,12 @@
5 help
6 This option enables support for the IBM PPC405GP evaluation board.
7
8 +config MAGICBOX
9 + bool "MagicBox"
10 + select WANT_EARLY_SERIAL
11 + help
12 + This option enables support for the IBM PPC405EP evaluation board.
13 +
14 config XILINX_ML300
15 bool "Xilinx-ML300"
16 help
17 @@ -173,7 +179,7 @@
18
19 config IBM_OCP
20 bool
21 - depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || TAISHAN || WALNUT
22 + depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || TAISHAN || WALNUT || MAGICBOX
23 default y
24
25 config IBM_EMAC4
26 @@ -183,7 +189,7 @@
27
28 config BIOS_FIXUP
29 bool
30 - depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405
31 + depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405 || MAGICBOX
32 default y
33
34 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
35 @@ -194,7 +200,7 @@
36
37 config 405EP
38 bool
39 - depends on BUBINGA
40 + depends on BUBINGA || MAGICBOX
41 default y
42
43 config 405GP
44 diff -urN linux.old/arch/ppc/platforms/4xx/Makefile linux.dev/arch/ppc/platforms/4xx/Makefile
45 --- linux.old/arch/ppc/platforms/4xx/Makefile 2006-11-29 22:57:37.000000000 +0100
46 +++ linux.dev/arch/ppc/platforms/4xx/Makefile 2006-12-14 08:48:56.000000000 +0100
47 @@ -13,6 +13,7 @@
48 obj-$(CONFIG_REDWOOD_6) += redwood6.o
49 obj-$(CONFIG_SYCAMORE) += sycamore.o
50 obj-$(CONFIG_WALNUT) += walnut.o
51 +obj-$(CONFIG_MAGICBOX) += magicbox.o
52 obj-$(CONFIG_XILINX_ML300) += xilinx_ml300.o
53 obj-$(CONFIG_XILINX_ML403) += xilinx_ml403.o
54
55 diff -urN linux.old/include/asm-ppc/ibm4xx.h linux.dev/include/asm-ppc/ibm4xx.h
56 --- linux.old/include/asm-ppc/ibm4xx.h 2006-11-29 22:57:37.000000000 +0100
57 +++ linux.dev/include/asm-ppc/ibm4xx.h 2006-12-14 08:48:56.000000000 +0100
58 @@ -18,6 +18,10 @@
59
60 #ifdef CONFIG_40x
61
62 +#if defined(CONFIG_MAGICBOX)
63 +#include <platforms/4xx/magicbox.h>
64 +#endif
65 +
66 #if defined(CONFIG_BUBINGA)
67 #include <platforms/4xx/bubinga.h>
68 #endif
This page took 0.052656 seconds and 5 git commands to generate.