Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a26b136 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc 



32-bit CHRP machines are now supported only in arch/powerpc, as are
all 64-bit PowerPC processors.  This means that we don't use
Open Firmware on any platform in arch/ppc any more.

This makes PReP support a single-platform option like every other
platform support option in arch/ppc now, thus CONFIG_PPC_MULTIPLATFORM
is gone from arch/ppc.  CONFIG_PPC_PREP is the option that selects
PReP support and is generally what has replaced
CONFIG_PPC_MULTIPLATFORM within arch/ppc.

_machine is all but dead now, being #defined to 0.

Updated Makefiles, comments and Kconfig options generally to reflect
these changes.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent ff2e6d7e

arch/ppc/Kconfig

+24 −62
Original line number Original line Diff line number Diff line
@@ -61,15 +61,15 @@ config 6xx 
	select PPC_FPU

	select PPC_FPU

	help

	help

	  There are four types of PowerPC chips supported.  The more common

	  There are four types of PowerPC chips supported.  The more common

	  types (601, 603, 604, 740, 750, 7400), the Motorola embedded

	  types (601, 603, 604, 740, 750, 7400), the older Freescale

	  versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the IBM

	  (formerly Motorola) embedded versions (821, 823, 850, 855, 860,

	  embedded versions (403 and 405) and the POWER3 processor.

	  52xx, 82xx, 83xx), the IBM embedded versions (403 and 405) and

	  (For support for more recent 64-bit processors, set ARCH=powerpc.)

	  the Book E embedded processors from IBM (44x) and Freescale (85xx).

	  For support for 64-bit processors, set ARCH=powerpc.

	  Unless you are building a kernel for one of the embedded processor

	  Unless you are building a kernel for one of the embedded processor

	  systems or a POWER3-based IBM RS/6000, choose 6xx.

	  systems, choose 6xx.

	  Note that the kernel runs in 32-bit mode even on 64-bit chips.

	  Also note that because the 52xx, 82xx, & 83xx family have a 603e

	  Also note that because the 52xx, 82xx, & 83xx family has a 603e core,

	  core, specific support for that chipset is asked later on.

	  specific support for that chipset is asked later on.





config 40x

config 40x

	bool "40x"

	bool "40x"
@@ -77,10 +77,6 @@ config 40x 
config 44x

config 44x

	bool "44x"

	bool "44x"





config POWER3

	select PPC_FPU

	bool "POWER3"



config 8xx

config 8xx

	bool "8xx"

	bool "8xx"
@@ -252,14 +248,9 @@ config PPC601_SYNC_FIX 
source arch/ppc/platforms/4xx/Kconfig

source arch/ppc/platforms/4xx/Kconfig

source arch/ppc/platforms/85xx/Kconfig

source arch/ppc/platforms/85xx/Kconfig





config PPC64BRIDGE

	bool

	depends on POWER3

	default y



config PPC_STD_MMU

config PPC_STD_MMU

	bool

	bool

	depends on 6xx || POWER3

	depends on 6xx

	default y

	default y





config NOT_COHERENT_CACHE

config NOT_COHERENT_CACHE
@@ -534,8 +525,8 @@ endmenu 




choice

