Skip to content

L
linux
Commit a986b2f2 authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds
Browse files
Options

[PATCH] get rid of CONFIG_ALL_PPC 

This patch gets rid of CONFIG_ALL_PPC, which was a very confusing
option, since it didn't actually mean "ALL" at all, it was more a
"common set" thing.

The primary replacement for CONFIG_ALL_PPC is CONFIG_PPC_MULTIPLATFORM.
I have also defined CONFIG_PPC_PMAC, CONFIG_PPC_PREP and CONFIG_PPC_CHRP
for selecting code which is only needed for one of the three platforms
that CONFIG_ALL_PPC represented.  This is something that we (the PPC
community) have been talking about doing for some time.  There is also a
CONFIG_PPC_OF which is for PPC machines with Open Firmware, which is
currently powermacs and CHRP machines.

At the moment, CONFIG_PPC_{PMAC,PREP,CHRP,OF} get unconditionally
defined if CONFIG_PPC_MULTIPLATFORM is selected, but in future this
split will let us have more control over what gets included, so that
for example we don't necessarily have to include powermac bits in a
kernel for a PReP machine.

I have gone through the uses of CONFIG_ALL_PPC one by one and decided
which of the new symbols best represents the set of machines that need
the code in question.  In fact most of the uses of CONFIG_ALL_PPC in
the drivers have been replaced by CONFIG_PPC_PMAC.  The other symbols
are mostly confined to the PPC architecture code.
parent 5e115975
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 203 deletions
arch/ppc/Kconfig
View file @ a986b2f2
......@@ -97,32 +97,6 @@ config PPC64BRIDGE
depends on POWER3
default y
config ALL_PPC
bool
depends on ALL_PPC_CH || POWER3
default y
---help---
Linux currently supports several different kinds of PowerPC-based
machines: Apple Power Macintoshes and clones (such as the Motorola
Starmax series), PReP (PowerPC Reference Platform) machines (such
as the Motorola PowerStacks, Motorola cPCI/VME embedded systems,
and some IBM RS/6000 systems), CHRP (Common Hardware Reference
Platform) machines (including all of the recent IBM RS/6000 and
pSeries machines), and several embedded PowerPC systems containing
4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors. Currently, the
default option is to build a kernel which works on the first three.
Select CHRP/PowerMac/PReP if configuring for an IBM RS/6000 or
pSeries machine, a Power Macintosh (including iMacs, iBooks and
Powerbooks), or a PReP machine.
Select Gemini if configuring for a Synergy Microsystems' Gemini
series Single Board Computer. More information is available at:
<http://www.synergymicro.com/PressRel/97_10_15.html>.
Select APUS if configuring for a PowerUP Amiga. More information is
available at: <http://linux-apus.sourceforge.net/>.
config PPC_STD_MMU
bool
depends on 6xx || POWER3
......@@ -424,12 +398,34 @@ config EMBEDDEDBOOT
bool
depends on 8xx || 8260
default y
choice
prompt "Machine Type"
depends on 6xx && !8260
default ALL_PPC_CH
depends on (6xx || POWER3) && !8260
default PPC_MULTIPLATFORM
---help---
Linux currently supports several different kinds of PowerPC-based
machines: Apple Power Macintoshes and clones (such as the Motorola
Starmax series), PReP (PowerPC Reference Platform) machines (such
as the Motorola PowerStacks, Motorola cPCI/VME embedded systems,
and some IBM RS/6000 systems), CHRP (Common Hardware Reference
Platform) machines (including all of the recent IBM RS/6000 and
pSeries machines), and several embedded PowerPC systems containing
4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors. Currently, the
default option is to build a kernel which works on the first three.
config ALL_PPC_CH
Select CHRP/PowerMac/PReP if configuring for an IBM RS/6000 or
pSeries machine, a Power Macintosh (including iMacs, iBooks and
Powerbooks), or a PReP machine.
Select Gemini if configuring for a Synergy Microsystems' Gemini
series Single Board Computer. More information is available at:
<http://www.synergymicro.com/PressRel/97_10_15.html>.
Select APUS if configuring for a PowerUP Amiga. More information is
available at: <http://linux-apus.sourceforge.net/>.
config PPC_MULTIPLATFORM
bool "CHRP/PowerMac/PReP"
config APUS
......@@ -499,6 +495,26 @@ config ZX4500
endchoice
config PPC_CHRP
bool
depends on PPC_MULTIPLATFORM
default y
config PPC_PMAC
bool
depends on PPC_MULTIPLATFORM
default y
config PPC_PREP
bool
depends on PPC_MULTIPLATFORM
default y
config PPC_OF
bool
depends on PPC_PMAC || PPC_CHRP
default y
config SANDPOINT_X3
bool "Sandpoint X3"
depends on SANDPOINT
......@@ -721,7 +737,7 @@ config HIGHMEM
config ISA
bool "Support for ISA-bus hardware"
depends on ALL_PPC
depends on PREP || CHRP
help
Find out whether you have ISA slots on your motherboard. ISA is the
name of a bus system, i.e. the way the CPU talks to the other stuff
......@@ -851,7 +867,7 @@ source "drivers/parport/Kconfig"
config PPC601_SYNC_FIX
bool "Workarounds for PPC601 bugs"
depends on ALL_PPC && !POWER3
depends on 6xx && !POWER3
help
Some versions of the PPC601 (the first PowerPC chip) have bugs which
mean that extra synchronization instructions are required near
......@@ -865,7 +881,7 @@ config PPC601_SYNC_FIX
config PROC_DEVICETREE
bool "Support for Open Firmware device tree in /proc"
depends on ALL_PPC && PROC_FS
depends on PPC_OF && PROC_FS
help
This option adds a device-tree directory under /proc which contains
an image of the device tree that the kernel copies from Open
......@@ -873,7 +889,7 @@ config PROC_DEVICETREE
config PPC_RTAS
bool "Support for RTAS (RunTime Abstraction Services) in /proc"
depends on ALL_PPC && PROC_FS
depends on PPC_OF && PROC_FS
---help---
When you use this option, you will be able to use RTAS from
userspace.
......@@ -906,7 +922,7 @@ config PPC_RTAS
config PREP_RESIDUAL
bool "Support for PReP Residual Data"
depends on ALL_PPC
depends on PPC_PREP
help
Some PReP systems have residual data passed to the kernel by the
firmware. This allows detection of memory size, devices present and
......@@ -927,7 +943,7 @@ config PROC_PREPRESIDUAL
config PPCBUG_NVRAM
bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
default y if ALL_PPC
default y if PPC_PREP
config CMDLINE_BOOL
bool "Default bootloader kernel arguments"
......@@ -1156,7 +1172,7 @@ config TASK_SIZE
config BOOT_LOAD_BOOL
bool "Set the boot link/load address"
depends on ADVANCED_OPTIONS && !ALL_PPC
depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM
help
This option allows you to set the initial load address of the zImage
or zImage.initrd file. This can be useful if you are on a board
......@@ -1292,7 +1308,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 ALL_PPC
depends on PPC_PMAC
help
This provides support for CUDA based Power Macintosh systems. This
includes most OldWorld PowerMacs, the first generation iMacs, the
......@@ -1304,7 +1320,7 @@ config ADB_CUDA
config ADB_PMU
bool "Support for PMU based PowerMacs"
depends on ALL_PPC
depends on PPC_PMAC
help
On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the
PMU is an embedded microprocessor whose primary function is to
......@@ -1336,7 +1352,7 @@ config PMAC_PBOOK
config PM
bool
depends on ALL_PPC && ADB_PMU && PMAC_PBOOK
depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK
default y
config PMAC_APM_EMU
......@@ -1357,14 +1373,14 @@ config PMAC_BACKLIGHT
config MAC_FLOPPY
bool "Support for PowerMac floppy"
depends on ALL_PPC
depends on PPC_PMAC
help
If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
floppy controller, say Y here. Most commonly found in PowerMacs.
config MAC_SERIAL
tristate "Support for PowerMac serial ports"
depends on ALL_PPC
depends on PPC_PMAC
help
If you have Macintosh style serial ports (8 pin mini-DIN), say Y
here. If you also have regular serial ports and enable the driver
......@@ -1372,11 +1388,11 @@ config MAC_SERIAL
config SERIAL_CONSOLE
bool "Support for console on serial port"
depends on ALL_PPC && MAC_SERIAL=y
depends on PPC_PMAC && MAC_SERIAL=y
config ADB
bool "Apple Desktop Bus (ADB) support"
depends on ALL_PPC
depends on PPC_PMAC
help
Apple Desktop Bus (ADB) support is for support of devices which
are connected to an ADB port. ADB devices tend to have 4 pins.
......@@ -1610,7 +1626,7 @@ config COMPILE_OPTIONS
config BOOTX_TEXT
bool "Support for early boot text console (BootX or OpenFirmware only)"
depends on ALL_PPC
depends PPC_OF
help
Say Y here to see progress messages from the boot firmware in text
mode. Requires either BootX or Open Firmware.
......
arch/ppc/boot/Makefile
View file @ a986b2f2
......@@ -16,9 +16,10 @@ HOSTCFLAGS += -Iarch/$(ARCH)/boot/include
BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd
bootdir-y := simple
bootdir-$(CONFIG_ALL_PPC) := openfirmware prep
bootdir-$(CONFIG_PPC_OF) := openfirmware
bootdir-$(CONFIG_PPC_PREP) += prep
subdir-y := lib/ common/ images/
subdir-$(CONFIG_ALL_PPC) += of1275/
subdir-$(CONFIG_PPC_OF) += of1275/
# for cleaning
subdir- += simple/ openfirmware/ prep/
......
arch/ppc/boot/common/Makefile
View file @ a986b2f2
......@@ -11,7 +11,7 @@
L_TARGET := lib.a
obj-y := string.o util.o misc-common.o
obj-$(CONFIG_ALL_PPC) += mpc10x_memory.o
obj-$(CONFIG_PPC_PREP) += mpc10x_memory.o
obj-$(CONFIG_LOPEC) += mpc10x_memory.o
obj-$(CONFIG_PAL4) += cpc700_memory.o
obj-$(CONFIG_SERIAL_8250_CONSOLE) += ns16550.o
arch/ppc/boot/common/misc-common.c
View file @ a986b2f2
......@@ -20,10 +20,10 @@
#include "zlib.h"
#include "nonstdio.h"
/* If we're on a ALL_PPC, assume we have a keyboard controller
* Also note, if we're not ALL_PPC, we assume you are a serial
/* If we're on a PReP, assume we have a keyboard controller
* Also note, if we're not PReP, we assume you are a serial
* console - Tom */
#if defined(CONFIG_ALL_PPC) && defined(CONFIG_VGA_CONSOLE)
#if defined(CONFIG_PPC_PREP) && defined(CONFIG_VGA_CONSOLE)
extern void cursor(int x, int y);
extern void scroll(void);
extern char *vidmem;
......
arch/ppc/boot/common/mpc10x_memory.c
View file @ a986b2f2
......@@ -50,7 +50,7 @@ MPC10X_PCI_OP(read, dword, u32 *, in_le32, 0)
/*
* Read the memory controller registers to determine the amount of memory in
* the system. This assumes that the firmware has correctly set up the memory
* controller registers. On CONFIG_ALL_PPC, we know we are being called
* controller registers. On CONFIG_PPC_PREP, we know we are being called
* under a PReP memory map. On all other machines, we assume we are under
* a CHRP memory map.
*/
......@@ -62,7 +62,7 @@ get_mem_size(void)
int i;
unsigned char bank_enables;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PREP
config_addr = (unsigned int *)MPC10X_MAPA_CNFG_ADDR;
config_data = (unsigned int *)MPC10X_MAPA_CNFG_DATA;
#else
......
arch/ppc/kernel/entry.S
View file @ a986b2f2
......@@ -820,7 +820,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
* here so it's easy to add arch-specific sections later.
* -- Cort
*/
#if defined(CONFIG_ALL_PPC)
#ifdef CONFIG_PPC_OF
/*
* On CHRP, the Run-Time Abstraction Services (RTAS) have to be
* called with the MMU off.
......@@ -865,4 +865,4 @@ machine_check_in_rtas:
twi 31,0,0
/* XXX load up BATs and panic */
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_OF */
arch/ppc/kernel/head.S
View file @ a986b2f2
......@@ -363,21 +363,21 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
mtspr SPRG0,r10
mtspr SPRG1,r11
mfcr r10
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_CHRP
mfspr r11,SPRG2
cmpwi 0,r11,0
bne 7f
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_CHRP */
EXCEPTION_PROLOG_1
7: EXCEPTION_PROLOG_2
addi r3,r1,STACK_FRAME_OVERHEAD
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_CHRP
mfspr r4,SPRG2
cmpwi cr1,r4,0
bne cr1,1f
#endif
EXC_XFER_STD(0x200, MachineCheckException)
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_CHRP
1: b machine_check_in_rtas
#endif
......
arch/ppc/kernel/pci.c
View file @ a986b2f2
......@@ -45,8 +45,10 @@ static void fixup_broken_pcnet32(struct pci_dev* dev);
static int reparent_resources(struct resource *parent, struct resource *res);
static void fixup_rev1_53c810(struct pci_dev* dev);
static void fixup_cpc710_pci64(struct pci_dev* dev);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
static void pcibios_fixup_cardbus(struct pci_dev* dev);
#endif
#ifdef CONFIG_PPC_OF
static u8* pci_to_OF_bus_map;
#endif
......@@ -65,10 +67,10 @@ struct pci_fixup pcibios_fixups[] = {
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810 },
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64},
{ PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources },
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/* We should add per-machine fixup support in xxx_setup.c or xxx_pci.c */
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_TI, PCI_ANY_ID, pcibios_fixup_cardbus },
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
{ 0 }
};
......@@ -153,7 +155,7 @@ pcibios_fixup_resources(struct pci_dev *dev)
ppc_md.pcibios_fixup_resources(dev);
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
static void
pcibios_fixup_cardbus(struct pci_dev* dev)
{
......@@ -188,7 +190,7 @@ pcibios_fixup_cardbus(struct pci_dev* dev)
pci_write_config_byte(dev, 0x92, val & ~0x06);
}
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
void
pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
......@@ -676,7 +678,7 @@ pcibios_alloc_controller(void)
return hose;
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
/*
* Functions below are used on OpenFirmware machines.
*/
......@@ -1026,7 +1028,9 @@ pci_create_OF_bus_map(void)
prom_add_property(find_path_device("/"), of_prop);
}
}
#endif /* CONFIG_PPC_OF */
#ifdef CONFIG_PPC_PMAC
/*
* This set of routines checks for PCI<->PCI bridges that have closed
* IO resources and have child devices. It tries to re-open an IO
......@@ -1235,7 +1239,7 @@ pcibios_fixup_p2p_bridges(void)
}
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
static int __init
pcibios_init(void)
......@@ -1277,9 +1281,9 @@ pcibios_init(void)
pcibios_allocate_bus_resources(&pci_root_buses);
pcibios_allocate_resources(0);
pcibios_allocate_resources(1);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
pcibios_fixup_p2p_bridges();
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
pcibios_assign_resources();
/* Call machine dependent post-init code */
......
arch/ppc/kernel/ppc_ksyms.c
View file @ a986b2f2
......@@ -94,7 +94,7 @@ EXPORT_SYMBOL(probe_irq_mask);
EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
EXPORT_SYMBOL_NOVERS(DMA_MODE_READ);
EXPORT_SYMBOL(DMA_MODE_WRITE);
#if defined(CONFIG_ALL_PPC)
#if defined(CONFIG_PPC_PREP)
EXPORT_SYMBOL(_prep_type);
EXPORT_SYMBOL(ucSystemType);
#endif
......@@ -238,9 +238,14 @@ EXPORT_SYMBOL(set_backlight_level);
EXPORT_SYMBOL(set_backlight_enable);
EXPORT_SYMBOL(register_backlight_controller);
#endif /* CONFIG_PMAC_BACKLIGHT */
#if defined(CONFIG_ALL_PPC)
#ifdef CONFIG_PPC_MULTIPLATFORM
EXPORT_SYMBOL(_machine);
#endif
#ifdef CONFIG_PPC_PMAC
EXPORT_SYMBOL_NOVERS(sys_ctrler);
EXPORT_SYMBOL(pmac_newworld);
#endif
#ifdef CONFIG_PPC_OF
EXPORT_SYMBOL(find_devices);
EXPORT_SYMBOL(find_type_devices);
EXPORT_SYMBOL(find_compatible_devices);
......@@ -254,12 +259,11 @@ EXPORT_SYMBOL(release_OF_resource);
EXPORT_SYMBOL(pci_busdev_to_OF_node);
EXPORT_SYMBOL(pci_device_to_OF_node);
EXPORT_SYMBOL(pci_device_from_OF_node);
EXPORT_SYMBOL(pmac_newworld);
#endif /* defined(CONFIG_ALL_PPC) */
#endif /* CONFIG_PPC_OF */
#if defined(CONFIG_BOOTX_TEXT)
EXPORT_SYMBOL(btext_update_display);
#endif
#if defined(CONFIG_SCSI) && defined(CONFIG_ALL_PPC)
#if defined(CONFIG_SCSI) && defined(CONFIG_PPC_PMAC)
EXPORT_SYMBOL(note_scsi_host);
#endif
#ifdef CONFIG_VT
......@@ -337,7 +341,7 @@ EXPORT_SYMBOL(debugger_fault_handler);
EXPORT_SYMBOL(cpm_install_handler);
EXPORT_SYMBOL(cpm_free_handler);
#endif /* CONFIG_8xx */
#if defined(CONFIG_8xx) || defined(CONFIG_4xx)
#if defined(CONFIG_8xx) || defined(CONFIG_40x)
EXPORT_SYMBOL(__res);
#endif
#if defined(CONFIG_8xx)
......@@ -354,7 +358,7 @@ extern long *intercept_table;
EXPORT_SYMBOL(intercept_table);
#endif
EXPORT_SYMBOL(cur_cpu_spec);
#if defined(CONFIG_ALL_PPC)
#ifdef CONFIG_PPC_PMAC
extern unsigned long agp_special_page;
EXPORT_SYMBOL_NOVERS(agp_special_page);
#endif /* defined(CONFIG_ALL_PPC) */
#endif
arch/ppc/kernel/setup.c
View file @ a986b2f2
......@@ -68,7 +68,7 @@ unsigned long boot_mem_size;
unsigned long ISA_DMA_THRESHOLD;
unsigned long DMA_MODE_READ, DMA_MODE_WRITE;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_MULTIPLATFORM
int _machine = 0;
extern void prep_init(unsigned long r3, unsigned long r4,
......@@ -77,7 +77,7 @@ extern void pmac_init(unsigned long r3, unsigned long r4,
unsigned long r5, unsigned long r6, unsigned long r7);
extern void chrp_init(unsigned long r3, unsigned long r4,
unsigned long r5, unsigned long r6, unsigned long r7);
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_MULTIPLATFORM */
#ifdef CONFIG_MAGIC_SYSRQ
unsigned long SYSRQ_KEY = 0x54;
......@@ -286,7 +286,7 @@ early_init(int r3, int r4, int r5)
identify_cpu(offset, 0);
do_cpu_ftr_fixups(offset);
#if defined(CONFIG_ALL_PPC)
#if defined(CONFIG_PPC_MULTIPLATFORM)
reloc_got2(offset);
/* If we came here from BootX, clear the screen,
......@@ -308,7 +308,7 @@ early_init(int r3, int r4, int r5)
return phys;
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
/*
* Assume here that all clock rates are the same in a
* smp system. -- Cort
......@@ -351,9 +351,11 @@ intuit_machine_type(void)
}
}
}
#endif
#ifdef CONFIG_PPC_MULTIPLATFORM
/*
* The ALL_PPC version of platform_init...
* The PPC_MULTIPLATFORM version of platform_init...
*/
void __init
platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
......@@ -459,7 +461,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
break;
}
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_MULTIPLATFORM */
struct bi_record *find_bootinfo(void)
{
......@@ -501,11 +503,11 @@ void parse_bootinfo(struct bi_record *rec)
initrd_end = data[0] + data[1] + KERNELBASE;
break;
#endif /* CONFIG_BLK_DEV_INITRD */
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_MULTIPLATFORM
case BI_MACHTYPE:
_machine = data[0];
break;
#endif /* CONFIG_ALL_PPC */
#endif
case BI_MEMSIZE:
boot_mem_size = data[0];
break;
......@@ -596,13 +598,13 @@ void __init setup_arch(char **cmdline_p)
/* so udelay does something sensible, assume <= 1000 bogomips */
loops_per_jiffy = 500000000 / HZ;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_MULTIPLATFORM
/* This could be called "early setup arch", it must be done
* now because xmon need it
*/
if (_machine == _MACH_Pmac)
pmac_feature_init(); /* New cool way */
#endif /* CONFIG_ALL_PPC */
#endif
#ifdef CONFIG_XMON
xmon_map_scc();
......
arch/ppc/kernel/traps.c
View file @ a986b2f2
......@@ -117,7 +117,7 @@ _exception(int signr, struct pt_regs *regs)
*/
static inline int check_io_access(struct pt_regs *regs)
{
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
unsigned long msr = regs->msr;
const struct exception_table_entry *entry;
unsigned int *nip = (unsigned int *)regs->nip;
......@@ -150,7 +150,7 @@ static inline int check_io_access(struct pt_regs *regs)
return 1;
}
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
return 0;
}
......
arch/ppc/mm/init.c
View file @ a986b2f2
......@@ -64,7 +64,7 @@ unsigned long ppc_memoffset = PAGE_OFFSET;
int mem_init_done;
int init_bootmem_done;
int boot_mapsize;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
unsigned long agp_special_page;
#endif
......@@ -411,16 +411,18 @@ void __init mem_init(void)
}
#endif /* CONFIG_BLK_DEV_INITRD */
#if defined(CONFIG_ALL_PPC)
#ifdef CONFIG_PPC_OF
/* mark the RTAS pages as reserved */
if ( rtas_data )
for (addr = (ulong)__va(rtas_data);
addr < PAGE_ALIGN((ulong)__va(rtas_data)+rtas_size) ;
addr += PAGE_SIZE)
SetPageReserved(virt_to_page(addr));
#endif
#ifdef CONFIG_PPC_PMAC
if (agp_special_page)
SetPageReserved(virt_to_page(agp_special_page));
#endif /* defined(CONFIG_ALL_PPC) */
#endif
if ( sysmap )
for (addr = (unsigned long)sysmap;
addr < PAGE_ALIGN((unsigned long)sysmap+sysmap_size) ;
......@@ -465,10 +467,10 @@ void __init mem_init(void)
if (sysmap)
printk("System.map loaded at 0x%08x for debugger, size: %ld bytes\n",
(unsigned int)sysmap, sysmap_size);
#if defined(CONFIG_ALL_PPC)
#ifdef CONFIG_PPC_PMAC
if (agp_special_page)
printk(KERN_INFO "AGP special page: 0x%08lx\n", agp_special_page);
#endif /* defined(CONFIG_ALL_PPC) */
#endif
/* Make sure all our pagetable pages have page->mapping
and page->index set correctly. */
......@@ -521,13 +523,15 @@ set_phys_avail(unsigned long total_memory)
initrd_end - initrd_start, 1);
}
#endif /* CONFIG_BLK_DEV_INITRD */
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
/* remove the RTAS pages from the available memory */
if (rtas_data)
mem_pieces_remove(&phys_avail, rtas_data, rtas_size, 1);
#endif
/* remove the sysmap pages from the available memory */
if (sysmap)
mem_pieces_remove(&phys_avail, __pa(sysmap), sysmap_size, 1);
#ifdef CONFIG_PPC_PMAC
/* Because of some uninorth weirdness, we need a page of
* memory as high as possible (it must be outside of the
* bus address seen as the AGP aperture). It will be used
......@@ -542,7 +546,7 @@ set_phys_avail(unsigned long total_memory)
mem_pieces_remove(&phys_avail, agp_special_page, PAGE_SIZE, 0);
agp_special_page = (unsigned long)__va(agp_special_page);
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
}
/* Mark some memory as reserved by removing it from phys_avail. */
......
arch/ppc/mm/mem_pieces.c
View file @ a986b2f2
......@@ -120,7 +120,7 @@ mem_pieces_print(struct mem_pieces *mp)
printk("\n");
}
#if defined(CONFIG_APUS) || defined(CONFIG_ALL_PPC)
#if defined(CONFIG_APUS) || defined(CONFIG_PPC_OF)
/*
* Add some memory to an array of pieces
*/
......@@ -135,7 +135,7 @@ mem_pieces_append(struct mem_pieces *mp, unsigned int start, unsigned int size)
rp->address = start;
rp->size = size;
}
#endif /* CONFIG_APUS || CONFIG_ALL_PPC */
#endif /* CONFIG_APUS || CONFIG_PPC_OF */
void __init
mem_pieces_sort(struct mem_pieces *mp)
......
arch/ppc/platforms/Makefile
View file @ a986b2f2
......@@ -16,17 +16,15 @@ obj-$(CONFIG_APUS) += apus_setup.o
ifeq ($(CONFIG_APUS),y)
obj-$(CONFIG_PCI) += apus_pci.o
endif
obj-$(CONFIG_ALL_PPC) += pmac_pic.o pmac_setup.o pmac_time.o \
pmac_feature.o pmac_pci.o chrp_setup.o\
chrp_time.o chrp_pci.o prep_pci.o \
prep_time.o prep_setup.o pmac_sleep.o
ifeq ($(CONFIG_ALL_PPC),y)
obj-$(CONFIG_PPC_PMAC) += pmac_pic.o pmac_setup.o pmac_time.o \
pmac_feature.o pmac_pci.o pmac_sleep.o
obj-$(CONFIG_PPC_CHRP) += chrp_setup.o chrp_time.o chrp_pci.o
obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_time.o prep_setup.o
ifeq ($(CONFIG_PPC_PMAC),y)
obj-$(CONFIG_NVRAM) += pmac_nvram.o
endif
obj-$(CONFIG_PMAC_BACKLIGHT) += pmac_backlight.o
ifeq ($(CONFIG_ALL_PPC),y)
obj-$(CONFIG_CPU_FREQ_PMAC) += pmac_cpufreq.o
endif
obj-$(CONFIG_PMAC_BACKLIGHT) += pmac_backlight.o
obj-$(CONFIG_PPC_RTAS) += error_log.o proc_rtas.o
obj-$(CONFIG_PREP_RESIDUAL) += residual.o
obj-$(CONFIG_ADIR) += adir_setup.o adir_pic.o adir_pci.o
......@@ -50,5 +48,6 @@ obj-$(CONFIG_SPRUCE) += spruce_setup.o spruce_pci.o
obj-$(CONFIG_ZX4500) += zx4500_setup.o zx4500_pci.o
ifeq ($(CONFIG_SMP),y)
obj-$(CONFIG_ALL_PPC) += pmac_smp.o chrp_smp.o
obj-$(CONFIG_PPC_PMAC) += pmac_smp.o
obj-$(CONFIG_PPC_CHRP) += chrp_smp.o
endif
arch/ppc/syslib/Makefile
View file @ a986b2f2
......@@ -27,8 +27,10 @@ obj-$(CONFIG_8xx) += m8xx_setup.o ppc8xx_pic.o
ifeq ($(CONFIG_8xx),y)
obj-$(CONFIG_PCI) += qspan_pci.o i8259.o
endif
obj-$(CONFIG_ALL_PPC) += prom_init.o prom.o open_pic.o \
indirect_pci.o i8259.o
obj-$(CONFIG_PPC_OF) += prom_init.o prom.o
obj-$(CONFIG_PPC_PMAC) += open_pic.o indirect_pci.o
obj-$(CONFIG_PPC_CHRP) += open_pic.o indirect_pci.o i8259.o
obj-$(CONFIG_PPC_PREP) += open_pic.o indirect_pci.o i8259.o
obj-$(CONFIG_ADIR) += i8259.o indirect_pci.o pci_auto.o \
todc_time.o
obj-$(CONFIG_EV64260) += gt64260_common.o gt64260_pic.o \
......
arch/ppc/xmon/start.c
View file @ a986b2f2
......@@ -52,7 +52,7 @@ void buf_access(void)
extern int adb_init(void);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_CHRP
/*
* This looks in the "ranges" property for the primary PCI host bridge
* to find the physical address of the start of PCI/ISA I/O space.
......@@ -90,7 +90,7 @@ static unsigned long chrp_find_phys_io_base(void)
}
return base;
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_CHRP */
#ifdef CONFIG_MAGIC_SYSRQ
static void sysrq_handle_xmon(int key, struct pt_regs *regs,
......@@ -110,7 +110,7 @@ static struct sysrq_key_op sysrq_xmon_op =
void
xmon_map_scc(void)
{
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_MULTIPLATFORM
volatile unsigned char *base;
if (_machine == _MACH_Pmac) {
......
arch/um/sys-ppc/Makefile
View file @ a986b2f2
......@@ -6,7 +6,7 @@ OBJ = built-in.o
OBJS = ptrace.o sigcontext.o semaphore.o checksum.o miscthings.o misc.o \
ptrace_user.o sysrq.o
EXTRA_AFLAGS := -DCONFIG_ALL_PPC -I. -I$(TOPDIR)/arch/ppc/kernel
EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(TOPDIR)/arch/ppc/kernel
all: $(OBJ)
......
drivers/Makefile
View file @ a986b2f2
......@@ -31,7 +31,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/
obj-$(CONFIG_DIO) += dio/
obj-$(CONFIG_SBUS) += sbus/
obj-$(CONFIG_ZORRO) += zorro/
obj-$(CONFIG_ALL_PPC) += macintosh/
obj-$(CONFIG_PPC_PMAC) += macintosh/
obj-$(CONFIG_MAC) += macintosh/
obj-$(CONFIG_SGI) += sgi/
obj-$(CONFIG_PARIDE) += block/paride/
......
drivers/char/agp/Kconfig
View file @ a986b2f2
......@@ -134,7 +134,7 @@ config AGP_ALPHA_CORE
config AGP_UNINORTH
tristate "Apple UniNorth AGP support"
depends on AGP && ALL_PPC
depends on AGP && PPC_PMAC
help
This option gives you AGP support for Apple machines with a
UniNorth bridge.
......
drivers/i2c/Kconfig
View file @ a986b2f2
......@@ -144,7 +144,7 @@ config I2C_ELEKTOR
config I2C_KEYWEST
tristate "Powermac Keywest I2C interface"
depends on I2C && ALL_PPC
depends on I2C && PPC_PMAC
help
This supports the use of the I2C interface in the combo-I/O
chip on recent Apple machines. Say Y if you have such a machine.
......
drivers/ide/Kconfig
View file @ a986b2f2
......@@ -268,7 +268,7 @@ config BLK_DEV_IDEPNP
config BLK_DEV_IDEPCI
bool "PCI IDE chipset support" if PCI
depends on BLK_DEV_IDE
default BLK_DEV_IDEDMA_PMAC if ALL_PPC && BLK_DEV_IDEDMA_PMAC
default BLK_DEV_IDEDMA_PMAC if PPC_PMAC && BLK_DEV_IDEDMA_PMAC
help
Say Y here for PCI systems which use IDE drive(s).
This option helps the IDE driver to automatically detect and
......@@ -409,7 +409,7 @@ config BLK_DEV_IDEDMA
bool
depends on BLK_DEV_IDE
default BLK_DEV_IDEDMA_ICS if ARCH_ACORN
default BLK_DEV_IDEDMA_PMAC if ALL_PPC && BLK_DEV_IDE_PMAC
default BLK_DEV_IDEDMA_PMAC if PPC_PMAC && BLK_DEV_IDE_PMAC
default BLK_DEV_IDEDMA_PCI if PCI && BLK_DEV_IDEPCI
config IDEDMA_PCI_WIP
......@@ -734,7 +734,7 @@ config BLK_DEV_SL82C105
config BLK_DEV_IDE_PMAC
bool "Builtin PowerMac IDE support"
depends on BLK_DEV_IDE && ALL_PPC
depends on BLK_DEV_IDE && PPC_PMAC
help
This driver provides support for the built-in IDE controller on
most of the recent Apple Power Macintoshes and PowerBooks.
......
drivers/ieee1394/ohci1394.c
View file @ a986b2f2
......@@ -111,7 +111,7 @@
#include <linux/vmalloc.h>
#include <linux/init.h>
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
#include <asm/prom.h>
......@@ -3508,7 +3508,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
OHCI1394_REGISTER_SIZE);
#endif
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/* On UniNorth, power down the cable and turn off the chip
* clock when the module is removed to save power on
* laptops. Turning it back ON is done by the arch code when
......@@ -3522,7 +3522,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node, 0, 0);
}
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
case OHCI_INIT_ALLOC_HOST:
pci_set_drvdata(ohci->dev, NULL);
......
drivers/media/video/Kconfig
View file @ a986b2f2
......@@ -45,7 +45,7 @@ config VIDEO_PMS
config VIDEO_PLANB
tristate "PlanB Video-In on PowerMac"
depends on ALL_PPC && VIDEO_DEV
depends on PPC_PMAC && VIDEO_DEV
help
PlanB is the V4L driver for the PowerMac 7x00/8x00 series video
input hardware. If you want to experiment with this, say Y.
......
drivers/net/Kconfig
View file @ a986b2f2
......@@ -225,7 +225,7 @@ source "drivers/net/arm/Kconfig"
config MACE
tristate "MACE (Power Mac ethernet) support"
depends on NET_ETHERNET && PPC && ALL_PPC
depends on NET_ETHERNET && PPC_PMAC
help
Power Macintoshes and clones with Ethernet built-in on the
motherboard will usually use a MACE (Medium Access Control for
......@@ -249,7 +249,7 @@ config MACE_AAUI_PORT
config BMAC
tristate "BMAC (G3 ethernet) support"
depends on NET_ETHERNET && PPC && ALL_PPC
depends on NET_ETHERNET && PPC_PMAC
help
Say Y for support of BMAC Ethernet interfaces. These are used on G3
computers.
......
drivers/net/sungem.c
View file @ a986b2f2
......@@ -48,7 +48,7 @@
#include <asm/pbm.h>
#endif
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
#include <asm/pci-bridge.h>
#include <asm/prom.h>
#include <asm/machdep.h>
......@@ -1491,7 +1491,7 @@ static void gem_init_phy(struct gem *gp)
mifcfg &= ~MIF_CFG_BBMODE;
writel(mifcfg, gp->regs + MIF_CFG);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE) {
int i, j;
......@@ -1525,7 +1525,7 @@ static void gem_init_phy(struct gem *gp)
break;
}
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
if (gp->pdev->vendor == PCI_VENDOR_ID_SUN &&
gp->pdev->device == PCI_DEVICE_ID_SUN_GEM) {
......@@ -1924,7 +1924,7 @@ static void gem_init_hw(struct gem *gp, int restart_link)
}
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/* Enable the chip's clock and make sure it's config space is
* setup properly. There appear to be no need to restore the
* base addresses.
......@@ -1963,7 +1963,7 @@ static void gem_apple_powerdown(struct gem *gp)
pmac_call_feature(PMAC_FTR_GMAC_ENABLE, gp->of_node, 0, 0);
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
/* Must be invoked under gp->lock. */
static void gem_stop_phy(struct gem *gp)
......@@ -2028,10 +2028,10 @@ static void gem_shutdown(struct gem *gp)
spin_unlock_irq(&gp->lock);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/* Power down the chip */
gem_apple_powerdown(gp);
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
} else {
gem_stop(gp);
......@@ -2085,13 +2085,13 @@ static int gem_open(struct net_device *dev)
* etc. state so it is safe to do this bit without gp->lock
*/
if (!gp->hw_running) {
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/* First, we need to bring up the chip */
if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE) {
gem_apple_powerup(gp);
gem_check_invariants(gp);
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
/* Reset the chip */
spin_lock_irq(&gp->lock);
......@@ -2112,10 +2112,10 @@ static int gem_open(struct net_device *dev)
printk(KERN_ERR "%s: failed to request irq !\n", gp->dev->name);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
if (!hw_was_up && gp->pdev->vendor == PCI_VENDOR_ID_APPLE)
gem_apple_powerdown(gp);
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
/* Fire the PM timer that will shut us down in about 10 seconds */
gp->pm_timer.expires = jiffies + 10*HZ;
add_timer(&gp->pm_timer);
......@@ -2227,13 +2227,13 @@ static int gem_resume(struct pci_dev *pdev)
printk(KERN_INFO "%s: resuming\n", dev->name);
if (gp->opened) {
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/* First, we need to bring up the chip */
if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE) {
gem_apple_powerup(gp);
gem_check_invariants(gp);
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
spin_lock_irq(&gp->lock);
gem_stop(gp);
......@@ -2541,7 +2541,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return rc;
}
#if (!defined(__sparc__) && !defined(CONFIG_ALL_PPC))
#if (!defined(__sparc__) && !defined(CONFIG_PPC))
/* Fetch MAC address from vital product data of PCI ROM. */
static void find_eth_addr_in_vpd(void *rom_base, int len, unsigned char *dev_addr)
{
......@@ -2604,7 +2604,7 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
static int __devinit gem_get_device_address(struct gem *gp)
{
#if defined(__sparc__) || defined(CONFIG_ALL_PPC)
#if defined(__sparc__) || defined(CONFIG_PPC_PMAC)
struct net_device *dev = gp->dev;
#endif
......@@ -2623,7 +2623,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
}
if (node == -1)
memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
#elif defined(CONFIG_ALL_PPC)
#elif defined(CONFIG_PPC_PMAC)
unsigned char *addr;
addr = get_property(gp->of_node, "local-mac-address", NULL);
......@@ -2748,7 +2748,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
* invariants to work, but also because the firmware might
* not have properly shut down the PHY.
*/
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
if (pdev->vendor == PCI_VENDOR_ID_APPLE)
gem_apple_powerup(gp);
#endif
......@@ -2779,7 +2779,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
goto err_out_iounmap;
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
gp->of_node = pci_device_to_OF_node(pdev);
#endif
if (gem_get_device_address(gp))
......
drivers/net/sungem.h
View file @ a986b2f2
......@@ -998,7 +998,7 @@ struct gem {
dma_addr_t gblock_dvma;
struct pci_dev *pdev;
struct net_device *dev;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
struct device_node *of_node;
#endif
};
......
drivers/net/wireless/Kconfig
View file @ a986b2f2
......@@ -149,7 +149,7 @@ config PCMCIA_RAYCS
unsure, say N.
comment "Wireless 802.11b ISA/PCI cards support"
depends on NET_RADIO && (ISA || PCI || ALL_PPC || PCMCIA)
depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
config AIRO
tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
......@@ -169,7 +169,7 @@ config AIRO
config HERMES
tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
depends on NET_RADIO && (ALL_PPC || PCI || PCMCIA)
depends on NET_RADIO && (PPC_PMAC || PCI || PCMCIA)
---help---
A driver for 802.11b wireless cards based based on the "Hermes" or
Intersil HFA384x (Prism 2) MAC controller. This includes the vast
......@@ -191,7 +191,7 @@ config HERMES
config APPLE_AIRPORT
tristate "Apple Airport support (built-in)"
depends on ALL_PPC && HERMES
depends on PPC_PMAC && HERMES
help
Say Y here to support the Airport 802.11b wireless Ethernet hardware
built into the Macintosh iBook and other recent PowerPC-based
......@@ -284,7 +284,7 @@ config AIRO_CS
# yes, this works even when no drivers are selected
config NET_WIRELESS
bool
depends on NET_RADIO && (ISA || PCI || ALL_PPC || PCMCIA)
depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
default y
endmenu
......
drivers/scsi/Kconfig
View file @ a986b2f2
......@@ -1559,7 +1559,7 @@ config SCSI_DEBUG
config SCSI_MESH
tristate "MESH (Power Mac internal SCSI) support"
depends on ALL_PPC && SCSI
depends on PPC_PMAC && SCSI
help
Many Power Macintoshes and clones have a MESH (Macintosh Enhanced
SCSI Hardware) SCSI bus adaptor (the 7200 doesn't, but all of the
......@@ -1590,7 +1590,7 @@ config SCSI_MESH_RESET_DELAY_MS
config SCSI_MAC53C94
tristate "53C94 (Power Mac external SCSI) support"
depends on ALL_PPC && SCSI
depends on PPC_PMAC && SCSI
help
On Power Macintoshes (and clones) with two SCSI buses, the external
SCSI bus is usually controlled by a 53C94 SCSI bus adaptor. Older
......
drivers/video/Kconfig
View file @ a986b2f2
......@@ -235,28 +235,28 @@ config FB_ATARI
config FB_OF
bool "Open Firmware frame buffer device support"
depends on FB && (PPC64 || (PPC && ALL_PPC))
depends on FB && (PPC64 || PPC_OF)
help
Say Y if you want support with Open Firmware for your graphics
board.
config FB_CONTROL
bool "Apple \"control\" display support"
depends on FB && PPC && ALL_PPC
depends on FB && PPC_PMAC
help
This driver supports a frame buffer for the graphics adapter in the
Power Macintosh 7300 and others.
config FB_PLATINUM
bool "Apple \"platinum\" display support"
depends on FB && PPC && ALL_PPC
depends on FB && PPC_PMAC
help
This driver supports a frame buffer for the "platinum" graphics
adapter in some Power Macintoshes.
config FB_VALKYRIE
bool "Apple \"valkyrie\" display support"
depends on FB && (MAC || PPC && ALL_PPC)
depends on FB && (MAC || PPC_PMAC)
help
This driver supports a frame buffer for the "valkyrie" graphics
adapter in some Power Macintoshes.
......
drivers/video/aty/aty128fb.c
View file @ a986b2f2
......@@ -59,7 +59,7 @@
#include <linux/ioport.h>
#include <asm/io.h>
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
#include <asm/prom.h>
#include <asm/pci-bridge.h>
#include "../macmodes.h"
......@@ -93,7 +93,7 @@
#define DBG(fmt, args...)
#endif
#ifndef CONFIG_ALL_PPC
#ifndef CONFIG_PPC_PMAC
/* default mode */
static struct fb_var_screeninfo default_var __initdata = {
/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
......@@ -103,7 +103,7 @@ static struct fb_var_screeninfo default_var __initdata = {
0, FB_VMODE_NONINTERLACED
};
#else /* CONFIG_ALL_PPC */
#else /* CONFIG_PPC_PMAC */
/* default to 1024x768 at 75Hz on PPC - this will work
* on the iMac, the usual 640x480 @ 60Hz doesn't. */
static struct fb_var_screeninfo default_var = {
......@@ -114,7 +114,7 @@ static struct fb_var_screeninfo default_var = {
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED
};
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
/* default modedb mode */
/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
......@@ -259,7 +259,7 @@ static int nomtrr __initdata = 0;
static char *mode_option __initdata = NULL;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
static int default_vmode __initdata = VMODE_1024_768_60;
static int default_cmode __initdata = CMODE_8;
#endif
......@@ -1434,7 +1434,7 @@ aty128fb_setup(char *options)
continue;
}
#endif
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/* vmode and cmode deprecated */
if (!strncmp(this_opt, "vmode:", 6)) {
unsigned int vmode = simple_strtoul(this_opt+6, NULL, 0);
......@@ -1459,7 +1459,7 @@ aty128fb_setup(char *options)
}
continue;
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
mode_option = this_opt;
}
return 0;
......@@ -1543,7 +1543,7 @@ aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
#endif
var = default_var;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
if (_machine == _MACH_Pmac) {
if (mode_option) {
if (!mac_find_mode(&var, info, mode_option, 8))
......@@ -1582,7 +1582,7 @@ aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
var = default_var;
}
} else
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
{
if (fb_find_mode(&var, info, mode_option, NULL, 0,
&defaultmode, 8) == 0)
......@@ -1872,7 +1872,7 @@ aty128_get_pllinfo(struct aty128fb_par *par, void *bios)
static void __init
aty128_timings(struct aty128fb_par *par)
{
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
/* instead of a table lookup, assume OF has properly
* setup the PLL registers and use their values
* to set the XCLK values and reference divider values */
......@@ -1886,7 +1886,7 @@ aty128_timings(struct aty128fb_par *par)
if (!par->constants.dotclock)
par->constants.dotclock = 2950;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
x_mpll_ref_fb_div = aty_ld_pll(X_MPLL_REF_FB_DIV);
xclk_cntl = aty_ld_pll(XCLK_CNTL) & 0x7;
Nx = (x_mpll_ref_fb_div & 0x00ff00) >> 8;
......
drivers/video/cirrusfb.c
View file @ a986b2f2
......@@ -56,7 +56,7 @@
#ifdef CONFIG_AMIGA
#include <asm/amigahw.h>
#endif
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PREP
#include <asm/processor.h>
#define isPReP (_machine == _MACH_prep)
#else
......@@ -2395,7 +2395,7 @@ static void fbcon_clgen32_clear (struct vc_data *conp, struct display *p,
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PREP
#define PREP_VIDEO_BASE ((volatile unsigned long) 0xC0000000)
#define PREP_IO_BASE ((volatile unsigned char *) 0x80000000)
static void __init get_prep_addrs (unsigned long *display, unsigned long *registers)
......@@ -2408,7 +2408,7 @@ static void __init get_prep_addrs (unsigned long *display, unsigned long *regist
DPRINTK ("EXIT\n");
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PREP */
......@@ -2543,7 +2543,7 @@ static int __init clgen_pci_setup (struct clgenfb_info *info,
pcibios_write_config_dword (0, pdev->devfn, PCI_BASE_ADDRESS_0,
0x00000000);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PREP
get_prep_addrs (&board_addr, &info->fbregs_phys);
#endif
} else {
......
drivers/video/fbmon.c
View file @ a986b2f2
......@@ -29,7 +29,7 @@
#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/module.h>
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
#include <linux/pci.h>
#include <asm/prom.h>
#endif
......@@ -828,7 +828,7 @@ void show_edid(unsigned char *edid)
printk("========================================\n");
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
char *get_EDID_from_OF(struct pci_dev *pdev)
{
static char *propnames[] =
......@@ -1256,7 +1256,7 @@ EXPORT_SYMBOL(show_edid);
#ifdef CONFIG_X86
EXPORT_SYMBOL(get_EDID_from_BIOS);
#endif
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
EXPORT_SYMBOL(get_EDID_from_OF);
#endif
EXPORT_SYMBOL(fb_get_monitor_limits);
......
drivers/video/matrox/matroxfb_base.c
View file @ a986b2f2
......@@ -115,7 +115,7 @@
#include <linux/interrupt.h>
#include <asm/uaccess.h>
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
unsigned char nvram_read_byte(int);
static int default_vmode = VMODE_NVRAM;
static int default_cmode = CMODE_NVRAM;
......@@ -1763,7 +1763,7 @@ static int initMatrox2(WPMINFO struct board* b){
}
/* FIXME: Where to move this?! */
#if defined(CONFIG_ALL_PPC)
#if defined(CONFIG_PPC_PMAC)
#ifndef MODULE
if (_machine == _MACH_Pmac) {
struct fb_var_screeninfo var;
......@@ -1783,7 +1783,7 @@ static int initMatrox2(WPMINFO struct board* b){
}
}
#endif /* !MODULE */
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
vesafb_defined.xres_virtual = vesafb_defined.xres;
if (nopan) {
vesafb_defined.yres_virtual = vesafb_defined.yres;
......@@ -2270,7 +2270,7 @@ int __init matroxfb_setup(char *options) {
dfp_type = simple_strtoul(this_opt+4, NULL, 0);
dfp = 1;
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
else if (!strncmp(this_opt, "vmode:", 6)) {
unsigned int vmode = simple_strtoul(this_opt+6, NULL, 0);
if (vmode > 0 && vmode <= VMODE_MAX)
......@@ -2441,7 +2441,7 @@ MODULE_PARM(dfp, "i");
MODULE_PARM_DESC(dfp, "Specifies whether to use digital flat panel interface of G200/G400 (0 or 1) (default=0)");
MODULE_PARM(dfp_type, "i");
MODULE_PARM_DESC(dfp_type, "Specifies DFP interface type (0 to 255) (default=read from hardware)");
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
MODULE_PARM(vmode, "i");
MODULE_PARM_DESC(vmode, "Specify the vmode mode number that should be used (640x480 default)");
MODULE_PARM(cmode, "i");
......
drivers/video/matrox/matroxfb_base.h
View file @ a986b2f2
......@@ -52,7 +52,7 @@
#include "../console/fbcon.h"
#if defined(CONFIG_ALL_PPC)
#if defined(CONFIG_PPC_PMAC)
#include <asm/prom.h>
#include <asm/pci-bridge.h>
#include <video/macmodes.h>
......
drivers/video/radeonfb.c
View file @ a986b2f2
......@@ -707,7 +707,7 @@ static void radeon_get_EDID(struct radeonfb_info *rinfo);
static int radeon_dfp_parse_EDID(struct radeonfb_info *rinfo);
static void radeon_update_default_var(struct radeonfb_info *rinfo);
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
static int radeon_read_OF (struct radeonfb_info *rinfo);
static int radeon_get_EDID_OF(struct radeonfb_info *rinfo);
......@@ -728,7 +728,7 @@ static struct backlight_controller radeon_backlight_controller = {
};
#endif /* CONFIG_PMAC_BACKLIGHT */
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_OF */
static char *radeon_find_rom(struct radeonfb_info *rinfo)
......@@ -830,7 +830,7 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo, char *bios_seg)
printk("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d from BIOS\n",
rinfo->pll.ref_clk, rinfo->pll.ref_div, rinfo->pll.xclk);
} else {
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
if (radeon_read_OF(rinfo)) {
unsigned int tmp, Nx, M, ref_div, xclk;
......@@ -965,7 +965,7 @@ static void radeon_get_moninfo (struct radeonfb_info *rinfo)
static void radeon_get_EDID(struct radeonfb_info *rinfo)
{
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
if (!radeon_get_EDID_OF(rinfo))
RTRACE("radeonfb: could not retrieve EDID from OF\n");
#else
......@@ -974,7 +974,7 @@ static void radeon_get_EDID(struct radeonfb_info *rinfo)
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
static int radeon_get_EDID_OF(struct radeonfb_info *rinfo)
{
struct device_node *dp;
......@@ -996,7 +996,7 @@ static int radeon_get_EDID_OF(struct radeonfb_info *rinfo)
}
return 0;
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_OF */
static int radeon_dfp_parse_EDID(struct radeonfb_info *rinfo)
......@@ -1209,7 +1209,7 @@ static int radeon_get_dfpinfo (struct radeonfb_info *rinfo)
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
static int radeon_read_OF (struct radeonfb_info *rinfo)
{
struct device_node *dp;
......@@ -1957,11 +1957,11 @@ static int radeonfb_set_par (struct fb_info *info)
}
newmode.vclk_ecp_cntl = rinfo->init_state.vclk_ecp_cntl;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
/* Gross hack for iBook with M7 until I find out a proper fix */
if (machine_is_compatible("PowerBook4,3") && rinfo->arch == RADEON_M7)
newmode.ppll_div_3 = 0x000600ad;
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_OF */
RTRACE("post div = 0x%x\n", rinfo->post_div);
RTRACE("fb_div = 0x%x\n", rinfo->fb_div);
......
drivers/video/riva/fbdev.c
View file @ a986b2f2
......@@ -1606,7 +1606,7 @@ static int __init riva_set_fbinfo(struct fb_info *info)
return 0;
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
static int riva_get_EDID_OF(struct riva_par *par, struct pci_dev *pd)
{
struct device_node *dp;
......@@ -1621,7 +1621,7 @@ static int riva_get_EDID_OF(struct riva_par *par, struct pci_dev *pd)
} else
return 0;
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_OF */
static int riva_dfp_parse_EDID(struct riva_par *par)
{
......@@ -1699,7 +1699,7 @@ static void riva_update_default_var(struct fb_info *info)
static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
{
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
if (!riva_get_EDID_OF(info, pdev))
printk("rivafb: could not retrieve EDID from OF\n");
#else
......
fs/partitions/mac.c
View file @ a986b2f2
......@@ -11,7 +11,7 @@
#include "check.h"
#include "mac.h"
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
extern void note_bootable_part(dev_t dev, int part, int goodness);
#endif
......@@ -34,7 +34,7 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
unsigned char *data;
int blk, blocks_in_map;
unsigned secsize;
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
int found_root = 0;
int found_root_goodness = 0;
#endif
......@@ -74,7 +74,7 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
be32_to_cpu(part->start_block) * (secsize/512),
be32_to_cpu(part->block_count) * (secsize/512));
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/*
* If this is the first bootable partition, tell the
* setup code, in case it wants to make this the root.
......@@ -115,11 +115,11 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
found_root_goodness = goodness;
}
}
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_PMAC */
++slot;
}
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
if (found_root_goodness)
note_bootable_part(bdev->bd_dev, found_root, found_root_goodness);
#endif
......
include/asm-ppc/dma.h
View file @ a986b2f2
......@@ -99,7 +99,7 @@ extern unsigned long ISA_DMA_THRESHOLD;
*/
/* see prep_setup_arch() for detailed informations */
#if defined(CONFIG_SOUND_CS4232) && defined(CONFIG_ALL_PPC)
#if defined(CONFIG_SOUND_CS4232) && defined(CONFIG_PPC_PREP)
extern long ppc_cs4232_dma, ppc_cs4232_dma2;
#define SND_DMA1 ppc_cs4232_dma
#define SND_DMA2 ppc_cs4232_dma2
......
include/asm-ppc/io.h
View file @ a986b2f2
......@@ -77,7 +77,7 @@ extern unsigned long pci_dram_offset;
#define insl(port, buf, nl) _insl_ns((u32 *)((port)+_IO_BASE), (buf), (nl))
#define outsl(port, buf, nl) _outsl_ns((u32 *)((port)+_IO_BASE), (buf), (nl))
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_PMAC
/*
* On powermacs, we will get a machine check exception if we
* try to read data from a non-existent I/O port. Because the
......@@ -149,7 +149,7 @@ __do_out_asm(outl, "stwbrx")
#define inl(port) in_be32((u32 *)((port)+_IO_BASE))
#define outl(val, port) out_be32((u32 *)((port)+_IO_BASE), (val))
#else /* not APUS or ALL_PPC */
#else /* not APUS or PMAC */
#define inb(port) in_8((u8 *)((port)+_IO_BASE))
#define outb(val, port) out_8((u8 *)((port)+_IO_BASE), (val))
#define inw(port) in_le16((u16 *)((port)+_IO_BASE))
......
include/asm-ppc/processor.h
View file @ a986b2f2
......@@ -559,7 +559,7 @@
/* We only need to define a new _MACH_xxx for machines which are part of
* a configuration which supports more than one type of different machine.
* This is currently limited to CONFIG_ALL_PPC and CHRP/PReP/PMac. -- Tom
* This is currently limited to CONFIG_PPC_MULTIPLATFORM and CHRP/PReP/PMac. -- Tom
*/
#define _MACH_prep 0x00000001
#define _MACH_Pmac 0x00000002 /* pmac or pmac clone (non-chrp) */
......@@ -620,7 +620,7 @@
#define SR15 15
#ifndef __ASSEMBLY__
#if defined(CONFIG_ALL_PPC)
#ifdef CONFIG_PPC_MULTIPLATFORM
extern int _machine;
/* what kind of prep workstation we are */
......@@ -635,7 +635,7 @@ extern unsigned char ucBoardRev;
extern unsigned char ucBoardRevMaj, ucBoardRevMin;
#else
#define _machine 0
#endif /* CONFIG_ALL_PPC */
#endif /* CONFIG_PPC_MULTIPLATFORM */
struct task_struct;
void start_thread(struct pt_regs *regs, unsigned long nip, unsigned long sp);
......
include/asm-um/processor-ppc.h
View file @ a986b2f2
......@@ -3,7 +3,7 @@
#if defined(__ASSEMBLY__)
#define CONFIG_ALL_PPC
#define CONFIG_PPC_MULTIPLATFORM
#include "arch/processor.h"
#else
......
include/video/edid.h
View file @ a986b2f2
......@@ -4,7 +4,7 @@
#ifdef __KERNEL__
#include <linux/config.h>
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
#include <linux/pci.h>
#endif
......@@ -18,7 +18,7 @@ extern char *get_EDID_from_BIOS(void *);
#endif /* CONFIG_X86 */
#ifdef CONFIG_ALL_PPC
#ifdef CONFIG_PPC_OF
extern char *get_EDID_from_OF(struct pci_dev *pdev);
#endif
......
sound/oss/dmasound/Kconfig
View file @ a986b2f2
......@@ -14,7 +14,7 @@ config DMASOUND_ATARI
config DMASOUND_AWACS
tristate "PowerMac DMA sound support"
depends on ALL_PPC && SOUND
depends on PPC_PMAC && SOUND
help
If you want to use the internal audio of your PowerMac in Linux,
answer Y to this question. This will provide a Sun-like /dev/audio,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7