From 4af390ee76a2a9b736bdf8452d2822dc664c6078 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 6 Mar 2007 19:13:40 +0000 Subject: [PATCH] add vga console support for x86-2.6 images (fixes #1342, #840) SVN-Revision: 6530 --- package/base-files/files/sbin/mount_root | 1 + .../x86-2.6/base-files/default/etc/inittab | 3 ++ target/linux/x86-2.6/config/default | 42 +++++++++++++++++-- target/linux/x86-2.6/image/grub/menu.lst | 6 +-- 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 target/linux/x86-2.6/base-files/default/etc/inittab diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root index dd9d99d8e6..47babf14f8 100755 --- a/package/base-files/files/sbin/mount_root +++ b/package/base-files/files/sbin/mount_root @@ -11,6 +11,7 @@ else mount -t sysfs none /sys mount -t tmpfs tmpfs /dev -o size=512K mknod /dev/console c 5 1 + exec >/dev/console &1 mkdir /dev/shm /sbin/hotplug2 --no-persistent --coldplug fi diff --git a/target/linux/x86-2.6/base-files/default/etc/inittab b/target/linux/x86-2.6/base-files/default/etc/inittab new file mode 100644 index 0000000000..c3894205dc --- /dev/null +++ b/target/linux/x86-2.6/base-files/default/etc/inittab @@ -0,0 +1,3 @@ +::sysinit:/etc/init.d/rcS +ttyS0::askfirst:/bin/ash --login +tty1::askfirst:/bin/ash --login diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default index 6e2fc2fa35..6505eb23b5 100644 --- a/target/linux/x86-2.6/config/default +++ b/target/linux/x86-2.6/config/default @@ -40,7 +40,6 @@ CONFIG_BLK_DEV_GENERIC=y # CONFIG_BLK_DEV_HPT366 is not set CONFIG_BLK_DEV_IDE=y # CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDECS is not set CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set @@ -69,6 +68,7 @@ CONFIG_BLK_DEV_SC1200=y # CONFIG_BLK_DEV_TRM290 is not set CONFIG_BLK_DEV_VIA82CXXX=y # CONFIG_BLK_DEV_XD is not set +# CONFIG_BT_HIDP is not set # CONFIG_CD_NO_IDESCSI is not set CONFIG_COMPAT_VDSO=y # CONFIG_CPU5_WDT is not set @@ -96,6 +96,7 @@ CONFIG_CRYPTO_TWOFISH_586=m # CONFIG_DMASCC is not set CONFIG_DMI=y CONFIG_DOUBLEFAULT=y +CONFIG_DUMMY_CONSOLE=y CONFIG_E1000=m # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000_NAPI=y @@ -120,6 +121,7 @@ CONFIG_GENERIC_ISA_DMA=y # CONFIG_HIGHMEM64G is not set # CONFIG_HPET_TIMER is not set # CONFIG_HUGETLBFS is not set +CONFIG_HW_CONSOLE=y CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_AMD is not set CONFIG_HW_RANDOM_GEODE=y @@ -160,7 +162,6 @@ CONFIG_I2C_CHARDEV=m # CONFIG_I2C_VIAPRO is not set # CONFIG_I2C_VOODOO3 is not set # CONFIG_I6300ESB_WDT is not set -# CONFIG_I82365 is not set # CONFIG_I8K is not set # CONFIG_I8XX_TCO is not set # CONFIG_IB700_WDT is not set @@ -179,12 +180,26 @@ CONFIG_IDE_GENERIC=y CONFIG_IDE_MAX_HWIFS=4 # CONFIG_IDE_TASK_IOCTL is not set CONFIG_INITRAMFS_SOURCE="" +CONFIG_INPUT=y +# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_KEYBOARD=y +CONFIG_INPUT_MOUSE=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_ISA=y CONFIG_ISAPNP=y CONFIG_ISA_DMA_API=y # CONFIG_ITCO_WDT is not set CONFIG_JFFS2_FS_DEBUG=0 # CONFIG_KEXEC is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set CONFIG_KTIME_SCALAR=y # CONFIG_LANCE is not set CONFIG_LEDS_NET48XX=m @@ -200,6 +215,7 @@ CONFIG_M486=y # CONFIG_MCA is not set # CONFIG_MCRUSOE is not set # CONFIG_MCYRIXIII is not set +# CONFIG_MDA_CONSOLE is not set # CONFIG_MEFFICEON is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set @@ -209,6 +225,12 @@ CONFIG_MINI_FO=y # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set +# CONFIG_MOUSE_INPORT is not set +# CONFIG_MOUSE_LOGIBM is not set +# CONFIG_MOUSE_PC110PAD is not set +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MPENTIUM4 is not set # CONFIG_MPENTIUMII is not set # CONFIG_MPENTIUMIII is not set @@ -276,7 +298,6 @@ CONFIG_PCI_GOANY=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GODIRECT is not set # CONFIG_PCI_GOMMCONFIG is not set -CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_PROBE=y # CONFIG_PCWATCHDOG is not set CONFIG_PHYSICAL_START=0x100000 @@ -330,6 +351,13 @@ CONFIG_SEMAPHORE_SLEEPERS=y # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_PNP is not set +CONFIG_SERIO=y +# CONFIG_SERIO_CT82C710 is not set +CONFIG_SERIO_I8042=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_RAW is not set +CONFIG_SERIO_SERPORT=y # CONFIG_SMP is not set # CONFIG_SMSC37B787_WDT is not set # CONFIG_SND_AD1816A is not set @@ -366,8 +394,8 @@ CONFIG_SEMAPHORE_SLEEPERS=y # CONFIG_SND_USB_USX2Y is not set # CONFIG_SND_WAVEFRONT is not set CONFIG_SOFT_WATCHDOG=m +# CONFIG_SONYPI is not set CONFIG_SPARSEMEM_STATIC=y -# CONFIG_TCIC is not set # CONFIG_TELCLOCK is not set # CONFIG_TOSHIBA is not set # CONFIG_TYPHOON is not set @@ -382,15 +410,21 @@ CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_OHCI_HCD=m # CONFIG_USB_STORAGE_ISD200 is not set CONFIG_USB_UHCI_HCD=m +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_VGA_CONSOLE=y CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set CONFIG_VIA_RHINE_NAPI=y +# CONFIG_VIDEO_SELECT is not set # CONFIG_VM86 is not set # CONFIG_VMSPLIT_1G is not set # CONFIG_VMSPLIT_2G is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VORTEX=m +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_W83627HF_WDT is not set # CONFIG_W83697HF_WDT is not set # CONFIG_W83877F_WDT is not set diff --git a/target/linux/x86-2.6/image/grub/menu.lst b/target/linux/x86-2.6/image/grub/menu.lst index f9d28438f8..f7543bda42 100644 --- a/target/linux/x86-2.6/image/grub/menu.lst +++ b/target/linux/x86-2.6/image/grub/menu.lst @@ -1,15 +1,15 @@ serial --unit=0 --speed=@BAUDRATE@ --word=8 --parity=no --stop=1 -terminal --timeout=10 serial +terminal --timeout=10 console serial default 0 timeout 5 title OpenWrt root (hd0,0) -kernel /boot/vmlinuz @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios +kernel /boot/vmlinuz @CMDLINE@ noinitrd console=tty0 console=ttyS0,@BAUDRATE@n8 reboot=bios boot title OpenWrt (failsafe) root (hd0,0) -kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios +kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd console=tty0 console=ttyS0,@BAUDRATE@n8 reboot=bios boot -- 2.30.2