choice

	prompt "Machine Type"

	prompt "Machine Type"

	depends on 6xx || POWER3

	depends on 6xx

	default PPC_MULTIPLATFORM

	default PPC_PREP

	---help---

	---help---

	  Linux currently supports several different kinds of PowerPC-based

	  Linux currently supports several different kinds of PowerPC-based

	  machines: Apple Power Macintoshes and clones (such as the Motorola

	  machines: Apple Power Macintoshes and clones (such as the Motorola
@@ -545,15 +536,14 @@ choice 
	  Platform) machines (including all of the recent IBM RS/6000 and

	  Platform) machines (including all of the recent IBM RS/6000 and

	  pSeries machines), and several embedded PowerPC systems containing

	  pSeries machines), and several embedded PowerPC systems containing

	  4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors.  Currently, the

	  4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors.  Currently, the

	  default option is to build a kernel which works on PReP and CHRP.

	  default option is to build a kernel which works on PReP.





	  Note that support for Apple machines is now only available with

	  Note that support for Apple and CHRP machines is now only available

	  ARCH=powerpc, and has been removed from this menu.  If you wish

	  with ARCH=powerpc, and has been removed from this menu.  If you

	  to build a kernel for an Apple machine, exit this configuration

	  wish to build a kernel for an Apple or CHRP machine, exit this

	  process and re-run it with ARCH=powerpc.

	  configuration process and re-run it with ARCH=powerpc.





	  Select CHRP/PReP if configuring for an IBM RS/6000 or

	  Select PReP if configuring for a PReP machine.

	  pSeries machine, or a PReP machine.





	  Select Gemini if configuring for a Synergy Microsystems' Gemini

	  Select Gemini if configuring for a Synergy Microsystems' Gemini

	  series Single Board Computer.  More information is available at:

	  series Single Board Computer.  More information is available at:
@@ -562,8 +552,8 @@ choice 
	  Select APUS if configuring for a PowerUP Amiga.  More information is

	  Select APUS if configuring for a PowerUP Amiga.  More information is

	  available at: <http://linux-apus.sourceforge.net/>.

	  available at: <http://linux-apus.sourceforge.net/>.





config PPC_MULTIPLATFORM

config PPC_PREP

	bool "CHRP/PReP"

	bool "PReP"





config APUS

config APUS

	bool "Amiga-APUS"

	bool "Amiga-APUS"
@@ -807,25 +797,6 @@ config CPM2 
	  you wish to build a kernel for a machine with a CPM2 coprocessor

	  you wish to build a kernel for a machine with a CPM2 coprocessor

	  on it (826x, 827x, 8560).

	  on it (826x, 827x, 8560).





config PPC_CHRP

	bool "Support for CHRP (Common Hardware Reference Platform) machines"

	depends on PPC_MULTIPLATFORM

	select PPC_I8259

	select PPC_INDIRECT_PCI

	default y



config PPC_PREP

	bool "Support for PReP (PowerPC Reference Platform) machines"

	depends on PPC_MULTIPLATFORM

	select PPC_I8259

	select PPC_INDIRECT_PCI

	default y



config PPC_OF

	bool

	depends on PPC_CHRP

	default y



config PPC_GEN550

config PPC_GEN550

	bool

	bool

	depends on SANDPOINT || SPRUCE || PPLUS || \

	depends on SANDPOINT || SPRUCE || PPLUS || \
@@ -984,14 +955,6 @@ source "mm/Kconfig" 




source "fs/Kconfig.binfmt"

source "fs/Kconfig.binfmt"





config PROC_DEVICETREE

	bool "Support for Open Firmware device tree in /proc"

	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

	  Firmware. If unsure, say Y here.



config PREP_RESIDUAL

config PREP_RESIDUAL

	bool "Support for PReP Residual Data"

	bool "Support for PReP Residual Data"

	depends on PPC_PREP

	depends on PPC_PREP
@@ -1184,8 +1147,7 @@ menu "Bus options" 




config ISA

config ISA

	bool "Support for ISA-bus hardware"

	bool "Support for ISA-bus hardware"

	depends on PPC_PREP || PPC_CHRP

	depends on PPC_PREP

	select PPC_I8259

	help

	help

	  Find out whether you have ISA slots on your motherboard.  ISA is the

	  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

	  name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -1195,18 +1157,18 @@ config ISA 




config GENERIC_ISA_DMA

config GENERIC_ISA_DMA

	bool

	bool

	depends on POWER3 || 6xx && !CPM2

	depends on 6xx && !CPM2

	default y

	default y





config PPC_I8259

config PPC_I8259

	bool

	bool

	default y if 85xx

	default y if 85xx || PPC_PREP

	default n

	default n





config PPC_INDIRECT_PCI

config PPC_INDIRECT_PCI

	bool

	bool

	depends on PCI

	depends on PCI

	default y if 40x || 44x || 85xx || 83xx

	default y if 40x || 44x || 85xx || 83xx || PPC_PREP

	default n

	default n





