diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-07-03 17:22:05 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-07-03 17:22:05 +1000 |
| commit | 980a65136569b841cebaad524a34482b0b1627a9 (patch) | |
| tree | 7207f26dfc1085b30a8bee9651da431490d59dd3 /arch/powerpc/platforms/maple | |
| parent | [POWERPC] Fix various offb and BootX-related issues (diff) | |
| download | linux-dev-980a65136569b841cebaad524a34482b0b1627a9.tar.xz linux-dev-980a65136569b841cebaad524a34482b0b1627a9.zip | |
[POWERPC] Fix booting on Momentum "Apache" board (a Maple derivative)
This extends the maple device-tree workarounds to work on the
Apache board as well, and extends the maple platform probing code
to recognize the Apache board.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/maple')
| -rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 5cf90c28b141..611ca8e979e5 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -11,7 +11,7 @@ * */ -#define DEBUG +#undef DEBUG #include <linux/init.h> #include <linux/errno.h> @@ -256,7 +256,9 @@ static void __init maple_progress(char *s, unsigned short hex) static int __init maple_probe(void) { unsigned long root = of_get_flat_dt_root(); - if (!of_flat_dt_is_compatible(root, "Momentum,Maple")) + + if (!of_flat_dt_is_compatible(root, "Momentum,Maple") && + !of_flat_dt_is_compatible(root, "Momentum,Apache")) return 0; /* * On U3, the DART (iommu) must be allocated now since it |