rpms/kernel/devel Makefile.config, 1.59, 1.60 config-sparc64-generic, 1.1, 1.2

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2946

Modified Files:
	Makefile.config config-sparc64-generic 
Log Message:

Fix up sparc64 configs, don't worry about sparc32 right now.



Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Makefile.config	12 Jul 2007 19:15:37 -0000	1.59
+++ Makefile.config	17 Aug 2007 14:12:07 -0000	1.60
@@ -11,11 +11,12 @@
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
+	$(CFG)-sparc64.config $(CFG)-sparc64-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
 	$(CFG)-ia64-xen.config
 
-PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 # sparc sparc64
+PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -45,9 +46,6 @@
 temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic
 	perl merge.pl $^  > $@
 
-temp-sparc-generic: config-sparc-generic temp-generic
-	perl merge.pl $^  > $@
-
 temp-sparc64-generic: config-sparc64-generic temp-generic
 	perl merge.pl $^  > $@
 
@@ -99,16 +97,10 @@
 kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
 	perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-sparc-smp.config: config-sparc-smp temp-sparc-generic
-	perl merge.pl $^ sparc > $@
-
-kernel-$(VERSION)-sparc.config: config-sparc temp-sparc-generic
-	perl merge.pl $^ sparc > $@
-
 kernel-$(VERSION)-sparc64-smp.config: config-sparc64-smp temp-sparc64-generic
 	perl merge.pl $^ sparc64 > $@
 
-kernel-$(VERSION)-sparc64.config: config-sparc64 temp-sparc-generic
+kernel-$(VERSION)-sparc64.config: config-sparc64 temp-sparc64-generic
 	perl merge.pl $^ sparc64 > $@
 
 kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-sparc64-generic	12 Jul 2007 19:15:37 -0000	1.1
+++ config-sparc64-generic	17 Aug 2007 14:12:07 -0000	1.2
@@ -1,3 +1,6 @@
+CONFIG_SPARC=y
+CONFIG_SPARC64=y
+CONFIG_64BIT=y
 # CONFIG_BBC_I2C is not set
 CONFIG_HUGETLB_PAGE_SIZE_4MB=y
 # CONFIG_HUGETLB_PAGE_SIZE_512K is not set
@@ -34,11 +37,12 @@
 CONFIG_FB_FFB=y
 # CONFIG_FB_TCX is not set
 # CONFIG_FB_CG14 is not set
+CONFIG_FB_PM2=y
 CONFIG_FB_P9100=y
 # CONFIG_FB_LEO is not set
 CONFIG_FB_PCI=y
 # CONFIG_MDA_CONSOLE is not set
-CONFIG_PROM_CONSOLE=y
+# CONFIG_PROM_CONSOLE is not set
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
 # CONFIG_FONT_8x16 is not set
@@ -54,7 +58,7 @@
 CONFIG_SERIAL_SUNSU_CONSOLE=y
 CONFIG_SERIAL_SUNSAB=y
 CONFIG_SERIAL_SUNSAB_CONSOLE=y
-CONFIG_SUN_OPENPROMIO=m
+CONFIG_SUN_OPENPROMIO=y
 CONFIG_SUN_MOSTEK_RTC=y
 CONFIG_OBP_FLASH=m
 # CONFIG_SUN_VIDEOPIX is not set
@@ -76,7 +80,6 @@
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 CONFIG_SCSI_QLOGICPTI=m
 CONFIG_SCSI_SUNESP=m
@@ -101,11 +104,15 @@
 CONFIG_SND_BIT32_EMUL=m
 CONFIG_SND_SUN_AMD7930=m
 CONFIG_SND_SUN_CS4231=m
+CONFIG_SND_SUN_DBRI=m
 CONFIG_PARPORT_SUNBPP=m
 CONFIG_LOGO_SUN_CLUT224=y
 CONFIG_SUN_BPP=m
 CONFIG_MTD_SUN_UFLASH=m
 CONFIG_MYRI_SBUS=m
+# CONFIG_TUX is not set
+# CONFIG_TUX_EXTCGI is not set
+# CONFIG_TUX_EXTENDED_LOG is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_IEEE1394_SBP2 is not set