config EISA

config EISA
@@ -1397,7 +1359,7 @@ config CONSISTENT_SIZE 




config BOOT_LOAD_BOOL

config BOOT_LOAD_BOOL

	bool "Set the boot link/load address"

	bool "Set the boot link/load address"

	depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM

	depends on ADVANCED_OPTIONS && !PPC_PREP

	help

	help

	  This option allows you to set the initial load address of the zImage

	  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

	  or zImage.initrd file.  This can be useful if you are on a board

arch/ppc/Kconfig.debug

+0 −7
Original line number Original line Diff line number Diff line
@@ -53,13 +53,6 @@ config BDI_SWITCH 
	  Unless you are intending to debug the kernel with one of these

	  Unless you are intending to debug the kernel with one of these

	  machines, say N here.

	  machines, say N here.





config BOOTX_TEXT

	bool "Support for early boot text console (BootX or OpenFirmware only)"

	depends PPC_OF

	help

	  Say Y here to see progress messages from the boot firmware in text

	  mode. Requires either BootX or Open Firmware.



config SERIAL_TEXT_DEBUG

config SERIAL_TEXT_DEBUG

	bool "Support for early boot texts over serial port"

	bool "Support for early boot texts over serial port"

	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \

	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \

arch/ppc/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -40,10 +40,8 @@ ifndef CONFIG_FSL_BOOKE 
CFLAGS		+= -mstring

CFLAGS		+= -mstring

endif

endif





cpu-as-$(CONFIG_PPC64BRIDGE)	+= -Wa,-mppc64bridge

cpu-as-$(CONFIG_4xx)		+= -Wa,-m405

cpu-as-$(CONFIG_4xx)		+= -Wa,-m405

cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec

cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec

cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec

cpu-as-$(CONFIG_E500)		+= -Wa,-me500

cpu-as-$(CONFIG_E500)		+= -Wa,-me500

cpu-as-$(CONFIG_E200)		+= -Wa,-me200

cpu-as-$(CONFIG_E200)		+= -Wa,-me200

arch/ppc/boot/Makefile

+3 −4
Original line number Original line Diff line number Diff line
@@ -19,14 +19,13 @@ HOSTCFLAGS += -Iarch/$(ARCH)/boot/include 
BOOT_TARGETS	= zImage zImage.initrd znetboot znetboot.initrd

BOOT_TARGETS	= zImage zImage.initrd znetboot znetboot.initrd





bootdir-y			:= simple

bootdir-y			:= simple

bootdir-$(CONFIG_PPC_OF)	+= openfirmware

subdir-y			:= lib common images

subdir-y			:= lib common images

subdir-$(CONFIG_PPC_MULTIPLATFORM)	+= of1275

subdir-$(CONFIG_PPC_PREP)	+= of1275





# for cleaning

# for cleaning

subdir-				+= simple openfirmware

subdir-				+= simple





hostprogs-y := $(addprefix utils/, addnote mknote hack-coff mkprep mkbugboot mktree)

hostprogs-y := $(addprefix utils/, mkprep mkbugboot mktree)





PHONY += $(BOOT_TARGETS) $(bootdir-y)

PHONY += $(BOOT_TARGETS) $(bootdir-y)

arch/ppc/boot/openfirmware/Makefile

deleted100644 → 0
+0 −109
Original line number Original line Diff line number Diff line 
# Makefile for making bootable images on various OpenFirmware machines.

#

# This file is included by the global makefile so that you can add your own

# architecture-specific flags and dependencies.

#

# Paul Mackerras	January 1997

#	XCOFF bootable images for PowerMacs

# Geert Uytterhoeven	September 1997

#	ELF bootable iamges for CHRP machines.

# Tom Rini		January 2001

# 	Cleaned up, moved into arch/ppc/boot/pmac

# Tom Rini		July/August 2002

#	Merged 'chrp' and 'pmac' into 'openfirmware', and cleaned up the

#	rules.



