diff options
author | Paul Mackerras <paulus@samba.org> | 2006-01-09 05:32:42 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 05:32:42 -0500 |
commit | be42d5fa3772241b8ecebd443f1fb36247959c54 (patch) | |
tree | f9617571eb8cc5a156562d4b7b873cc82635e8fe /arch | |
parent | e0fa93d6e6f0f36f39b813e561dbb890c58da58f (diff) |
powerpc: unbreak iSeries compilation again
We don't set CONFIG_PPC_MULTIPLATFORM on iSeries (yet). Avoid
compiling in the prom_init stuff on iSeries.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/head_64.S | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 45b362ffa795..6e03b595b6c8 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -49,7 +49,7 @@ obj-y += process.o init_task.o time.o \ | |||
49 | prom.o traps.o setup-common.o udbg.o | 49 | prom.o traps.o setup-common.o udbg.o |
50 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o | 50 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o |
51 | obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o | 51 | obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o |
52 | obj-$(CONFIG_PPC_OF) += prom_init.o | 52 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o |
53 | obj-$(CONFIG_MODULES) += ppc_ksyms.o | 53 | obj-$(CONFIG_MODULES) += ppc_ksyms.o |
54 | obj-$(CONFIG_BOOTX_TEXT) += btext.o | 54 | obj-$(CONFIG_BOOTX_TEXT) += btext.o |
55 | obj-$(CONFIG_6xx) += idle_6xx.o | 55 | obj-$(CONFIG_6xx) += idle_6xx.o |
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, |