Updates for PC-9800 related (0/5) summary
Subsystems (5)
PATCH 1/1 Updates for PC-9800 related (0/5) summary
Thanks for merging.
These are the update patch for NEC PC-9800 subarchitecture related files against 2.5.65-ac3. Please apply.
Description:
o alsa-update.patch (1/5)
Update sound/core/Makefile. Restore missing target for PC-98.
o boot98-update.patch (2/5)
Update arch/i386/Makefile and arch/i386/boot98/*.
o floppy98-update.patch (3/5)
Update PC98 standard floppy driver.
o network_card-update.patch (4/5)
Update drivers/net/Kconfig. Remove duplicated entry for PC-98.
o video_card-update.patch (5/5)
Add missing files for PC98 Standard text mode video driver.
Regards,
Osamu Tomita <[email protected]>
PATCH 1/1 Updates for PC-9800 related (1/5) boot98
This is the update patch for NEC PC-9800 subarchitecture related files against 2.5.65-ac3. (1/5)
Update alsa sound driver for PC-98.
Add missing target for PC-98 lost between 2.5.65-ac2 and 2.5.65-ac3.
Regards,
Osamu Tomita
sound/core/Makefile +1 -0
@@ -95,6 +95,7 @@ obj-$(CONFIG_SND_YMFPCI) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o obj-$(CONFIG_SND_POWERMAC) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o +obj-$(CONFIG_SND_PC98_CS4232) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o ifeq ($(CONFIG_SND_SB16_CSP),y) obj-$(CONFIG_SND_SB16) += snd-hwdep.o obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o
Re: [PATCH 2.5.65-ac3] Updates for PC-9800 related (1/5) boot98
Quoted 13 lines · Osamu Tomita
This is the update patch for NEC PC-9800 subarchitecture related files against 2.5.65-ac3. (1/5)
Update alsa sound driver for PC-98.
Add missing target for PC-98 lost between 2.5.65-ac2 and 2.5.65-ac3.Regards,
Osamu Tomitadiff -Nru linux-2.5.65-ac3/sound/core/Makefile linux98-2.5.65-ac3/sound/core/Makefile
sound/core/Makefile line 101
Quoted 7 lines
sound/core/Makefile +1
-0@@ -95,6 +95,7 @@ obj-$(CONFIG_SND_YMFPCI) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o obj-$(CONFIG_SND_POWERMAC) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o +obj-$(CONFIG_SND_PC98_CS4232) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o ifeq ($(CONFIG_SND_SB16_CSP),y) obj-$(CONFIG_SND_SB16) += snd-hwdep.o obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o
Sorry, I mis-type subject. This is ALSA update.
Osamu Tomita
PATCH 1/1 Updates for PC-9800 related (2/5) boot98
In reply to Osamu TomitaThis is the update patch for NEC PC-9800 subarchitecture related files against 2.5.65-ac3. (2/5)
Update arch/i386/Makefile and arch/i386/boot98/* to syncronize with 2.5.65.
Regards,
Osamu Tomita
arch/i386/Makefile +4 -4
@@ -65,10 +65,6 @@ mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq mcore-$(CONFIG_X86_NUMAQ) := mach-default -# PC-9800 subarch support -mflags-$(CONFIG_X86_PC9800) := -Iinclude/asm-i386/mach-pc9800 -mcore-$(CONFIG_X86_PC9800) := mach-pc9800 - # BIGSMP subarch support mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp mcore-$(CONFIG_X86_BIGSMP) := mach-default
@@ -77,6 +73,10 @@ mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit mcore-$(CONFIG_X86_SUMMIT) := mach-default +# PC-9800 subarch support +mflags-$(CONFIG_X86_PC9800) := -Iinclude/asm-i386/mach-pc9800 +mcore-$(CONFIG_X86_PC9800) := mach-pc9800 + # default subarch .h files mflags-y += -Iinclude/asm-i386/mach-default
arch/i386/boot98/Makefile +32 -5
@@ -25,9 +25,8 @@ #RAMDISK := -DRAMDISK=512 -EXTRA_TARGETS := vmlinux.bin bootsect bootsect.o \ - setup setup.o zImage bzImage - +targets := vmlinux.bin bootsect bootsect.o setup setup.o \ + zImage bzImage subdir- := compressed host-progs := tools/build
@@ -62,8 +61,36 @@ $(Q)$(MAKE) -f scripts/Makefile.build obj=$(obj)/compressed \ IMAGE_OFFSET=$(IMAGE_OFFSET) $@ -zdisk: $(BOOTIMAGE) - dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0 +# Set this if you want to pass append arguments to the zdisk/fdimage kernel +FDARGS = + +$(obj)/mtools.conf: $(src)/mtools.conf.in + sed -e 's|@OBJ@|$(obj)|g' < $< > $@ + +# This requires write access to /dev/fd0 +zdisk: $(BOOTIMAGE) $(obj)/mtools.conf + MTOOLSRC=$(obj)/mtools.conf mformat a: ; sync + syslinux /dev/fd0 ; sync + echo 'default linux $(FDARGS)' | \ + MTOOLSRC=$(src)/mtools.conf mcopy - a:syslinux.cfg + MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) a:linux ; sync + +# These require being root or having syslinux 2.02 or higher installed +fdimage fdimage144: $(BOOTIMAGE) $(obj)/mtools.conf + dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=1440 + MTOOLSRC=$(obj)/mtools.conf mformat v: ; sync + syslinux $(obj)/fdimage ; sync + echo 'default linux $(FDARGS)' | \ + MTOOLSRC=$(obj)/mtools.conf mcopy - v:syslinux.cfg + MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) v:linux ; sync + +fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf + dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=2880 + MTOOLSRC=$(obj)/mtools.conf mformat w: ; sync + syslinux $(obj)/fdimage ; sync + echo 'default linux $(FDARGS)' | \ + MTOOLSRC=$(obj)/mtools.conf mcopy - w:syslinux.cfg + MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) w:linux ; sync zlilo: $(BOOTIMAGE) if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi
arch/i386/boot98/compressed/Makefile +1 -1
@@ -4,7 +4,7 @@ # create a compressed vmlinux image from the original vmlinux # -EXTRA_TARGETS := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o +targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o EXTRA_AFLAGS := -traditional LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
arch/i386/boot98/mtools.conf.in +17 -0
@@ -0,0 +1,17 @@ +# +# mtools configuration file for "make (b)zdisk" +# + +# Actual floppy drive +drive a: + file="/dev/fd0" + +# 1.44 MB floppy disk image +drive v: + file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=18 filter + +# 2.88 MB floppy disk image (mostly for virtual uses) +drive w: + file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter + +
arch/i386/boot98/tools/build.c +2 -5
@@ -149,13 +149,10 @@ sz = sb.st_size;fprintf (stderr,"System is %d kB\n" , sz/1024 ); sys_size = (sz +15 ) /16 ; -/* 0x28000*16 = 2.5 MB, conservative estimate for the current maximum */ -if (sys_size > (is_big_kernel ?0x28000 :DEF_SYSSIZE )) +/* 0x40000*16 = 4.0 MB, reasonable estimate for the current maximum */ +if (sys_size > (is_big_kernel ?0x40000 :DEF_SYSSIZE ))die ("System is too big. Try using %smodules." , is_big_kernel ?"" :"bzImage or " ); -if (sys_size >0xefff ) -fprintf (stderr,"warning: kernel is too big for standalone boot " -"from floppy\n" );while (sz >0 ) {int l, n;
PATCH 1/1 Updates for PC-9800 related (3/5) floppy98
In reply to Osamu TomitaThis is the update patch for NEC PC-9800 subarchitecture related files against 2.5.65-ac3. (3/5)
Update drivers/block/floppy98.c to syncronize with 2.5.65. (Driver for PC98 standard floppy disk drive.)
Regards,
Osamu Tomita
drivers/block/floppy98.c +1 -2
@@ -4273,8 +4273,7 @@ }devfs_mk_dir (NULL ,"floppy" ,NULL ); -if (register_blkdev (FLOPPY_MAJOR ,"fd" ,&floppy_fops)) { -printk ("Unable to get major %d for floppy\n" ,FLOPPY_MAJOR ); +if (register_blkdev (FLOPPY_MAJOR ,"fd" )) { err = -EBUSY ; goto out; }
PATCH 1/1 Updates for PC-9800 related (4/5) NIC
In reply to Osamu TomitaThis is the update patch for NEC PC-9800 subarchitecture related files against 2.5.65-ac3. (4/5)
Update network card patch.
Remove duplicated C-bus cards entry from Kconfig.
Regards,
Osamu Tomita
drivers/net/Kconfig +0 -49
@@ -1225,55 +1225,6 @@ bool "NEC PC-9801-108 Support" depends on NE2K_CBUS -config NET_CBUS - bool "NEC PC-9800 C-bus cards" - depends on NET_ETHERNET && ISA && X86_PC9800 - ---help--- - If your network (Ethernet) card hasn't been mentioned yet and its - bus system (that's the way the cards talks to the other components - of your computer) is NEC PC-9800 C-Bus, say Y. - -config NE2K_CBUS - tristate "Most NE2000-based Ethernet support" - depends on NET_CBUS - -config NE2K_CBUS_EGY98 - bool "Melco EGY-98 support" - depends on NE2K_CBUS - -config NE2K_CBUS_LGY98 - bool "Melco LGY-98 support" - depends on NE2K_CBUS - -config NE2K_CBUS_ICM - bool "ICM IF-27xxET support" - depends on NE2K_CBUS - -config NE2K_CBUS_IOLA98 - bool "I-O DATA LA-98 support" - depends on NE2K_CBUS - -config NE2K_CBUS_CNET98EL - bool "Contec C-NET(98)E/L support" - depends on NE2K_CBUS - -config NE2K_CBUS_CNET98EL_IO_BASE - hex "C-NET(98)E/L I/O base address (0xaaed or 0x55ed)" - depends on NE2K_CBUS_CNET98EL - default "0xaaed" - -config NE2K_CBUS_ATLA98 - bool "Allied Telesis LA-98 Support" - depends on NE2K_CBUS - -config NE2K_CBUS_BDN - bool "ELECOM Laneed LD-BDN[123]A Support" - depends on NE2K_CBUS - -config NE2K_CBUS_NEC108 - bool "NEC PC-9801-108 Support" - depends on NE2K_CBUS - config SKMC tristate "SKnet MCA support" depends on NET_ETHERNET && MCA
PATCH 1/1 Updates for PC-9800 related (5/5) video
In reply to Osamu TomitaThis is the update patch for NEC PC-9800 subarchitecture related files against 2.5.65-ac3. (5/5)
Add missing patch. These files are lost between 2.5.64-ac4 and 2.5.65-ac1. (PC98 standard video card text mode driver.)
Regards,
Osamu Tomita
drivers/video/console/Makefile +1 -0
@@ -19,6 +19,7 @@ # Each configuration option enables a list of files. obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o +obj-$(CONFIG_GDC_CONSOLE) += gdccon.o obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o obj-$(CONFIG_PROM_CONSOLE) += promcon.o promcon_tbl.o obj-$(CONFIG_STI_CONSOLE) += sticon.o sticore.o
drivers/video/console/gdccon.c +833 -0
833 lines not on this page · raw message