ppc64: Add the Kconfig & Makefile changes related to the PowerMac G5 merge

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index c7895d16fd6ab99987b138d59b07226177158951..e4cd05211416b43fc5c7fa9d6ac1fb7bce762b3e 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -60,7 +60,7 @@ config PPC_ISERIES
        bool "iSeries"
 
 config PPC_PSERIES
-       bool "pSeries"
+       bool "pSeries / PowerMac G5"
 
 endchoice
 
@@ -72,6 +72,11 @@ config PPC64
        bool
        default y
 
+config PPC_OF
+       depends on PPC_PSERIES
+       bool
+       default y
+
 # VMX is pSeries only for now until somebody writes the iSeries
 # exception vectors for it
 config ALTIVEC
@@ -79,6 +84,22 @@ config ALTIVEC
        depends on PPC_PSERIES
        default y
 
+config PPC_PMAC
+       depends on PPC_PSERIES
+       bool "Apple PowerMac G5 support"
+
+config PPC_PMAC64
+       bool
+       depends on PPC_PMAC
+       default y
+
+config BOOTX_TEXT
+       bool "Support for early boot text console"
+       depends PPC_OF
+       help
+         Say Y here to see progress messages from the boot firmware in text
+         mode. Requires an Open Firmware compatible video card.
+
 config POWER4_ONLY
        bool "Optimize for POWER4"
        default n

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index b347188c36c8d6fc130cb6070fe05f6ff7fa2fe9..c2e84fd967bce590ef63bb0f042b972b95d701dd 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -10,9 +10,11 @@ obj-y               :=       setup.o entry.o traps.o irq.o idle.o \
                        align.o semaphore.o bitops.o stab.o pacaData.o \
                        udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
                        ptrace32.o signal32.o pmc.o rtc.o init_task.o \
-                       lmb.o cputable.o
+                       lmb.o cputable.o cpu_setup_power4.o idle_power4.o
 
-obj-$(CONFIG_PCI)      += pci.o pci_dn.o pci_dma.o
+obj-$(CONFIG_PPC_OF) +=        of_device.o
+
+obj-$(CONFIG_PCI)      += pci.o pci_dn.o pci_dma.o pci_dma_direct.o
 
 ifdef CONFIG_PPC_ISERIES
 obj-$(CONFIG_PCI)      += iSeries_pci.o iSeries_pci_reset.o \
@@ -27,7 +29,7 @@ obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \
                             proc_pmc.o
 
 obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \
-                            eeh.o nvram.o rtasd.o ras.o \
+                            eeh.o nvram.o pSeries_nvram.o rtasd.o ras.o \
                             open_pic.o xics.o pSeries_htab.o rtas.o \
                             chrp_setup.o i8259.o prom.o vio.o
 
@@ -39,6 +41,14 @@ obj-$(CONFIG_PPC_RTAS)               += rtas-proc.o
 obj-$(CONFIG_SCANLOG)          += scanlog.o
 obj-$(CONFIG_VIOPATH)          += viopath.o
 obj-$(CONFIG_LPARCFG)          += lparcfg.o
-obj-$(CONFIG_HVC_CONSOLE)   += hvconsole.o
+obj-$(CONFIG_HVC_CONSOLE)      += hvconsole.o
+obj-$(CONFIG_BOOTX_TEXT)       += btext.o
+
+obj-$(CONFIG_PPC_PMAC)         += pmac_setup.o pmac_feature.o pmac_pci.o \
+                                  pmac_time.o pmac_nvram.o pmac_low_i2c.o \
+                                  open_pic_u3.o
+ifdef CONFIG_SMP
+obj-$(CONFIG_PPC_PMAC)         += pmac_smp.o smp-tbsync.o
+endif
 
 CFLAGS_ioctl32.o += -Ifs/

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 6501e3a9ede2b2948f5b20d148cd224cb4edbc1b..9e09e7af7ae1e8150fee3fc1c9197b75a4176ae8 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -4,7 +4,7 @@ menu "Macintosh device drivers"
 # we want to change this to something like CONFIG_SYSCTRL_CUDA/PMU
 config ADB_CUDA
        bool "Support for CUDA based PowerMacs"
-       depends on PPC_PMAC && !POWER4
+       depends on PPC_PMAC && !PPC_PMAC64
        help
          This provides support for CUDA based Power Macintosh systems.  This
          includes most OldWorld PowerMacs, the first generation iMacs, the
@@ -69,7 +69,7 @@ config PMAC_BACKLIGHT
 
 config MAC_FLOPPY
        bool "Support for PowerMac floppy"
-       depends on PPC_PMAC && !POWER4
+       depends on PPC_PMAC && !PPC_PMAC64
        help
          If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
          floppy controller, say Y here. Most commonly found in PowerMacs.
@@ -93,7 +93,7 @@ config ADB
 
 config ADB_MACIO
        bool "Include MacIO (CHRP) ADB driver"
-       depends on ADB && !POWER4
+       depends on ADB && PPC_PMAC && !PPC_PMAC64
        help
          Say Y here to include direct support for the ADB controller in the
          Hydra chip used on PowerPC Macintoshes of the CHRP type.  (The Hydra
@@ -129,14 +129,14 @@ config MAC_EMUMOUSEBTN
 
 config THERM_WINDTUNNEL
        tristate "Support for thermal management on Windtunnel G4s"
-       depends on I2C && I2C_KEYWEST && !POWER4
+       depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
        help
          This driver provides some thermostat and fan control for the desktop
          G4 "Windtunnel"
 
 config THERM_ADT7467
        tristate "Support for thermal mgmnt on laptops with ADT 7467 chipset"
-       depends on I2C && I2C_KEYWEST && !POWER4
+       depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
        help
          This driver provides some thermostat and fan control for the
           iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty
@@ -144,7 +144,7 @@ config THERM_ADT7467
 
 config THERM_PM72
        tristate "Support for thermal management on PowerMac G5"
-       depends on I2C && I2C_KEYWEST && POWER4
+       depends on I2C && I2C_KEYWEST && PPC_PMAC64
        help
          This driver provides thermostat and fan control for the desktop
          G5 machines.