2008-08-01 22:34:37 +03:00
|
|
|
--- a/arch/ppc/platforms/4xx/Kconfig
|
|
|
|
+++ b/arch/ppc/platforms/4xx/Kconfig
|
2008-11-06 22:55:33 +02:00
|
|
|
@@ -53,6 +53,12 @@ config WALNUT
|
2007-06-28 23:42:21 +03:00
|
|
|
help
|
|
|
|
This option enables support for the IBM PPC405GP evaluation board.
|
|
|
|
|
|
|
|
+config MAGICBOX
|
|
|
|
+ bool "MagicBox"
|
|
|
|
+ select WANT_EARLY_SERIAL
|
|
|
|
+ help
|
|
|
|
+ This option enables support for the IBM PPC405EP evaluation board.
|
|
|
|
+
|
|
|
|
config XILINX_ML300
|
|
|
|
bool "Xilinx-ML300"
|
|
|
|
select XILINX_VIRTEX_II_PRO
|
2008-11-06 22:55:33 +02:00
|
|
|
@@ -184,7 +190,7 @@ config BOOKE
|
2007-06-28 23:42:21 +03:00
|
|
|
|
|
|
|
config IBM_OCP
|
|
|
|
bool
|
|
|
|
- depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || TAISHAN || WALNUT
|
|
|
|
+ depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || TAISHAN || WALNUT || MAGICBOX
|
|
|
|
default y
|
|
|
|
|
|
|
|
config IBM_EMAC4
|
2008-11-06 22:55:33 +02:00
|
|
|
@@ -194,7 +200,7 @@ config IBM_EMAC4
|
2007-06-28 23:42:21 +03:00
|
|
|
|
|
|
|
config BIOS_FIXUP
|
|
|
|
bool
|
|
|
|
- depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405
|
|
|
|
+ depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405 || MAGICBOX
|
|
|
|
default y
|
|
|
|
|
|
|
|
# OAK doesn't exist but wanted to keep this around for any future 403GCX boards
|
2008-11-06 22:55:33 +02:00
|
|
|
@@ -205,7 +211,7 @@ config 403GCX
|
2007-06-28 23:42:21 +03:00
|
|
|
|
|
|
|
config 405EP
|
|
|
|
bool
|
|
|
|
- depends on BUBINGA
|
|
|
|
+ depends on BUBINGA || MAGICBOX
|
|
|
|
default y
|
|
|
|
|
|
|
|
config 405GP
|
2008-08-01 22:34:37 +03:00
|
|
|
--- a/arch/ppc/platforms/4xx/Makefile
|
|
|
|
+++ b/arch/ppc/platforms/4xx/Makefile
|
2008-11-06 22:55:33 +02:00
|
|
|
@@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6) += redwood6.o
|
2007-06-28 23:42:21 +03:00
|
|
|
obj-$(CONFIG_SYCAMORE) += sycamore.o
|
|
|
|
obj-$(CONFIG_TAISHAN) += taishan.o
|
|
|
|
obj-$(CONFIG_WALNUT) += walnut.o
|
|
|
|
+obj-$(CONFIG_MAGICBOX) += magicbox.o
|
|
|
|
obj-$(CONFIG_XILINX_ML300) += xilinx_ml300.o
|
|
|
|
obj-$(CONFIG_XILINX_ML403) += xilinx_ml403.o
|
|
|
|
|
2008-08-01 22:34:37 +03:00
|
|
|
--- a/include/asm-ppc/ibm4xx.h
|
|
|
|
+++ b/include/asm-ppc/ibm4xx.h
|
2007-06-28 23:42:21 +03:00
|
|
|
@@ -19,6 +19,10 @@
|
|
|
|
|
|
|
|
#ifdef CONFIG_40x
|
|
|
|
|
|
|
|
+#if defined(CONFIG_MAGICBOX)
|
|
|
|
+#include <platforms/4xx/magicbox.h>
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
#if defined(CONFIG_BUBINGA)
|
|
|
|
#include <platforms/4xx/bubinga.h>
|
|
|
|
#endif
|