RFC: powerpc: remove GEMINI support?
I just saw the commit message below.
There seems to have been some although unmerged work on APUS support by Roman, but I didn't find any recent work on bringing the GEMINI support back into life.
Is this a wrong impression, or would a patch to remove it be OK?
cu
Adrian
commit e8be1c8e065691c332fd8e9bae70c7096a69c31d
Author: Kumar Gala <[email protected]> Date: Sun Jul 31 22:34:51 2005 -0700
[PATCH] ppc32: Mark boards that don't build as BROKEN
Marked APUS and GEMINI as BROKEN since they do not build at the platform level. We have requested that the maintainers of these boards/platforms fix them by the time 2.6.15 is released or we plan on concerning them unmaintained and thus removing them.
arch/ppc/Kconfig +2 -0
@@ -558,6 +558,7 @@ config PPC_MULTIPLATFORM config APUS bool "Amiga-APUS" + depends on BROKEN help Select APUS if configuring for a PowerUP Amiga. More information is available at:
@@ -647,6 +648,7 @@ config PAL4 config GEMINI bool "Synergy-Gemini" + depends on BROKEN help Select Gemini if configuring for a Synergy Microsystems' Gemini series Single Board Computer. More information is available at:
PATCH 1/1 powerpc: remove the broken Gemini support
Quoted 8 lines · Adrian Bunk
I just saw the commit message below.
There seems to have been some although unmerged work on APUS support by Roman, but I didn't find any recent work on bringing the GEMINI support back into life.
Is this a wrong impression, or would a patch to remove it be OK?
...
Zero feedback, patch to remove it below.
cu
Adrian
<-- snip -->
This patch removes the broken Gemini support.
---
arch/powerpc/kernel/head_32.S | 5 arch/powerpc/platforms/embedded6xx/Kconfig | 9 arch/ppc/Kconfig | 9 arch/ppc/boot/simple/Makefile | 4 arch/ppc/boot/simple/misc.c | 15 arch/ppc/configs/gemini_defconfig | 618 --------------------- arch/ppc/kernel/head.S | 18 arch/ppc/platforms/Makefile | 1 arch/ppc/platforms/gemini.h | 165 ----- arch/ppc/platforms/gemini_pci.c | 41 - arch/ppc/platforms/gemini_prom.S | 90 --- arch/ppc/platforms/gemini_serial.h | 40 - arch/ppc/platforms/gemini_setup.c | 577 ------------------- arch/ppc/syslib/Makefile | 1 arch/ppc/xmon/start.c | 5 include/asm-ppc/serial.h | 2 16 files changed, 2 insertions(+), 1598 deletions(-)
arch/powerpc/kernel/head_32.S renamed from arch/powerpc/kernel/head_32.S.old +0 -5
@@ -344,12 +344,7 @@ /* System reset */ /* core99 pmac starts the seconary here by changing the vector, and putting it back to what it was (unknown_exception) when done. */ -#if defined(CONFIG_GEMINI) && defined(CONFIG_SMP) - . = 0x100 - b __secondary_start_gemini -#else EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD) -#endif /* Machine check */ /*
arch/powerpc/platforms/embedded6xx/Kconfig renamed from arch/powerpc/platforms/embedded6xx/Kconfig.old +0 -9
@@ -104,15 +104,6 @@ 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---
arch/ppc/Kconfig renamed from arch/ppc/Kconfig.old +0 -9
@@ -670,15 +670,6 @@ config PAL4 bool "SBS-Palomar4" -config GEMINI - bool "Synergy-Gemini" - depends on BROKEN - select PPC_INDIRECT_PCI - 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---
arch/ppc/boot/simple/Makefile renamed from arch/ppc/boot/simple/Makefile.old +0 -4
@@ -116,10 +116,6 @@ extra.o-$(CONFIG_CHESTNUT) := misc-chestnut.o end-$(CONFIG_CHESTNUT) := chestnut - zimage-$(CONFIG_GEMINI) := zImage-STRIPELF -zimageinitrd-$(CONFIG_GEMINI) := zImage.initrd-STRIPELF - end-$(CONFIG_GEMINI) := gemini - extra.o-$(CONFIG_KATANA) := misc-katana.o end-$(CONFIG_KATANA) := katana cacheflag-$(CONFIG_KATANA) := -include $(clear_L2_L3)
arch/ppc/boot/simple/misc.c renamed from arch/ppc/boot/simple/misc.c.old +1 -14
@@ -42,14 +42,11 @@#endif /* Will / Can the user give input? -* Val Henson has requested that Gemini doesn't wait for the -* user to edit the cmdline or not. */ #if (defined(CONFIG_SERIAL_8250_CONSOLE ) \ || defined(CONFIG_VGA_CONSOLE ) \ || defined(CONFIG_SERIAL_MPC52xx_CONSOLE) \ - || defined(CONFIG_SERIAL_MPSC_CONSOLE )) \ - && !defined(CONFIG_GEMINI ) + || defined(CONFIG_SERIAL_MPSC_CONSOLE ))#define INTERACTIVE_CONSOLE 1#endif
@@ -178,16 +175,6 @@if (keyb_present)CRT_tstc ();/* Forces keyboard to be initialized */ -#ifdef CONFIG_GEMINI -/* -* If cmd_line is empty and cmd_preset is not, copy cmd_preset -* to cmd_line. This way we can override cmd_preset with the -* command line from Smon. -*/ - -if ( (cmd_line[0 ] =='\0' ) && (cmd_preset[0 ] !='\0' )) -memcpy (cmd_line, cmd_preset,sizeof (cmd_preset)); -#endif /* Display standard Linux/PPC boot prompt for kernel args */ puts ("\nLinux/PPC load: " );
arch/ppc/kernel/head.S renamed from arch/ppc/kernel/head.S.old +0 -18
@@ -310,12 +310,7 @@ /* System reset */ /* core99 pmac starts the seconary here by changing the vector, and putting it back to what it was (unknown_exception) when done. */ -#if defined(CONFIG_GEMINI) && defined(CONFIG_SMP) - . = 0x100 - b __secondary_start_gemini -#else EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD) -#endif /* Machine check */ . = 0x200
@@ -897,19 +892,6 @@ #endif /* CONFIG_APUS */ #ifdef CONFIG_SMP -#ifdef CONFIG_GEMINI - .globl __secondary_start_gemini -__secondary_start_gemini: - mfspr r4,SPRN_HID0 - ori r4,r4,HID0_ICFI - li r3,0 - ori r3,r3,HID0_ICE - andc r4,r4,r3 - mtspr SPRN_HID0,r4 - sync - b __secondary_start -#endif /* CONFIG_GEMINI */ - .globl __secondary_start_pmac_0 __secondary_start_pmac_0: /* NB the entries for cpus 0, 1, 2 must each occupy 8 bytes. */
arch/ppc/platforms/Makefile renamed from arch/ppc/platforms/Makefile.old +0 -1
@@ -13,7 +13,6 @@ obj-$(CONFIG_CPCI690) += cpci690.o obj-$(CONFIG_EV64260) += ev64260.o obj-$(CONFIG_CHESTNUT) += chestnut.o -obj-$(CONFIG_GEMINI) += gemini_pci.o gemini_setup.o gemini_prom.o obj-$(CONFIG_LOPEC) += lopec.o obj-$(CONFIG_KATANA) += katana.o obj-$(CONFIG_HDPU) += hdpu.o
arch/ppc/syslib/Makefile renamed from arch/ppc/syslib/Makefile.old +0 -1
@@ -45,7 +45,6 @@ obj-$(CONFIG_EV64260) += todc_time.o pci_auto.o obj-$(CONFIG_EV64360) += todc_time.o obj-$(CONFIG_CHESTNUT) += mv64360_pic.o pci_auto.o -obj-$(CONFIG_GEMINI) += open_pic.o obj-$(CONFIG_GT64260) += gt64260_pic.o obj-$(CONFIG_LOPEC) += pci_auto.o todc_time.o obj-$(CONFIG_HDPU) += pci_auto.o
arch/ppc/xmon/start.c renamed from arch/ppc/xmon/start.c.old +1 -4
@@ -58,10 +58,7 @@void xmon_map_scc (void ) { -#if defined(CONFIG_GEMINI ) -/* should already be mapped by the kernel boot */ - sccd = (volatile unsigned char *)0xffeffb08 ; -#elif defined(CONFIG_405GP ) +#if defined(CONFIG_405GP ) sccd = (volatile unsigned char *)0xef600300 ;#elif defined(CONFIG_440EP ) sccd = (volatile unsigned char *)ioremap (PPC440EP_UART0_ADDR ,8 );
include/asm-ppc/serial.h renamed from include/asm-ppc/serial.h.old +0 -2
@@ -11,8 +11,6 @@#include <platforms/ev64260.h> #elif defined(CONFIG_CHESTNUT )#include <platforms/chestnut.h> -#elif defined(CONFIG_GEMINI ) -#include <platforms/gemini_serial.h> #elif defined(CONFIG_POWERPMC250 )#include <platforms/powerpmc250.h> #elif defined(CONFIG_LOPEC )
arch/ppc/platforms/gemini.h deleted +0 -165
165 lines not on this page · raw message
arch/ppc/platforms/gemini_pci.c deleted +0 -41
41 lines not on this page · raw message
arch/ppc/platforms/gemini_prom.S deleted +0 -90
90 lines not on this page · raw message
arch/ppc/platforms/gemini_serial.h deleted +0 -40
@@ -1,40 +0,0 @@ -#ifdef __KERNEL__ -#ifndef __ASMPPC_GEMINI_SERIAL_H -#define __ASMPPC_GEMINI_SERIAL_H - -#include <platforms/gemini.h> - -#ifdef CONFIG_SERIAL_MANY_PORTS -#define RS_TABLE_SIZE 64 -#else -#define RS_TABLE_SIZE 4 -#endif - -/* Rate for the 24.576 Mhz clock for the onboard serial chip */ -#define BASE_BAUD (24576000 / 16) - -#ifdef CONFIG_SERIAL_DETECT_IRQ -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST|ASYNC_AUTO_IRQ) -#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_AUTO_IRQ) -#else -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST) -#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF) -#endif - -#define STD_SERIAL_PORT_DEFNS \ - { 0, BASE_BAUD, GEMINI_SERIAL_A, 15, STD_COM_FLAGS }, /* ttyS0 */ \ - { 0, BASE_BAUD, GEMINI_SERIAL_B, 14, STD_COM_FLAGS }, /* ttyS1 */ \ - -#ifdef CONFIG_GEMINI_PU32 -#define PU32_SERIAL_PORT_DEFNS \ - { 0, BASE_BAUD, NULL, 0, STD_COM_FLAGS }, -#else -#define PU32_SERIAL_PORT_DEFNS -#endif - -#define SERIAL_PORT_DFNS \ - STD_SERIAL_PORT_DEFNS \ - PU32_SERIAL_PORT_DEFNS - -#endif -#endif /* __KERNEL__ */
arch/ppc/platforms/gemini_setup.c deleted +0 -577
577 lines not on this page · raw message
arch/ppc/configs/gemini_defconfig deleted +0 -618
618 lines not on this page · raw message
Re: [2.6 patch] powerpc: remove the broken Gemini support
Quoted 7 lines · Adrian Bunk
Quoted 6 lines · Adrian Bunk
I just saw the commit message below.
There seems to have been some although unmerged work on APUS support by Roman, but I didn't find any recent work on bringing the GEMINI support back into life.
Quoted 7 lines
Quoted 2 lines
Is this a wrong impression, or would a patch to remove it be OK?
...Zero feedback, patch to remove it below.
cu
Adrian
I'm good with removing GEMINI since no one seems to have raised any fuss about this and I brought the issue up over a year ago now. However, I leave the final decision up to Paul.
Also, where do we stand with APUS?
- k
Re: [2.6 patch] powerpc: remove the broken Gemini support
Hi,
Quoted 1 line · Kumar Gala
Also, where do we stand with APUS?
Well, there are still patches umerged for over a year, they probably still apply mostly.
bye, Roman
Re: [2.6 patch] powerpc: remove the broken Gemini support
Quoted 2 lines · Roman Zippel
Well, there are still patches umerged for over a year, they probably still apply mostly.
Please rebase and repost them, if you want them to go in.
Paul.