disable floppy eject for my USB floppy device, add a parameter, CONSOLE, to enable or not serial console

This commit is contained in:
Laurent Vivier 2005-01-25 23:25:38 +00:00
parent ccf2c2c77c
commit 1edfe9e730

View File

@ -11,16 +11,17 @@ PREFIX=/
# kernel boot arguments # kernel boot arguments
RAMDISK=$(shell ls ramdisk.gz 2> /dev/null) RAMDISK=$(shell ls ramdisk.gz 2> /dev/null)
#CONSOLE=console=ttyS0,9600n8 console=tty0
ifeq ($(RAMDISK),ramdisk.gz) ifeq ($(RAMDISK),ramdisk.gz)
#KERNEL_ARGS="root=/dev/ramdisk ramdisk_size=2048" KERNEL_ARGS="root=/dev/ramdisk ramdisk_size=2048 $(CONSOLE)"
KERNEL_ARGS="root=/dev/ramdisk ramdisk_size=2048 console=ttyS0,9600n8 console=tty0"
else else
# NFS boot # NFS boot
#KERNEL_ARGS="root=/dev/nfs ip=dhcp nfsroot=192.168.100.1:/nfsroot rw" #KERNEL_ARGS="root=/dev/nfs ip=dhcp nfsroot=192.168.100.1:/nfsroot rw $(CONSOLE)"
KERNEL_ARGS="root=/dev/nfs ip=dhcp rw $(CONSOLE)"
# SCSI boot # SCSI boot
KERNEL_ARGS="root=/dev/sda3" #KERNEL_ARGS="root=/dev/sda3 $(CONSOLE)"
#KERNEL_ARGS="prompt_ramdisk=1 load_ramdisk=1 ramdisk_start=0 root=/dev/fd0 ramdisk_size=4096" #KERNEL_ARGS="prompt_ramdisk=1 load_ramdisk=1 ramdisk_start=0 root=/dev/fd0 ramdisk_size=4096 $(CONSOLE)"
endif endif
# build info # build info
@ -58,6 +59,9 @@ ifeq ($(RAMDISK),ramdisk.gz)
else else
tools/emile-install -f first/first_floppy -s second/second_floppy \ tools/emile-install -f first/first_floppy -s second/second_floppy \
-k vmlinuz floppy.img.X -k vmlinuz floppy.img.X
endif
ifdef CONSOLE
tools/emile-set-output floppy.img.X --printer --modem
endif endif
tools/emile-set-cmdline floppy.img.X $(KERNEL_ARGS) tools/emile-set-cmdline floppy.img.X $(KERNEL_ARGS)
mv floppy.img.X floppy.img mv floppy.img.X floppy.img
@ -87,7 +91,8 @@ tools::
dump: floppy.img dump: floppy.img
dd if=floppy.img of=/dev/fd0 bs=512 dd if=floppy.img of=/dev/fd0 bs=512
eject /dev/fd0 # eject makes hanging my USB floppy device
#eject /dev/fd0
install: all install: all
install -d $(DESTDIR)/$(PREFIX)/usr/include/ install -d $(DESTDIR)/$(PREFIX)/usr/include/