zImage.initrd znetboot.initrd: del-ramdisk-sec	:= -R .ramdisk

zImage.initrd znetboot.initrd: initrd		:= .initrd





boot	:= arch/ppc/boot

common	:= $(boot)/common

utils	:= $(boot)/utils

bootlib	:= $(boot)/lib

of1275	:= $(boot)/of1275

images	:= $(boot)/images



CHRP_LD_ARGS	:= -T $(srctree)/$(boot)/ld.script -e _start -Ttext 0x00800000



COMMONOBJS	:= start.o misc.o common.o

CHRPOBJS	:= crt0.o     $(COMMONOBJS) chrpmain.o



targets 	:= $(CHRPOBJS) dummy.o

CHRPOBJS	:= $(addprefix $(obj)/, $(CHRPOBJS))



LIBS		:= lib/lib.a $(bootlib)/lib.a $(of1275)/lib.a $(common)/lib.a



ifdef CONFIG_SMP

END := .smp

endif

ifdef CONFIG_PPC64BRIDGE

END += .64

endif





$(images)/ramdisk.image.gz:

	@echo '  MISSING $@'

	@echo '          RAM disk image must be provided separately'

	@/bin/false



quiet_cmd_genimage = GEN     $@

      cmd_genimage = $(OBJCOPY) -R .comment       \

	--add-section=.image=$(images)/vmlinux.gz \

	--set-section-flags=.image=contents,alloc,load,readonly,data $< $@



targets += image.o

$(obj)/image.o: $(obj)/dummy.o $(images)/vmlinux.gz FORCE

	$(call if_changed,genimage)



# Place the ramdisk in the initrd image.

quiet_cmd_genimage-initrd = GEN     $@

      cmd_genimage-initrd = $(OBJCOPY) $< $@ \

	--add-section=.ramdisk=$(images)/ramdisk.image.gz \

	--set-section-flags=.ramdisk=contents,alloc,load,readonly,data

targets += image.initrd.o

$(obj)/image.initrd.o: $(obj)/image.o $(images)/ramdisk.image.gz FORCE

	$(call if_changed,genimage-initrd)





targets += crt0.o

$(obj)/crt0.o: $(common)/crt0.S FORCE

	$(call if_changed_dep,as_o_S)



quiet_cmd_gen-chrp = CHRP    $@

      cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $(CHRPOBJS) $< $(LIBS) && \

			$(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec)



$(images)/zImage.chrp: $(obj)/image.o $(CHRPOBJS) $(LIBS) \

				   $(srctree)/$(boot)/ld.script

	$(call cmd,gen-chrp)

$(images)/zImage.initrd.chrp: $(obj)/image.initrd.o $(CHRPOBJS) $(LIBS) \

				   $(srctree)/$(boot)/ld.script

	$(call cmd,gen-chrp)



quiet_cmd_addnote = ADDNOTE $@

      cmd_addnote = cat $< > $@ && $(utils)/addnote $@

$(images)/zImage.chrp-rs6k $(images)/zImage.initrd.chrp-rs6k: \

	%-rs6k: %

	$(call cmd,addnote)



# The targets used on the make command-line



PHONY += zImage zImage.initrd

zImage:		 $(images)/zImage.chrp		\

		 $(images)/zImage.chrp-rs6k

	@echo '  kernel: $@ is ready ($<)'

zImage.initrd:	 $(images)/zImage.initrd.chrp		\

		 $(images)/zImage.initrd.chrp-rs6k

	@echo '  kernel: $@ is ready ($<)'



TFTPIMAGE	:= /tftpboot/zImage



PHONY += znetboot znetboot.initrd

znetboot:	$(images)/zImage.chrp

	cp $(images)/zImage.chrp      $(TFTPIMAGE).chrp$(END)

	@echo '  kernel: $@ is ready ($<)'

znetboot.initrd:$(images)/zImage.initrd.chrp

	cp $(images)/zImage.initrd.chrp      $(TFTPIMAGE).chrp$(END)

	@echo '  kernel: $@ is ready ($<)'