diff options
Diffstat (limited to 'arch/powerpc/kernel/head_64.S')
-rw-r--r-- | arch/powerpc/kernel/head_64.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 7f56f9bf76df..1c066d125375 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
@@ -1506,11 +1506,13 @@ _STATIC(__mmu_off) | |||
1506 | * | 1506 | * |
1507 | */ | 1507 | */ |
1508 | _GLOBAL(__start_initialization_multiplatform) | 1508 | _GLOBAL(__start_initialization_multiplatform) |
1509 | #ifdef CONFIG_PPC_MULTIPLATFORM | ||
1509 | /* | 1510 | /* |
1510 | * Are we booted from a PROM Of-type client-interface ? | 1511 | * Are we booted from a PROM Of-type client-interface ? |
1511 | */ | 1512 | */ |
1512 | cmpldi cr0,r5,0 | 1513 | cmpldi cr0,r5,0 |
1513 | bne .__boot_from_prom /* yes -> prom */ | 1514 | bne .__boot_from_prom /* yes -> prom */ |
1515 | #endif | ||
1514 | 1516 | ||
1515 | /* Save parameters */ | 1517 | /* Save parameters */ |
1516 | mr r31,r3 | 1518 | mr r31,r3 |
@@ -1531,6 +1533,7 @@ _GLOBAL(__start_initialization_multiplatform) | |||
1531 | bl .__mmu_off | 1533 | bl .__mmu_off |
1532 | b .__after_prom_start | 1534 | b .__after_prom_start |
1533 | 1535 | ||
1536 | #ifdef CONFIG_PPC_MULTIPLATFORM | ||
1534 | _STATIC(__boot_from_prom) | 1537 | _STATIC(__boot_from_prom) |
1535 | /* Save parameters */ | 1538 | /* Save parameters */ |
1536 | mr r31,r3 | 1539 | mr r31,r3 |
@@ -1563,6 +1566,7 @@ _STATIC(__boot_from_prom) | |||
1563 | bl .prom_init | 1566 | bl .prom_init |
1564 | /* We never return */ | 1567 | /* We never return */ |
1565 | trap | 1568 | trap |
1569 | #endif | ||
1566 | 1570 | ||
1567 | /* | 1571 | /* |
1568 | * At this point, r3 contains the physical address we are running at, | 1572 | * At this point, r3 contains the physical address we are running at, |