Commit 6f806cee authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras

[PATCH] powerpc: Fix machine detection in prom_init.c

In e8222502 the detection of machine types
in prom_init broke for some machines. We should be checking /device_type
instead of /model. This should make Power3 and Power4 boot again. Haven't
been able to test this.  We also need to relocate before comparing.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 132058f7
...@@ -1528,12 +1528,11 @@ static int __init prom_find_machine_type(void) ...@@ -1528,12 +1528,11 @@ static int __init prom_find_machine_type(void)
* non-IBM designs ! * non-IBM designs !
* - it has /rtas * - it has /rtas
*/ */
len = prom_getprop(_prom->root, "model", len = prom_getprop(_prom->root, "device_type",
compat, sizeof(compat)-1); compat, sizeof(compat)-1);
if (len <= 0) if (len <= 0)
return PLATFORM_GENERIC; return PLATFORM_GENERIC;
compat[len] = 0; if (strncmp(compat, RELOC("chrp"), 4))
if (strcmp(compat, "chrp"))
return PLATFORM_GENERIC; return PLATFORM_GENERIC;
/* Default to pSeries. We need to know if we are running LPAR */ /* Default to pSeries. We need to know if we are running LPAR */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment