powerpc cleanup patches
Subsystems (3)
cover powerpc cleanup patches
Hi all,
The following patchset contains various powerpc cleanup patches. Most of them aim at reducing the usage of CONFIG_PPC_MULTIPLATFORM. Some patches are trivial, others might cause objections.
Some patches have to go to subsystem maintainers, but I post them here for review first.
Please comment
Sascha
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 16/16] powerpc: make nvram_64.o a 64bit-only object
Make nvram_64.o dependent on 64bit, not on MULTIPLATFORM
arch/powerpc/kernel/Makefile renamed from arch/powerpc/kernel/Makefile.orig +1 -2
@@ -17,7 +17,7 @@ obj-y += vdso32/ obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ signal_64.o ptrace32.o \ paca.o cpu_setup_ppc970.o \ - firmware.o sysfs.o + firmware.o sysfs.o nvram_64.o obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_PPC_970_NAP) += idle_power4.o
@@ -32,7 +32,6 @@ obj-$(CONFIG_LPARCFG) += lparcfg.o obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMEBUS) += ibmebus.o obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o -obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 16/16] powerpc: make nvram_64.o a 64bit-only object
Quoted 5 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-make-nvram_64.c-a-64bit-object.diff) Make nvram_64.o dependent on 64bit, not on MULTIPLATFORM
Signed-off-by Sascha Hauer <[email protected]>
Quoted 32 lines
Index:
arch/powerpc/kernel/Makefile
===================================================================arch/powerpc/kernel/Makefile renamed from arch/powerpc/kernel/Makefile.orig +1
-3@@ -17,7 +17,7 @@ obj-y += vdso32/ obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ signal_64.o ptrace32.o \ paca.o cpu_setup_ppc970.o \ - firmware.o sysfs.o + firmware.o sysfs.o nvram_64.o obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_PPC_970_NAP) += idle_power4.o@@ -32,7 +32,6 @@ obj-$(CONFIG_LPARCFG) += lparcfg.o obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMEBUS) += ibmebus.o obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o -obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 15/16] powerpc: clean up usage of boot_dev
In reply to [email protected]dev_t boot_dev is declared in arch/powerpc/kernel/setup_32.c and in arch/powerpc/kernel/setup_64.c but not used in these files. It is only used in arch/powerpc/platforms/powermac/setup.c, so make it static in this file
arch/powerpc/kernel/setup_32.c renamed from arch/powerpc/kernel/setup_32.c.orig +0 -4
@@ -63,10 +63,6 @@ unsigned int DMA_MODE_WRITE;int have_of =1 ; -#ifdef CONFIG_PPC_MULTIPLATFORM -dev_t boot_dev; -#endif /* CONFIG_PPC_MULTIPLATFORM */ -#ifdef CONFIG_VGA_CONSOLE unsigned long vgacon_remap_base;#endif
arch/powerpc/kernel/setup_64.c renamed from arch/powerpc/kernel/setup_64.c.orig +0 -1
@@ -71,7 +71,6 @@int have_of =1 ;int boot_cpuid =0 ; -dev_t boot_dev;u64 ppc64_pft_size;/* Pick defaults since we might want to patch instructions
arch/powerpc/platforms/powermac/setup.c renamed from arch/powerpc/platforms/powermac/setup.c.orig +1 -1
@@ -361,7 +361,7 @@ char *bootdevice;void *boot_host;int boot_target;int boot_part; -extern dev_t boot_dev; +static dev_t boot_dev;#ifdef CONFIG_SCSI void __init note_scsi_host (struct device_node *node,void *host)
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 15/16] powerpc: clean up usage of boot_dev
Quoted 8 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-pmac-move-boot_dev-to-pmac.diff)
dev_tboot_devis declared inarch/powerpc/kernel/setup_32.cand inarch/powerpc/kernel/setup_64.cbut not used in these files. It is only used inarch/powerpc/platforms/powermac/setup.c, so make it static in this fileSigned-off-by Sascha Hauer <[email protected]>
Quoted 51 lines
Index:
arch/powerpc/kernel/setup_32.c
===================================================================arch/powerpc/kernel/setup_32.c renamed from arch/powerpc/kernel/setup_32.c.orig +0
-4@@ -63,10 +63,6 @@ unsigned int DMA_MODE_WRITE;int have_of =1 ; -#ifdef CONFIG_PPC_MULTIPLATFORM -dev_t boot_dev; -#endif /* CONFIG_PPC_MULTIPLATFORM */ -#ifdef CONFIG_VGA_CONSOLE unsigned long vgacon_remap_base;#endif Index:
arch/powerpc/kernel/setup_64.c
===================================================================arch/powerpc/kernel/setup_64.c renamed from arch/powerpc/kernel/setup_64.c.orig +0
-1@@ -71,7 +71,6 @@int have_of =1 ;int boot_cpuid =0 ; -dev_t boot_dev;u64 ppc64_pft_size;/* Pick defaults since we might want to patch instructions Index:
arch/powerpc/platforms/powermac/setup.c
===================================================================arch/powerpc/platforms/powermac/setup.c renamed from arch/powerpc/platforms/powermac/setup.c.orig +1
-2@@ -361,7 +361,7 @@ char *bootdevice;void *boot_host;int boot_target;int boot_part; -extern dev_t boot_dev; +static dev_t boot_dev;#ifdef CONFIG_SCSI void __init note_scsi_host(struct device_node *node, void *host) -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF
In reply to [email protected]prom_init.o is used for OF machines, so make compilation dependent on that and not on PPC_MULTIPLATFORM
arch/powerpc/kernel/Makefile renamed from arch/powerpc/kernel/Makefile.orig +1 -2
@@ -21,7 +21,7 @@ obj-$(CONFIG_PPC64) += setup_64.o binfm obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_PPC_970_NAP) += idle_power4.o -obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o +obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o prom_init.o procfs-$(CONFIG_PPC64) := proc_ppc64.o obj-$(CONFIG_PROC_FS) += $(procfs-y) rtaspci-$(CONFIG_PPC64) := rtas_pci.o
@@ -53,7 +53,6 @@ obj-y += time.o prom.o traps.o setup- udbg.o misc.o io.o obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o -obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o obj-$(CONFIG_MODULES) += ppc_ksyms.o obj-$(CONFIG_BOOTX_TEXT) += btext.o obj-$(CONFIG_SMP) += smp.o
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF
Quoted 6 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-kernel-makefile-move-prom_init.c-to-PPC_OF.diff) prom_init.o is used for OF machines, so make compilation dependent on that and not on
PPC_MULTIPLATFORMSigned-off-by Sascha Hauer <[email protected]>
Note that CONFIG_PPC_OF is always set in arch/powerpc since that includes support for the flat device-tree... We might want to keep a separate option for prom_init.c, though I'm not too big about it right now. Maybe CONFIG_PPC_BOOT_FROM_OF :) That would allow custom kernel to be shrunk down if they don't need to support platforms that are known not to have a real OF (iSeries for example).
Quoted 32 lines
Index:
arch/powerpc/kernel/Makefile
===================================================================arch/powerpc/kernel/Makefile renamed from arch/powerpc/kernel/Makefile.orig +1
-3@@ -21,7 +21,7 @@ obj-$(CONFIG_PPC64) += setup_64.o binfm obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_PPC_970_NAP) += idle_power4.o -obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o +obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o prom_init.o procfs-$(CONFIG_PPC64) := proc_ppc64.o obj-$(CONFIG_PROC_FS) += $(procfs-y) rtaspci-$(CONFIG_PPC64) := rtas_pci.o@@ -53,7 +53,6 @@ obj-y += time.o prom.o traps.o setup- udbg.o misc.o io.o obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o -obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o obj-$(CONFIG_MODULES) += ppc_ksyms.o obj-$(CONFIG_BOOTX_TEXT) += btext.o obj-$(CONFIG_SMP) += smp.o -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF
Quoted 10 lines · Benjamin Herrenschmidt
Note that
CONFIG_PPC_OFis always set inarch/powerpcsince that includes support for the flat device-tree... We might want to keep a separate option forprom_init.c, though I'm not too big about it right now. MaybeCONFIG_PPC_BOOT_FROM_OF:) That would allow custom kernel to be shrunk down if they don't need to support platforms that are known not to have a real OF (iSeries for example).
I don't know yet where the exact boarders are in the code between real OF and flat device tree. Maybe I can look at it once I have a proper device tree for my board.
Out of curiosity I just disabled CONFIG_PPC_OF. There were two undefined references to functions I didn't need at the moment. After commenting them out the kernel compiled and booted. It saved me ~10k kernelsize, but ok, I thought I would still have flat tree support.
Sascha
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Re: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF
Quoted 8 lines
I don't know yet where the exact boarders are in the code between real OF and flat device tree. Maybe I can look at it once I have a proper device tree for my board.
Out of curiosity I just disabledCONFIG_PPC_OF. There were two undefined references to functions I didn't need at the moment. After commenting them out the kernel compiled and booted. It saved me ~10k kernelsize, but ok, I thought I would still have flat tree support.
Hrm... it's unclear, I think we changed it a couple of times. In fact, since the flat DT support is mandatory, I suppose CONFIG_PPC_OF could be used as "supports booting from a real OF". But in this case, prom_init is really the only thing that should be covered by it.
Right now, it's used for bits in pci_32.c which should always be enabled for arch/powerpc so ...
Also, I think we could safely get rid of the pci_OF_bus_map. I don't think it's ever been used and we have the devspec files now.
Ben.
Re: [patch 12/16] remove PPC_MULTIPLATFORM in for config MV643XX_ETH
In reply to [email protected]No need to depend on PPC_MULTIPLATFORM for MV643XX_ETH
drivers/net/Kconfig renamed from drivers/net/Kconfig.orig +1 -1
@@ -2292,7 +2292,7 @@ config UGETH_HAS_GIGA config MV643XX_ETH tristate "MV-643XX Ethernet support" - depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) + depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC32 select MII help This driver supports the gigabit Ethernet on the Marvell MV643XX
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 03/16] powerpc: remove dead Kconfig entries
In reply to [email protected]Remove dead Kconfig entries in arch/powerpc/platforms/embedded6xx/Kconfig. These can be easily patched back in once real support for these engine is there. No need to confuse people with these entries.
arch/powerpc/platforms/embedded6xx/Kconfig +0 -301
@@ -2,78 +2,6 @@ choice prompt "Machine Type" depends on EMBEDDED6xx -config KATANA - bool "Artesyn-Katana" - help - Select KATANA if configuring an Artesyn KATANA 750i or 3750 - cPCI board. - -config WILLOW - bool "Cogent-Willow" - -config CPCI690 - bool "Force-CPCI690" - help - Select CPCI690 if configuring a Force CPCI690 cPCI board. - -config POWERPMC250 - bool "Force-PowerPMC250" - -config CHESTNUT - bool "IBM 750FX Eval board or 750GX Eval board" - help - Select CHESTNUT if configuring an IBM 750FX Eval Board or a - IBM 750GX Eval board. - -config SPRUCE - bool "IBM-Spruce" - select PPC_INDIRECT_PCI - -config HDPU - bool "Sky-HDPU" - help - Select HDPU if configuring a Sky Computers Compute Blade. - -config HDPU_FEATURES - depends HDPU - tristate "HDPU-Features" - help - Select to enable HDPU enhanced features. - -config EV64260 - bool "Marvell-EV64260BP" - help - Select EV64260 if configuring a Marvell (formerly Galileo) - EV64260BP Evaluation platform. - -config LOPEC - bool "Motorola-LoPEC" - select PPC_I8259 - -config MVME5100 - bool "Motorola-MVME5100" - select PPC_INDIRECT_PCI - -config PPLUS - bool "Motorola-PowerPlus" - select PPC_I8259 - select PPC_INDIRECT_PCI - -config PRPMC750 - bool "Motorola-PrPMC750" - select PPC_INDIRECT_PCI - -config PRPMC800 - bool "Motorola-PrPMC800" - select PPC_INDIRECT_PCI - -config SANDPOINT - bool "Motorola-Sandpoint" - select PPC_I8259 - help - Select SANDPOINT if configuring for a Motorola Sandpoint X3 - (any flavor). - config MPC7448HPC2 bool "Freescale MPC7448HPC2(Taiga)" select TSI108_BRIDGE
@@ -84,233 +12,4 @@ config MPC7448HPC2 help Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) platform - -config RADSTONE_PPC7D - bool "Radstone Technology PPC7D board" - select PPC_I8259 - -config PAL4 - bool "SBS-Palomar4" - -config GEMINI - bool "Synergy-Gemini" - select PPC_INDIRECT_PCI - depends on BROKEN - help - 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>. - -config EST8260 - bool "EST8260" - ---help--- - The EST8260 is a single-board computer manufactured by Wind River - Systems, Inc. (formerly Embedded Support Tools Corp.) and based on - the MPC8260. Wind River Systems has a website at - <http://www.windriver.com/>, but the EST8260 cannot be found on it - and has probably been discontinued or rebadged. - -config SBC82xx - bool "SBC82xx" - ---help--- - SBC PowerQUICC II, single-board computer with MPC82xx CPU - Manufacturer: Wind River Systems, Inc. - Date of Release: May 2003 - End of Life: - - URL: <http://www.windriver.com/> - -config SBS8260 - bool "SBS8260" - -config RPX8260 - bool "RPXSUPER" - -config TQM8260 - bool "TQM8260" - ---help--- - MPC8260 based module, little larger than credit card, - up to 128 MB global + 64 MB local RAM, 32 MB Flash, - 32 kB EEPROM, 256 kB L@ Cache, 10baseT + 100baseT Ethernet, - 2 x serial ports, ... - Manufacturer: TQ Components, www.tq-group.de - Date of Release: June 2001 - End of Life: not yet :-) - URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf> - -config ADS8272 - bool "ADS8272" - -config PQ2FADS - bool "Freescale-PQ2FADS" - help - Select PQ2FADS if you wish to configure for a Freescale - PQ2FADS board (-VR or -ZU). - -config LITE5200 - bool "Freescale LITE5200 / (IceCube)" - select PPC_MPC52xx - help - Support for the LITE5200 dev board for the MPC5200 from Freescale. - This is for the LITE5200 version 2.0 board. Don't know if it changes - much but it's only been tested on this board version. I think this - board is also known as IceCube. - -config EV64360 - bool "Marvell-EV64360BP" - help - Select EV64360 if configuring a Marvell EV64360BP Evaluation - platform. endchoice - -config PQ2ADS - bool - depends on ADS8272 - default y - -config TQM8xxL - bool - depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L) - default y - -config PPC_MPC52xx - bool - -config 8260 - bool "CPM2 Support" if WILLOW - depends on 6xx - default y if TQM8260 || RPX8260 || EST8260 || SBS8260 || SBC82xx || PQ2FADS - help - The MPC8260 is a typical embedded CPU made by Motorola. Selecting - this option means that you wish to build a kernel for a machine with - an 8260 class CPU. - -config 8272 - bool - depends on 6xx - default y if ADS8272 - select 8260 - help - The MPC8272 CPM has a different internal dpram setup than other CPM2 - devices - -config CPM2 - bool - depends on 8260 || MPC8560 || MPC8555 - default y - help - The CPM2 (Communications Processor Module) is a coprocessor on - embedded CPUs made by Motorola. Selecting this option means that - you wish to build a kernel for a machine with a CPM2 coprocessor - on it (826x, 827x, 8560). - -config PPC_GEN550 - bool - depends on SANDPOINT || SPRUCE || PPLUS || \ - PRPMC750 || PRPMC800 || LOPEC || \ - (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \ - 83xx - default y - -config FORCE - bool - depends on 6xx && POWERPMC250 - default y - -config GT64260 - bool - depends on EV64260 || CPCI690 - default y - -config MV64360 # Really MV64360 & MV64460 - bool - depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU || EV64360 - default y - -config MV64X60 - bool - depends on (GT64260 || MV64360) - select PPC_INDIRECT_PCI - default y - -config TSI108_BRIDGE - bool - depends on MPC7448HPC2 - default y - -menu "Set bridge options" - depends on MV64X60 - -config NOT_COHERENT_CACHE - bool "Turn off Cache Coherency" - default n - help - Some 64x60 bridges lock up when trying to enforce cache coherency. - When this option is selected, cache coherency will be turned off. - Note that this can cause other problems (e.g., stale data being - speculatively loaded via a cached mapping). Use at your own risk. - -config MV64X60_BASE - hex "Set bridge base used by firmware" - default "0xf1000000" - help - A firmware can leave the base address of the bridge's registers at - a non-standard location. If so, set this value to reflect the - address of that non-standard location. - -config MV64X60_NEW_BASE - hex "Set bridge base used by kernel" - default "0xf1000000" - help - If the current base address of the bridge's registers is not where - you want it, set this value to the address that you want it moved to. - -endmenu - -config NONMONARCH_SUPPORT - bool "Enable Non-Monarch Support" - depends on PRPMC800 - -config HARRIER - bool - depends on PRPMC800 - default y - -config EPIC_SERIAL_MODE - bool - depends on 6xx && (LOPEC || SANDPOINT) - default y - -config MPC10X_BRIDGE - bool - depends on POWERPMC250 || LOPEC || SANDPOINT - select PPC_INDIRECT_PCI - default y - -config MPC10X_OPENPIC - bool - depends on POWERPMC250 || LOPEC || SANDPOINT - default y - -config MPC10X_STORE_GATHERING - bool "Enable MPC10x store gathering" - depends on MPC10X_BRIDGE - -config SANDPOINT_ENABLE_UART1 - bool "Enable DUART mode on Sandpoint" - depends on SANDPOINT - help - If this option is enabled then the MPC824x processor will run - in DUART mode instead of UART mode. - -config HARRIER_STORE_GATHERING - bool "Enable Harrier store gathering" - depends on HARRIER - -config MVME5100_IPMC761_PRESENT - bool "MVME5100 configured with an IPMC761" - depends on MVME5100 - select PPC_I8259 - -config SPRUCE_BAUD_33M - bool "Spruce baud clock support" - depends on SPRUCE
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 07/16] powerpc: move MPC7448HPC2 platform support to platforms/74xx
In reply to [email protected]This patch moves the only platform support in platforms/embedded6xx to a directory of its own. There seems to be no need for a embedded6xx directory since they have nothing in common.
arch/powerpc/platforms/74xx/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# +# Makefile for the 6xx/7xx/7xxxx linux kernel. +# +obj-$(CONFIG_MPC7448HPC2) += mpc7448_hpc2.o
arch/powerpc/platforms/74xx/mpc7448_hpc2.c new file +308 -0
308 lines not on this page · raw message
arch/powerpc/platforms/74xx/mpc7448_hpc2.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* mpc7448_hpc2.h +* +* Definitions for Freescale MPC7448_HPC2 platform +* +* Author: Jacob Pan +* [email protected] +* Maintainer: Roy Zang <[email protected]> +* +* 2006 (c) Freescale Semiconductor, Inc. This file is licensed under +* the terms of the GNU General Public License version 2. This program +* is licensed "as is" without any warranty of any kind, whether express +* or implied. +*/ + +#ifndef __PPC_PLATFORMS_MPC7448_HPC2_H +#define __PPC_PLATFORMS_MPC7448_HPC2_H + +#include <asm/ppcboot.h> + +/* Base Addresses for the PCI bus +*/ +#define MPC7448_HPC2_PCI_MEM_OFFSET (0x00000000) +#define MPC7448_HPC2_ISA_IO_BASE (0x00000000) +#define MPC7448_HPC2_ISA_MEM_BASE (0x00000000) +#endif /* __PPC_PLATFORMS_MPC7448_HPC2_H */
/dev/null renamed from arch/powerpc/platforms/embedded6xx/Kconfig +0 -15
@@ -1,15 +0,0 @@ -choice - prompt "Machine Type" - depends on EMBEDDED6xx - -config MPC7448HPC2 - bool "Freescale MPC7448HPC2(Taiga)" - select TSI108_BRIDGE - select DEFAULT_UIMAGE - select PPC_UDBG_16550 - select MPIC - select MPIC_WEIRD - help - Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) - platform -endchoice
/dev/null renamed from arch/powerpc/platforms/embedded6xx/Makefile +0 -4
@@ -1,4 +0,0 @@ -# -# Makefile for the 6xx/7xx/7xxxx linux kernel. -# -obj-$(CONFIG_MPC7448HPC2) += mpc7448_hpc2.o
/dev/null renamed from arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +0 -308
308 lines not on this page · raw message
/dev/null renamed from arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h +0 -26
@@ -1,26 +0,0 @@ -/* - * mpc7448_hpc2.h - * - * Definitions for Freescale MPC7448_HPC2 platform - * - * Author: Jacob Pan - * [email protected] - * Maintainer: Roy Zang <[email protected]> - * - * 2006 (c) Freescale Semiconductor, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. - */ - -#ifndef __PPC_PLATFORMS_MPC7448_HPC2_H -#define __PPC_PLATFORMS_MPC7448_HPC2_H - -#include <asm/ppcboot.h> - -/* Base Addresses for the PCI bus - */ -#define MPC7448_HPC2_PCI_MEM_OFFSET (0x00000000) -#define MPC7448_HPC2_ISA_IO_BASE (0x00000000) -#define MPC7448_HPC2_ISA_MEM_BASE (0x00000000) -#endif /* __PPC_PLATFORMS_MPC7448_HPC2_H */
arch/powerpc/platforms/Makefile renamed from arch/powerpc/platforms/Makefile.orig +1 -1
@@ -15,4 +15,4 @@ obj-$(CONFIG_PPC_ISERIES) += iseries/ obj-$(CONFIG_PPC_MAPLE) += maple/ obj-$(CONFIG_PPC_PASEMI) += pasemi/ obj-$(CONFIG_PPC_CELL) += cell/ -obj-$(CONFIG_EMBEDDED6xx) += embedded6xx/ +obj-$(CONFIG_74xx) += 74xx/
arch/powerpc/Kconfig renamed from arch/powerpc/Kconfig.orig +0 -1
@@ -602,7 +602,6 @@ config PPC_TODC endmenu -source arch/powerpc/platforms/embedded6xx/Kconfig source arch/powerpc/platforms/4xx/Kconfig source arch/powerpc/platforms/82xx/Kconfig source arch/powerpc/platforms/83xx/Kconfig
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc
In reply to [email protected]Remove inclusion of asm/processor.h for powerpc. It was used for some ppc specific hook in this file, but the hook is gone
drivers/ide/pci/via82cxxx.c +0 -4
@@ -35,10 +35,6 @@#include <linux/ide.h> #include <asm/io.h> -#ifdef CONFIG_PPC_MULTIPLATFORM -#include <asm/processor.h> -#endif -#include "ide-timing.h" #define DISPLAY_VIA_TIMINGS
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc
Quoted 4 lines · On Thu, 2006-11-02 at 13:55 +0100, [email protected] wrote:
plain text document attachment (drivers-ide-pci-via82xxx-remove-ppc-ifdef.diff) Remove inclusion of
asm/processor.hfor powerpc. It was used for some ppc specific hook in this file, but the hook is gone
It's not:
init_hwif_via82cxxx() contains:
#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
hwif->irq = hwif->channel ? 15 : 14;
}#endif
Now you can replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_CHRP
Quoted 28 lines
Signed-off-by Sascha Hauer <[email protected]>Index:
linux-2.6/drivers/ide/pci/via82cxxx.c
===================================================================drivers/ide/pci/via82cxxx.c +0
-5@@ -35,10 +35,6 @@#include <linux/ide.h> #include <asm/io.h> -#ifdef CONFIG_PPC_MULTIPLATFORM -#include <asm/processor.h> -#endif -#include "ide-timing.h" #define DISPLAY_VIA_TIMINGS -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc
Quoted 10 lines · Benjamin Herrenschmidt
Quoted 4 lines · On Thu, 2006-11-02 at 13:55 +0100, [email protected] wrote:
plain text document attachment (drivers-ide-pci-via82xxx-remove-ppc-ifdef.diff) Remove inclusion of
asm/processor.hfor powerpc. It was used for some ppc specific hook in this file, but the hook is goneIt's not:
init_hwif_via82cxxx()contains:
Quoted 8 lines
#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32) if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ? 15 : 14; }#endif
Now you can replace
CONFIG_PPC_MULTIPLATFORMwithCONFIG_PPC_CHRP
Oops, missed that one. Here is an updated version:
Remove inclusion of asm/processor.h for powerpc. It was used for some ppc specific hook in this file, but the hook is gone
ide/pci/via82cxxx.c renamed from ide/pci/via82cxxx.c.orig +2 -2
@@ -35,7 +35,7 @@#include <linux/ide.h> #include <asm/io.h> -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_CHRP #include <asm/processor.h> #endif
@@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxx hwif->speedproc = &via_set_drive; -#if defined(CONFIG_PPC_CHRP ) && defined(CONFIG_PPC32 ) +#ifdef CONFIG_PPC_CHRP if (machine_is (chrp) && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ?15 :14 ; }
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc
Quoted 20 lines · Sascha Hauer
Quoted 10 lines · Benjamin Herrenschmidt
Quoted 4 lines · On Thu, 2006-11-02 at 13:55 +0100, [email protected] wrote:
plain text document attachment (drivers-ide-pci-via82xxx-remove-ppc-ifdef.diff) Remove inclusion of
asm/processor.hfor powerpc. It was used for some ppc specific hook in this file, but the hook is goneIt's not:
init_hwif_via82cxxx()contains:Quoted 8 lines
#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32) if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ? 15 : 14; }#endif
Now you can replace
CONFIG_PPC_MULTIPLATFORMwithCONFIG_PPC_CHRP
Quoted 6 lines
Oops, missed that one. Here is an updated version:
Remove inclusion of
asm/processor.hfor powerpc. It was used for some ppc specific hook in this file, but the hook is goneSigned-off-by Sascha Hauer <[email protected]>
You should update the changelog comment :)
Ben.
Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc
In reply to Benjamin HerrenschmidtI Sent a -p0 patch by accident, forget the last one.
There is some PPC_CHRP specific code in drivers/ide/pci/via82cxxx.c, so #ifdef on CONFIG_PPC_CHRP instead of CONFIG_PPC_MULTIPLATFORM.
drivers/ide/pci/via82cxxx.c renamed from drivers/ide/pci/via82cxxx.c.orig +2 -2
@@ -35,7 +35,7 @@#include <linux/ide.h> #include <asm/io.h> -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_CHRP #include <asm/processor.h> #endif
@@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxx hwif->speedproc = &via_set_drive; -#if defined(CONFIG_PPC_CHRP ) && defined(CONFIG_PPC32 ) +#ifdef CONFIG_PPC_CHRP if (machine_is (chrp) && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ?15 :14 ; }
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Benjamin Herrenschmidt
Acked-byRe: [patch 01/16] remove inclusion of asm/processor.h for powerpc
Quoted 6 lines · Sascha Hauer
I Sent a -p0 patch by accident, forget the last one.
There is some
PPC_CHRPspecific code indrivers/ide/pci/via82cxxx.c, so #ifdef onCONFIG_PPC_CHRPinstead ofCONFIG_PPC_MULTIPLATFORM.Signed-off-by Sascha Hauer <[email protected]>
Quoted 25 lines
Index:
drivers/ide/pci/via82cxxx.c
===================================================================drivers/ide/pci/via82cxxx.c renamed from drivers/ide/pci/via82cxxx.c.orig +2
-2@@ -35,7 +35,7 @@#include <linux/ide.h> #include <asm/io.h> -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_CHRP #include <asm/processor.h> #endif @@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxx hwif->speedproc = &via_set_drive; -#if defined(CONFIG_PPC_CHRP ) && defined(CONFIG_PPC32 ) +#ifdef CONFIG_PPC_CHRP if (machine_is (chrp) && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ?15 :14 ; }
Re: [patch 04/16] powerpc: remove dead code in iommu.h
In reply to [email protected]iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are not implemented, so remove them. iommu_free_table() is pSeries specific, so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM
include/asm-powerpc/iommu.h +2 -6
@@ -70,16 +70,12 @@ struct iommu_table {struct scatterlist ;struct device_node ; -#ifdef CONFIG_PPC_MULTIPLATFORM - -/* Walks all buses and creates iommu tables */ -extern void iommu_setup_pSeries (void ); -extern void iommu_setup_dart (void ); +#ifdef CONFIG_PPC_PSERIES /* Frees table for an individual device node */ extern void iommu_free_table (struct device_node *dn); -#endif /* CONFIG_PPC_MULTIPLATFORM */ +#endif /* CONFIG_PPC_PSERIES */ /* Initializes an iommu_table based in values set in the passed-in * structure
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 04/16] powerpc: remove dead code in iommu.h
Quoted 7 lines · On Thu, 2006-11-02 at 13:55 +0100, [email protected] wrote:
plain text document attachment (powerpc-include-asm-powerpc-iommu_h-remove-dead-code.diff)
iommu_setup_pSeries()andiommu_setup_dart()are declared extern but are not implemented, so remove them.iommu_free_table()is pSeries specific, so #ifdef it withCONFIG_PPC_PSERIESand notCONFIG_PPC_MULTIPLATFORMSigned-off-by Sascha Hauer <[email protected]>
There is no need to #ifdef an extern declaration. Just remove the ifdef's and the two obsolete prototypes alltogether
Cheers,
Ben.
Quoted 34 lines
Index:
linux-2.6/include/asm-powerpc/iommu.h
===================================================================include/asm-powerpc/iommu.h +2
-7@@ -70,16 +70,12 @@ struct iommu_table {struct scatterlist ;struct device_node ; -#ifdef CONFIG_PPC_MULTIPLATFORM - -/* Walks all buses and creates iommu tables */ -extern void iommu_setup_pSeries (void ); -extern void iommu_setup_dart (void ); +#ifdef CONFIG_PPC_PSERIES /* Frees table for an individual device node */ extern void iommu_free_table (struct device_node *dn); -#endif /* CONFIG_PPC_MULTIPLATFORM */ +#endif /* CONFIG_PPC_PSERIES */ /* Initializes an iommu_table based in values set in the passed-in * structure -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9 _______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 04/16] powerpc: remove dead code in iommu.h
Quoted 7 lines · Benjamin Herrenschmidt
Quoted 6 lines · On Thu, 2006-11-02 at 13:55 +0100, [email protected] wrote:
plain text document attachment (powerpc-include-asm-powerpc-iommu_h-remove-dead-code.diff)
iommu_setup_pSeries()andiommu_setup_dart()are declared extern but are not implemented, so remove them.iommu_free_table()is pSeries specific, so #ifdef it withCONFIG_PPC_PSERIESand notCONFIG_PPC_MULTIPLATFORM
Quoted 5 lines
Quoted 1 line
Signed-off-by Sascha Hauer <[email protected]>There is no need to #ifdef an extern declaration. Just remove the ifdef's and the two obsolete prototypes alltogether
Here we go:
iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are not implemented, so remove them. iommu_free_table() is pSeries specific, so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM
include/asm-powerpc/iommu.h renamed from include/asm-powerpc/iommu.h.orig +0 -8
@@ -70,17 +70,9 @@ struct iommu_table {struct scatterlist ;struct device_node ; -#ifdef CONFIG_PPC_MULTIPLATFORM - -/* Walks all buses and creates iommu tables */ -extern void iommu_setup_pSeries (void ); -extern void iommu_setup_dart (void ); -/* Frees table for an individual device node */ extern void iommu_free_table (struct device_node *dn); -#endif /* CONFIG_PPC_MULTIPLATFORM */ -/* Initializes an iommu_table based in values set in the passed-in * structure */
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Re: [patch 04/16] powerpc: remove dead code in iommu.h
Quoted 14 lines · Sascha Hauer
Quoted 7 lines · Benjamin Herrenschmidt
Quoted 6 lines · On Thu, 2006-11-02 at 13:55 +0100, [email protected] wrote:
plain text document attachment (powerpc-include-asm-powerpc-iommu_h-remove-dead-code.diff)
iommu_setup_pSeries()andiommu_setup_dart()are declared extern but are not implemented, so remove them.iommu_free_table()is pSeries specific, so #ifdef it withCONFIG_PPC_PSERIESand notCONFIG_PPC_MULTIPLATFORMQuoted 5 lines
Quoted 1 line
Signed-off-by Sascha Hauer <[email protected]>There is no need to #ifdef an extern declaration. Just remove the ifdef's and the two obsolete prototypes alltogether
Quoted 5 lines
Here we go:
iommu_setup_pSeries()andiommu_setup_dart()are declared extern but are not implemented, so remove them.iommu_free_table()is pSeries specific, so #ifdef it withCONFIG_PPC_PSERIESand notCONFIG_PPC_MULTIPLATFORM
Same here :-)
Ben.
Quoted 25 lines
Signed-off-by Sascha Hauer <[email protected]>Index:
include/asm-powerpc/iommu.h
===================================================================include/asm-powerpc/iommu.h renamed from include/asm-powerpc/iommu.h.orig +0
-8@@ -70,17 +70,9 @@ struct iommu_table {struct scatterlist ;struct device_node ; -#ifdef CONFIG_PPC_MULTIPLATFORM - -/* Walks all buses and creates iommu tables */ -extern void iommu_setup_pSeries (void ); -extern void iommu_setup_dart (void ); -/* Frees table for an individual device node */ extern void iommu_free_table (struct device_node *dn); -#endif /* CONFIG_PPC_MULTIPLATFORM */ -/* Initializes an iommu_table based in values set in the passed-in * structure */
Re: [patch 04/16] powerpc: remove dead code in iommu.h
Subject: powerpc: remove dead code in iommu.h
From: Sascha Hauer <[email protected]>
iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are not implemented, so remove them. Remove ifdef around extern function declaration.
include/asm-powerpc/iommu.h renamed from include/asm-powerpc/iommu.h.orig +0 -8
@@ -70,17 +70,9 @@ struct iommu_table {struct scatterlist ;struct device_node ; -#ifdef CONFIG_PPC_MULTIPLATFORM - -/* Walks all buses and creates iommu tables */ -extern void iommu_setup_pSeries (void ); -extern void iommu_setup_dart (void ); -/* Frees table for an individual device node */ extern void iommu_free_table (struct device_node *dn); -#endif /* CONFIG_PPC_MULTIPLATFORM */ -/* Initializes an iommu_table based in values set in the passed-in * structure */
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
In reply to [email protected]remove EMBEDDED6xx Kconfig entry
arch/powerpc/Kconfig +0 -4
@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM RS/6000 machine, an Apple machine, or a PReP, CHRP, Maple or Cell-based machine. -config EMBEDDED6xx - bool "Embedded 6xx/7xx/7xxx-based board" - depends on PPC32 && (BROKEN||BROKEN_ON_SMP) - config APUS bool "Amiga-APUS" depends on PPC32 && BROKEN
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 11 lines · On 11/2/06, [email protected] <[email protected]> wrote:
remove EMBEDDED6xx
KconfigentrySigned-off-by Sascha Hauer <[email protected]>Index: linux-2.6/arch/powerpc/Kconfig
===================================================================arch/powerpc/Kconfig +0
-0@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM RS/6000 machine, an Apple machine, or a PReP, CHRP, Maple or Cell-based machine.
arch/powerpc/Kconfig config PPC_MULTIPLATFORM
Quoted 10 lines
arch/powerpc/Kconfig +0
-5-config EMBEDDED6xx - bool "Embedded 6xx/7xx/7xxx-based board" - depends on PPC32 && (BROKEN||BROKEN_ON_SMP) - config APUS bool "Amiga-APUS" depends on PPC32 && BROKEN --
If you do this, then where should embedded 6xx board ports go? For example; mpc52xx for which there are currently patches on the mailing list.
g.
Signature · 4 lines
Grant Likely, B.Sc. P.Eng. Secret Lab Technologies Ltd. [email protected] (403) 399-0195
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 21 lines · Grant Likely
Quoted 20 lines · On 11/2/06, [email protected] <[email protected]> wrote:
remove EMBEDDED6xx
KconfigentrySigned-off-by Sascha Hauer <[email protected]>Index: linux-2.6/arch/powerpc/Kconfig
===================================================================arch/powerpc/Kconfig +0
-4@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM RS/6000 machine, an Apple machine, or a PReP, CHRP, Maple or Cell-based machine. -config EMBEDDED6xx - bool "Embedded 6xx/7xx/7xxx-based board" - depends on PPC32 && (BROKEN||BROKEN_ON_SMP) -config APUS
bool "Amiga-APUS" depends on PPC32 && BROKEN
Quoted 5 lines
Quoted 1 line
--
If you do this, then where should embedded 6xx board ports go? For example; mpc52xx for which there are currently patches on the mailing list.
I'm too working on the mpc52xx (I have nothing to submit though at the moment, because my port is mainly copy-paste from arch=ppc).
I put my stuff under platforms/mpc52xx. I did this mainly because Nikolas states his board isn't 'embedded', but mine is. I think this shows there more a historical difference than a technical difference between 'embedded' and 'not embedded' boards.
I'm running my board as a normal MULTIPLATFORM board and it works just fine.
Sascha
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 28 lines · Sascha Hauer
Quoted 21 lines · Grant Likely
Quoted 20 lines · On 11/2/06, [email protected] <[email protected]> wrote:
remove EMBEDDED6xx
KconfigentrySigned-off-by Sascha Hauer <[email protected]>Index: linux-2.6/arch/powerpc/Kconfig
===================================================================arch/powerpc/Kconfig +0
-4@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM RS/6000 machine, an Apple machine, or a PReP, CHRP, Maple or Cell-based machine. -config EMBEDDED6xx - bool "Embedded 6xx/7xx/7xxx-based board" - depends on PPC32 && (BROKEN||BROKEN_ON_SMP) -config APUS
bool "Amiga-APUS" depends on PPC32 && BROKENQuoted 5 lines
Quoted 1 line
--
If you do this, then where should embedded 6xx board ports go? For example; mpc52xx for which there are currently patches on the mailing list.
Quoted 8 lines
I'm too working on the mpc52xx (I have nothing to submit though at the moment, because my port is mainly copy-paste from arch=ppc).
I put my stuff under platforms/mpc52xx. I did this mainly because Nikolas states his board isn't 'embedded', but mine is. I think this shows there more a historical difference than a technical difference between 'embedded' and 'not embedded' boards.
I'm running my board as a normal MULTIPLATFORM board and it works just fine.
Then perhaps Efika should also be under platforms/mpc52xx?
g.
Signature · 4 lines
Grant Likely, B.Sc. P.Eng. Secret Lab Technologies Ltd. [email protected] (403) 399-0195
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 2 lines
Then perhaps Efika should also be under platforms/mpc52xx?
Classifying platforms by their processor might not be the best idea... I makes some sense when those platforms are basically reference designs for the said processor but I yet have to be convinced it's really a good thing in the long run :)
There will be a lot of platforms that will consist of basically once signle source file. I think we need a directory for those. Maybe platform/misc :) Or we could have them at the root of platforms/ in fact...
Paulus, what is your preference in that area ?
In the long run, it doesn't really matter in the sense that it's purely the file location in the source tree, it has no effect on the content of those files (+/- include path) or at runtime. You can still build kernel with multiple images if the CPU cores are of the same category etc... Thus, in this regard, it's almost cosmetic.
Cheers,
Ben.
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 8 lines · Benjamin Herrenschmidt
Quoted 2 lines
Then perhaps Efika should also be under platforms/mpc52xx?
Classifying platforms by their processor might not be the best idea... I makes some sense when those platforms are basically reference designs for the said processor but I yet have to be convinced it's really a good thing in the long run :)
Quoted 5 lines
There will be a lot of platforms that will consist of basically once signle source file. I think we need a directory for those. Maybe platform/misc :) Or we could have them at the root of platforms/ in fact...
In the embedded world there are many vendors of custom boards, so such a directory might become very big, even if there is only one file per board. Also I like the idea that I see all affected boards at first sight when I change something in lets say the mpc52xx interrupt controller.
I don't know how this performs in the 'big computer world' where vendors combine a cpu with different chipsets. In the SoC world where every SoC has the very same interrupt controller and device layout this behaves quite well. Things become very orthogonal with per SoC directories. (I'm more familiar with arm, where directories are organized this way, so you might want to look at arch/arch/mach-* to see what I mean)
Sascha
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
In reply to Grant Likely[email protected] wrote on 11/02/2006 09:58:39 AM:
Quoted 29 lines · On 11/2/06, [email protected] <[email protected]> wrote:
Quoted 11 lines
remove EMBEDDED6xx
KconfigentrySigned-off-by Sascha Hauer <[email protected]>Index: linux-2.6/arch/powerpc/Kconfig
===================================================================arch/powerpc/Kconfig +0
-0@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM RS/6000 machine, an Apple machine, or a PReP, CHRP, Maple or Cell-based machine.arch/powerpc/Kconfig config PPC_MULTIPLATFORM
Quoted 10 lines
arch/powerpc/Kconfig +0
-5-config EMBEDDED6xx - bool "Embedded 6xx/7xx/7xxx-based board" - depends on PPC32 && (BROKEN||BROKEN_ON_SMP) - config APUS bool "Amiga-APUS" depends on PPC32 && BROKEN --If you do this, then where should embedded 6xx board ports go? For example; mpc52xx for which there are currently patches on the mailing list.
g.
Quoted 9 lines
--
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
[email protected]
(403) 399-0195
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
I also have a question about 750xx platforms. I currently am looking at adding platform code supporting IBM 750GX/CL eval boards. Where would they go - as well as others like Buckeye/Chestnut if/when they move over to /powerpc?
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 5 lines · Stephen Winiecki
I also have a question about 750xx platforms. I currently am looking at adding platform code supporting IBM 750GX/CL eval boards. Where would they go - as well as others like Buckeye/Chestnut if/when they move over to /powerpc?
I don't know - Lets wait for ben and others what they say about this approach.
My intention with this patch is to try and motivate people to integrate their machines as a part of the multiplatform support, because it doesn't cost a thing.
The presence of the embedded6xx entry and the entries in the directory itself makes people think (me too) that the multiplatform thing is only for the big irons. I think it's better to unify the two ways of platform support where it's possible.
Sascha
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Sascha Hauer <[email protected]> wrote on 11/02/2006 11:00:09 AM:
Quoted 3 lines · Stephen Winiecki
Quoted 2 lines
I also have a question about 750xx platforms. I currently am
looking at
Quoted 1 line
Quoted 1 line
adding platform code supporting IBM 750GX/CL eval boards. Where
would
Quoted 1 line
Quoted 1 line
they go - as well as others like Buckeye/Chestnut if/when they move
over
Quoted 12 lines
Quoted 1 line
to /powerpc?
I don't know - Lets wait for ben and others what they say about this approach.
My intention with this patch is to try and motivate people to integrate their machines as a part of the multiplatform support, because it doesn't cost a thing.
The presence of the embedded6xx entry and the entries in the directory itself makes people think (me too) that the multiplatform thing is only for the big irons. I think it's better to unify the two ways of platform support where it's possible.
What exactly is the intent of PPC_MULTIPLATFORM - the current desc states "Generic desktop/server/laptop" - which doesn't exactly scream 'embedded' to me either. I guess I saw embedded6xx as a 'catch-all' for everything else.
I might be missing something - but when you removed EMBEDDED6xx from powerpc/Kconfig in patch 8, and removed MPC7448HPC2 from embedded6xx/Kconfig in patch 6 - where did you move the MPC7448HPC2 config section to? Is your thought that it will depend on PPC_MULTIPLATFORM now as well?
This may be slightly off topic - but one other thing I have noticed that the new boot wrapper script supports specific 'types' of zImage files associated w/ 'MUTIPLATFORMS' (PSERIES, CHRP, PREP etc.) and uImage - which is what I think the majority of 'embedded' platforms will use by defining CONFIG_DEFAULT_UIMAGE. For IBM boards with PIBS just 'normal' zImage ELF files get loaded - I'm not sure if there should be another type defined/supported for boards which don't fit necessarily into a PSERIES/CHRP/PREP definition and also don't use uboot - CONFIG_DEFAULT_ZIMAGE?
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 5 lines
What exactly is the intent of
PPC_MULTIPLATFORM- the current desc states "Generic desktop/server/laptop" - which doesn't exactly scream 'embedded' to me either. I guess I saw embedded6xx as a 'catch-all' for everything else.
It's historical. It was the good old prep/chrp/pmac option, meaning that more than one board support can be built in the same kernel. I've made the policy decision with ARCH=powerpc that we should now make that mandatory for new boards (of course provided the CPUs are of the same family) since, as Sascha rightfully pointed out, it costs nothing and keeps things cleaner.
Thus I'm all about getting rid of the option :)
Quoted 5 lines
I might be missing something - but when you removed EMBEDDED6xx from powerpc/Kconfig in patch 8, and removed MPC7448HPC2 from embedded6xx/Kconfig in patch 6 - where did you move the MPC7448HPC2 config section to? Is your thought that it will depend on
PPC_MULTIPLATFORMnow as well?
Board support are just boolean options depending on their CPU family choice. That's the goal at least. I'm sure we are due for some Kconfig cleanup to make that more visible :) We should probably split the Kconfig into separate files for the various CPU families containing the platforms for these families.
Quoted 5 lines
This may be slightly off topic - but one other thing I have noticed that the new boot wrapper script supports specific 'types' of zImage files associated w/ 'MUTIPLATFORMS' (PSERIES, CHRP, PREP etc.) and uImage - which is what I think the majority of 'embedded' platforms will use by defining
CONFIG_DEFAULT_UIMAGE.
That is not totally clear since they have non-compatible board info.
Quoted 5 lines
For IBM boards with PIBS just 'normal' zImage ELF files get loaded -
I'm not sure if there should be another type defined/supported for boards which don't fit necessarily into a PSERIES/CHRP/PREP definition and also don't use uboot -CONFIG_DEFAULT_ZIMAGE?
Ask Paulus about the naming but pSeries is just "normal" in the sense that it's "booted from a real OF" support.
The problem is despite the ability to do those nice multiplatform kernel images, we still have bootloader incompatibilities. Thus we want to move those to the zImage wrapper which can produce, from an already built vmlinux binary, any zImage that can be supported for a given firmware interface.
In the long run, we hope that firmwares will finally get their gears together and use either a real OF entry point or a direct flat device-tree entry point, which means that a single zImage (the "normal one as you call it) will be able to boot everything.
There's also a glitch with real OF zImages due to the fact that IBM pSeries OF requires a Notes section forcing OF into real mode while Apple OF is allergic to that (it will crash badly) so we need to keep a separate zImage for PowerMac. However, the vmlinux are the same so if you use something like yaboot, the same vmlinux cna be booted on all those machines.
Ben.
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
In reply to Sascha HauerQuoted 7 lines · Sascha Hauer
Quoted 5 lines · Stephen Winiecki
I also have a question about 750xx platforms. I currently am looking at adding platform code supporting IBM 750GX/CL eval boards. Where would they go - as well as others like Buckeye/Chestnut if/when they move over to /powerpc?
Quoted 5 lines
I don't know - Lets wait for ben and others what they say about this approach.
My intention with this patch is to try and motivate people to integrate their machines as a part of the multiplatform support, because it doesn't cost a thing.
And that's a great move :) Thanks for doing that work !
Quoted 4 lines
The presence of the embedded6xx entry and the entries in the directory itself makes people think (me too) that the multiplatform thing is only for the big irons. I think it's better to unify the two ways of platform support where it's possible.
Yes. I've been wanting to get rid of it for some time.
As for new platforms, I tend to have no problem if they just create a directory of their own (platforms/chesnut, etc...) though in some we might want a grab bag for boards that really only need one file...
This could be a plaforms/misc, or platforms/simple, or just have them at the root of platforms...
Ben.
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
Quoted 6 lines · Benjamin Herrenschmidt
As for new platforms, I tend to have no problem if they just create a directory of their own (platforms/chesnut, etc...) though in some we might want a grab bag for boards that really only need one file...
This could be a plaforms/misc, or platforms/simple, or just have them at the root of platforms...
Root of platforms makes sense to me.
g.
Signature · 4 lines
Grant Likely, B.Sc. P.Eng. Secret Lab Technologies Ltd. [email protected] (403) 399-0195
Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry
In reply to [email protected]Quoted 3 lines · On 11/2/06, [email protected] <[email protected]> wrote:
remove EMBEDDED6xx
KconfigentrySigned-off-by Sascha Hauer <[email protected]>
FWIW, I'm going to say ACK on this one. Since this discussion, I've moved my lite5200 support out of platforms/embedded6xx and changed it to use CONFIG_PPC_MULTIPLATFORM
Cheers,
g.
Quoted 28 lines
Index: linux-2.6/arch/powerpc/Kconfig
===================================================================arch/powerpc/Kconfig +0
-5@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM RS/6000 machine, an Apple machine, or a PReP, CHRP, Maple or Cell-based machine. -config EMBEDDED6xx - bool "Embedded 6xx/7xx/7xxx-based board" - depends on PPC32 && (BROKEN||BROKEN_ON_SMP) - config APUS bool "Amiga-APUS" depends on PPC32 && BROKEN -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Signature · 4 lines
Grant Likely, B.Sc. P.Eng. Secret Lab Technologies Ltd. [email protected] (403) 399-0195
Re: [patch 05/16] powerpc: remove ifdef
In reply to [email protected]current kernels always have one of CONFIG_PPC_MULTIPLATFORM or CONFIG_PPC32 defined, so remove bogus ifdef
include/asm-powerpc/pci.h +0 -2
@@ -238,12 +238,10 @@ extern pgprot_t pci_phys_mem_access_protunsigned long size, pgprot_t prot); -#if defined(CONFIG_PPC_MULTIPLATFORM ) || defined(CONFIG_PPC32 )#define HAVE_ARCH_PCI_RESOURCE_TO_USER extern void pci_resource_to_user (const struct pci_dev *dev,int bar,const struct resource *rsrc,resource_size_t *start,resource_size_t *end); -#endif /* CONFIG_PPC_MULTIPLATFORM || CONFIG_PPC32 */ #endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_PCI_H */
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 05/16] powerpc: remove ifdef
Quoted 6 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-include-asm-powerpc-pci_h-remove-ifdef.diff) current kernels always have one of
CONFIG_PPC_MULTIPLATFORMorCONFIG_PPC32defined, so remove bogus ifdefSigned-off-by Sascha Hauer <[email protected]>
Quoted 28 lines
Index:
linux-2.6/include/asm-powerpc/pci.h
===================================================================include/asm-powerpc/pci.h +0
-3@@ -238,12 +238,10 @@ extern pgprot_t pci_phys_mem_access_protunsigned long size, pgprot_t prot); -#if defined(CONFIG_PPC_MULTIPLATFORM ) || defined(CONFIG_PPC32 )#define HAVE_ARCH_PCI_RESOURCE_TO_USER extern void pci_resource_to_user (const struct pci_dev *dev,int bar,const struct resource *rsrc,resource_size_t *start,resource_size_t *end); -#endif /* CONFIG_PPC_MULTIPLATFORM || CONFIG_PPC32 */ #endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_PCI_H */ -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 06/16] powerpc: remove _machine
In reply to [email protected]The _machine macro was once used for compatibility with ARCH=ppc drivers. It is unused in current kernels
include/asm-powerpc/processor.h renamed from include/asm-powerpc/processor.h.orig +0 -4
@@ -53,10 +53,6 @@ extern unsigned char ucBoardRevMaj, ucBo#endif /* CONFIG_PPC_PREP */ -#ifndef CONFIG_PPC_MULTIPLATFORM -#define _machine 0 -#endif /* CONFIG_PPC_MULTIPLATFORM */ -#endif /* defined(__KERNEL__) && defined(CONFIG_PPC32) */ /*
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 06/16] powerpc: remove _machine
Quoted 6 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-include-asm-powerpc-processor_h-remove-_machine.diff) The
_machinemacro was once used for compatibility with ARCH=ppc drivers. It is unused in current kernelsSigned-off-by Sascha Hauer <[email protected]>
Quoted 26 lines
Index:
include/asm-powerpc/processor.h
===================================================================include/asm-powerpc/processor.h renamed from include/asm-powerpc/processor.h.orig +0
-5@@ -53,10 +53,6 @@ extern unsigned char ucBoardRevMaj, ucBo#endif /* CONFIG_PPC_PREP */ -#ifndef CONFIG_PPC_MULTIPLATFORM -#define _machine 0 -#endif /* CONFIG_PPC_MULTIPLATFORM */ -#endif /* defined(__KERNEL__) && defined(CONFIG_PPC32) */ /* -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9 _______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 09/16] powerpc: remove occurences of PPC_MULTIPLATFORM in head_64.S
In reply to [email protected]Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit kernel without MULTIPLATFORM, so PPC_MULTIPLATFORM can be removed in 64bit-only files
arch/powerpc/kernel/head_64.S renamed from arch/powerpc/kernel/head_64.S.orig +0 -11
@@ -74,13 +74,11 @@ .text .globl _stext _stext: -#ifdef CONFIG_PPC_MULTIPLATFORM _GLOBAL(__start) /* NOP this out unconditionally */ BEGIN_FTR_SECTION b .__start_initialization_multiplatform END_FTR_SECTION(0, 1) -#endif /* CONFIG_PPC_MULTIPLATFORM */ /* Catch branch to 0 in real mode */ trap
@@ -1595,7 +1593,6 @@ _STATIC(__start_initialization_iSeries) b .start_here_common #endif /* CONFIG_PPC_ISERIES */ -#ifdef CONFIG_PPC_MULTIPLATFORM _STATIC(__mmu_off) mfmsr r3
@@ -1621,13 +1618,11 @@ _STATIC(__mmu_off) * */ _GLOBAL(__start_initialization_multiplatform) -#ifdef CONFIG_PPC_MULTIPLATFORM /* * Are we booted from a PROM Of-type client-interface ? */ cmpldi cr0,r5,0 bne .__boot_from_prom /* yes -> prom */ -#endif /* Save parameters */ mr r31,r3
@@ -1656,7 +1651,6 @@ _GLOBAL(__start_initialization_multiplat bl .__mmu_off b .__after_prom_start -#ifdef CONFIG_PPC_MULTIPLATFORM _STATIC(__boot_from_prom) /* Save parameters */ mr r31,r3
@@ -1696,7 +1690,6 @@ _STATIC(__boot_from_prom) bl .prom_init /* We never return */ trap -#endif /* * At this point, r3 contains the physical address we are running at,
@@ -1752,8 +1745,6 @@ _STATIC(__after_prom_start) bl .copy_and_flush /* copy the rest */ b .start_here_multiplatform -#endif /* CONFIG_PPC_MULTIPLATFORM */ - /* * Copy routine used to copy the kernel to start at physical address 0 * and flush and invalidate the caches as needed.
@@ -1913,7 +1904,6 @@ _GLOBAL(enable_64b_mode) isync blr -#ifdef CONFIG_PPC_MULTIPLATFORM /* * This is where the main kernel code starts. */
@@ -1977,7 +1967,6 @@ _STATIC(start_here_multiplatform) mtspr SPRN_SRR1,r4 rfid b . /* prevent speculative execution */ -#endif /* CONFIG_PPC_MULTIPLATFORM */ /* This is where all platforms converge execution */ _STATIC(start_here_common)
arch/powerpc/kernel/entry_64.S renamed from arch/powerpc/kernel/entry_64.S.orig +0 -4
@@ -735,8 +735,6 @@ _STATIC(rtas_restore_regs) #endif /* CONFIG_PPC_RTAS */ -#ifdef CONFIG_PPC_MULTIPLATFORM - _GLOBAL(enter_prom) mflr r0 std r0,16(r1)
@@ -821,5 +819,3 @@ _GLOBAL(enter_prom) ld r0,16(r1) mtlr r0 blr - -#endif /* CONFIG_PPC_MULTIPLATFORM */
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Re: [patch 10/16] powerpc: make hash_native_64.o a 64bit-only object
In reply to [email protected]Make hash_native_64.o dependent on 64bit, not on MULTIPLATFORM
arch/powerpc/mm/Makefile renamed from arch/powerpc/mm/Makefile.orig +1 -1
@@ -8,7 +8,7 @@ endif obj-y := fault.o mem.o lmb.o obj-$(CONFIG_PPC32) += init_32.o pgtable_32.o mmu_context_32.o -hash-$(CONFIG_PPC_MULTIPLATFORM) := hash_native_64.o +hash-$(CONFIG_PPC64) := hash_native_64.o obj-$(CONFIG_PPC64) += init_64.o pgtable_64.o mmu_context_64.o \ hash_utils_64.o hash_low_64.o tlb_64.o \ slb_low.o slb.o stab.o mmap.o imalloc.o \
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 10/16] powerpc: make hash_native_64.o a 64bit-only object
Quoted 5 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-mm-makefile-hash_native_64-make-obj64.diff) Make hash_native_64.o dependent on 64bit, not on MULTIPLATFORM
Signed-off-by Sascha Hauer <[email protected]>
If we ever want it, we might have specific Kconfig options for the various low level MMU interfaces and have the platform select them, but for now, that's fine.
Quoted 24 lines
Index:
arch/powerpc/mm/Makefile
===================================================================arch/powerpc/mm/Makefile renamed from arch/powerpc/mm/Makefile.orig +1
-2@@ -8,7 +8,7 @@ endif obj-y := fault.o mem.o lmb.o obj-$(CONFIG_PPC32) += init_32.o pgtable_32.o mmu_context_32.o -hash-$(CONFIG_PPC_MULTIPLATFORM) := hash_native_64.o +hash-$(CONFIG_PPC64) := hash_native_64.o obj-$(CONFIG_PPC64) += init_64.o pgtable_64.o mmu_context_64.o \ hash_utils_64.o hash_low_64.o tlb_64.o \ slb_low.o slb.o stab.o mmap.o imalloc.o \ -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 14/16] powerpc: make initialization of OF hooks dependent on PPC_OF
In reply to [email protected]Make initialization of OF hooks dependent on PPC_OF, not on MULTIPLATFORM
arch/powerpc/kernel/head_32.S renamed from arch/powerpc/kernel/head_32.S.orig +1 -1
@@ -119,7 +119,7 @@ __start: * because OF may have I/O devices mapped into that area * (particularly on CHRP). */ -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_OF cmpwi 0,r5,0 beq 1f bl prom_init
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 14/16] powerpc: make initialization of OF hooks dependent on PPC_OF
Quoted 5 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-head_32.S-remove-MULTIPLATFORM.diff)
Make initialization of OF hooks dependent onPPC_OF, not on MULTIPLATFORMSigned-off-by Sascha Hauer <[email protected]>
Though see my comment about your previous patch... In fact, they could be one patch since things might not work/build if you only apply one of them. So 13 and 14 should be folded into one.
Quoted 24 lines
Index:
arch/powerpc/kernel/head_32.S
===================================================================arch/powerpc/kernel/head_32.S renamed from arch/powerpc/kernel/head_32.S.orig +1
-2@@ -119,7 +119,7 @@ __start: * because OF may have I/O devices mapped into that area * (particularly on CHRP). */ -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_OF cmpwi 0,r5,0 beq 1f bl prom_init -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 02/16] replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver
In reply to [email protected]replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in drivers/net/tulip/de4x5.c. It is needed for a pmac specific hook but has nothing with to do with PPC_MULTIPLATFORM
drivers/net/tulip/de4x5.c +4 -4
@@ -473,9 +473,9 @@#include <asm/byteorder.h> #include <asm/unaligned.h> #include <asm/uaccess.h> -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_PMAC #include <asm/machdep.h> -#endif /* CONFIG_PPC_MULTIPLATFORM */ +#endif /* CONFIG_PPC_PMAC */ #include "de4x5.h"
@@ -4151,7 +4151,7 @@ get_hw_addr(struct net_device *dev)/* If possible, try to fix a broken card - SMC only so far */ srom_repair (dev, broken); -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_PMAC /* ** If the address starts with 00 a0, we have to bit-reverse ** each byte of the address.
@@ -4168,7 +4168,7 @@ get_hw_addr(struct net_device *dev) dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1); } } -#endif /* CONFIG_PPC_MULTIPLATFORM */ +#endif /* CONFIG_PPC_PMAC */ /* Test for a bad enet address */ status =test_bad_enet (dev, status);
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 02/16] replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver
Quoted 7 lines · On Thu, 2006-11-02 at 13:55 +0100, [email protected] wrote:
plain text document attachment (drivers-net-tulip-de4x5-remove-MULTIPLATFORM.diff) replace
CONFIG_PPC_MULTIPLATFORMwithCONFIG_PPC_PMACindrivers/net/tulip/de4x5.c. It is needed for a pmac specific hook but has nothing with to do withPPC_MULTIPLATFORMSigned-off-by Sascha Hauer <[email protected]>
Quoted 45 lines
Index:
linux-2.6/drivers/net/tulip/de4x5.c
===================================================================drivers/net/tulip/de4x5.c +4
-5@@ -473,9 +473,9 @@#include <asm/byteorder.h> #include <asm/unaligned.h> #include <asm/uaccess.h> -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_PMAC #include <asm/machdep.h> -#endif /* CONFIG_PPC_MULTIPLATFORM */ +#endif /* CONFIG_PPC_PMAC */ #include "de4x5.h" @@ -4151,7 +4151,7 @@ get_hw_addr(struct net_device *dev)/* If possible, try to fix a broken card - SMC only so far */ srom_repair (dev, broken); -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_PPC_PMAC /* ** If the address starts with 00 a0, we have to bit-reverse ** each byte of the address. @@ -4168,7 +4168,7 @@ get_hw_addr(struct net_device *dev) dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1); } } -#endif /* CONFIG_PPC_MULTIPLATFORM */ +#endif /* CONFIG_PPC_PMAC */ /* Test for a bad enet address */ status =test_bad_enet (dev, status); -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 11/16] powerpc: remove occurences of PPC_MULTIPLATFORM in pci_64.c
In reply to [email protected]Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit kernel without MULTIPLATFORM, so PPC_MULTIPLATFORM can be removed in 64bit-only files
arch/powerpc/kernel/pci_64.c renamed from arch/powerpc/kernel/pci_64.c.orig +2 -12
@@ -42,11 +42,9 @@unsigned long pci_probe_only =1 ;int pci_assign_all_buses =0 ; -#ifdef CONFIG_PPC_MULTIPLATFORM static void fixup_resource (struct resource *res,struct pci_dev *dev);static void do_bus_setup (struct pci_bus *bus);static void phbs_remap_io (void ); -#endif /* pci_io_base -- the base address from which io bars are offsets. * This is the lowest I/O base address (so bar values are always positive),
@@ -251,7 +249,6 @@ static void __init pcibios_claim_of_setupcibios_claim_one_bus (b); } -#ifdef CONFIG_PPC_MULTIPLATFORM static u32 get_int_prop (struct device_node *np,const char *name,u32 def) {const u32 *prop;
@@ -506,7 +503,6 @@ void __devinit of_scan_pci_bridge(structpci_scan_child_bus (bus); }EXPORT_SYMBOL (of_scan_pci_bridge); -#endif /* CONFIG_PPC_MULTIPLATFORM */ void __devinit scan_phb (struct pci_controller *hose) {
@@ -540,7 +536,7 @@ void __devinit scan_phb(struct pci_contr } mode =PCI_PROBE_NORMAL ; -#ifdef CONFIG_PPC_MULTIPLATFORM +if (node && ppc_md.pci_probe_mode) mode = ppc_md.pci_probe_mode (bus);DBG (" probe mode: %d\n" , mode);
@@ -548,7 +544,7 @@ void __devinit scan_phb(struct pci_contr bus->subordinate = hose->last_busno;of_scan_bus (node, bus); } -#endif /* CONFIG_PPC_MULTIPLATFORM */ +if (mode ==PCI_PROBE_NORMAL ) hose->last_busno = bus->subordinate =pci_scan_child_bus (bus); }
@@ -592,11 +588,9 @@ static int __init pcibios_init(void)if (ppc64_isabridge_dev !=NULL )printk (KERN_DEBUG "ISA bridge at %s\n" ,pci_name (ppc64_isabridge_dev)); -#ifdef CONFIG_PPC_MULTIPLATFORM if (!firmware_has_feature (FW_FEATURE_ISERIES ))/* map in PCI I/O space */ phbs_remap_io (); -#endif printk (KERN_DEBUG "PCI: Probing PCI hardware done\n" );
@@ -873,8 +867,6 @@ void pcibios_add_platform_entries(structdevice_create_file (&pdev->dev, &dev_attr_devspec); } -#ifdef CONFIG_PPC_MULTIPLATFORM -#define ISA_SPACE_MASK 0x1#define ISA_SPACE_IO 0x1
@@ -1343,8 +1335,6 @@ struct pci_controller* pci_find_hose_forreturn NULL ; } -#endif /* CONFIG_PPC_MULTIPLATFORM */ -unsigned long pci_address_to_pio (phys_addr_t address) {struct pci_controller *hose, *tmp;
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
Benjamin Herrenschmidt
Acked-byRe: [patch 11/16] powerpc: remove occurences of PPC_MULTIPLATFORM in pci_64.c
Quoted 7 lines · On Thu, 2006-11-02 at 13:56 +0100, [email protected] wrote:
plain text document attachment (powerpc-pci_64.S-remove-MULTIPLATFORM.diff)
Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit kernel without MULTIPLATFORM, soPPC_MULTIPLATFORMcan be removed in 64bit-only filesSigned-off-by Sascha Hauer <[email protected]>
Quoted 91 lines
Index:
arch/powerpc/kernel/pci_64.c
===================================================================arch/powerpc/kernel/pci_64.c renamed from arch/powerpc/kernel/pci_64.c.orig +2
-13@@ -42,11 +42,9 @@unsigned long pci_probe_only =1 ;int pci_assign_all_buses =0 ; -#ifdef CONFIG_PPC_MULTIPLATFORM static void fixup_resource (struct resource *res,struct pci_dev *dev);static void do_bus_setup (struct pci_bus *bus);static void phbs_remap_io (void ); -#endif /* pci_io_base -- the base address from which io bars are offsets. * This is the lowest I/O base address (so bar values are always positive), @@ -251,7 +249,6 @@ static void __init pcibios_claim_of_setupcibios_claim_one_bus (b); } -#ifdef CONFIG_PPC_MULTIPLATFORM static u32 get_int_prop (struct device_node *np,const char *name,u32 def) {const u32 *prop;@@ -506,7 +503,6 @@ void __devinit of_scan_pci_bridge(structpci_scan_child_bus (bus); }EXPORT_SYMBOL (of_scan_pci_bridge); -#endif /* CONFIG_PPC_MULTIPLATFORM */ void __devinit scan_phb (struct pci_controller *hose) {@@ -540,7 +536,7 @@ void __devinit scan_phb(struct pci_contr } mode =PCI_PROBE_NORMAL ; -#ifdef CONFIG_PPC_MULTIPLATFORM +if (node && ppc_md.pci_probe_mode) mode = ppc_md.pci_probe_mode (bus);DBG (" probe mode: %d\n" , mode);@@ -548,7 +544,7 @@ void __devinit scan_phb(struct pci_contr bus->subordinate = hose->last_busno;of_scan_bus (node, bus); } -#endif /* CONFIG_PPC_MULTIPLATFORM */ +if (mode ==PCI_PROBE_NORMAL ) hose->last_busno = bus->subordinate =pci_scan_child_bus (bus); }@@ -592,11 +588,9 @@ static int __init pcibios_init(void)if (ppc64_isabridge_dev !=NULL )printk (KERN_DEBUG "ISA bridge at %s\n" ,pci_name (ppc64_isabridge_dev)); -#ifdef CONFIG_PPC_MULTIPLATFORM if (!firmware_has_feature (FW_FEATURE_ISERIES ))/* map in PCI I/O space */ phbs_remap_io (); -#endif printk (KERN_DEBUG "PCI: Probing PCI hardware done\n" );@@ -873,8 +867,6 @@ void pcibios_add_platform_entries(structdevice_create_file (&pdev->dev, &dev_attr_devspec); } -#ifdef CONFIG_PPC_MULTIPLATFORM -#define ISA_SPACE_MASK 0x1#define ISA_SPACE_IO 0x1@@ -1343,8 +1335,6 @@ struct pci_controller* pci_find_hose_forreturn NULL ; } -#endif /* CONFIG_PPC_MULTIPLATFORM */ -unsigned long pci_address_to_pio (phys_addr_t address) {struct pci_controller *hose, *tmp; -- Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Hi all and Ben,
What's the further way with these patches (at least the the ones Ben acked)? Are they picked up from here or shall I post them to the patch system?
Sascha
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9Quoted 5 lines · Sascha Hauer
Hi all and Ben,
What's the further way with these patches (at least the the ones Ben acked)? Are they picked up from here or shall I post them to the patch system?
Paulus should pick them up if he didn't already.
Ben.
Quoted 3 lines · Sascha Hauer
What's the further way with these patches (at least the the ones Ben acked)? Are they picked up from here or shall I post them to the patch system?
I picked up the ones that there was agreement on or that seemed obvious, and they are now in the powerpc.git tree on the for-2.6.20 and master branches. As for the rest, if you want them in you'll need to repost them with the changes that were requested, or else convince people that your original patch is actually correct.
Paul.
Quoted 11 lines · Paul Mackerras
Quoted 3 lines · Sascha Hauer
What's the further way with these patches (at least the the ones Ben acked)? Are they picked up from here or shall I post them to the patch system?
I picked up the ones that there was agreement on or that seemed obvious, and they are now in the powerpc.git tree on the for-2.6.20 and master branches. As for the rest, if you want them in you'll need to repost them with the changes that were requested, or else convince people that your original patch is actually correct.
Ah, thank you. I wasn't aware of your git tree. I'll look at the rest of the patches soon.
Sascha
Signature · 5 lines
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9