For the benefit of modern hardware, enable ACPI by default in INSTALL and
GENERIC kernels. If ACPI is an issue on your hardware, 'boot -c' and 'disable acpi' should be a workaround. ACPI-enabled kernels works fine on pre-acpi hardware. for amd64: - add ACPI to INSTALL and GENERIC, remove the *_ACPI config files. - get rid of the bootfloppy-big.fs boot image, and got to a 3-floppy boot image for i386: - introduce INSTALL_LARGE which has ACPI and some devices with big firmware - move some devices from INSTALL to INSTALL_LARGE - Boot floppies still use INSTALL, and bootfloppy-big.fs is still there (for thoses who want to build el-torito floppy emulation boot CD) and use INSTALL. For both, drop the 'iso-image' code in etc/ to make the iso bootable, we'll use something else to build bootable CDs.
This commit is contained in:
bouyer
parent
541b5a90c5
commit
ff6bcd05a5
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.1 2006/06/02 22:11:52 hubertf Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2007/03/06 21:47:46 bouyer Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
|
||||
@ -12,8 +12,7 @@ ${V}DIR!= cd ${.CURDIR}/../ramdisks/${F} && ${PRINTOBJDIR}
|
||||
${V}= ${${V}DIR}/${F}.fs
|
||||
.endfor
|
||||
|
||||
MDSETTARGETS= INSTALL ${RAMDISK} - \
|
||||
INSTALL_ACPI ${RAMDISK} -
|
||||
MDSETTARGETS= INSTALL ${RAMDISK} -
|
||||
|
||||
MDSET_RELEASEDIR= binary/kernel
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2006/11/19 11:17:51 dsl Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2007/03/06 21:47:45 bouyer Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
|
||||
@ -15,7 +15,8 @@ ${V}DIR!= cd ${.CURDIR}/../ramdisks/${F} && ${PRINTOBJDIR}
|
||||
${V}= ${${V}DIR}/${F}.fs
|
||||
.endfor
|
||||
|
||||
MDSETTARGETS= INSTALL ${RAMDISK_B} -
|
||||
MDSETTARGETS= INSTALL_LARGE ${RAMDISK_B} -
|
||||
MDSETTARGETS+= INSTALL ${RAMDISK_B} -
|
||||
MDSETTARGETS+= INSTALL_LAPTOP ${RAMDISK_B} -
|
||||
MDSETTARGETS+= INSTALL_XEN2_DOMU ${RAMDISK_B} -
|
||||
MDSETTARGETS+= INSTALL_XEN3_DOMU ${RAMDISK_B} -
|
||||
|
||||
@ -1,19 +1,16 @@
|
||||
# $NetBSD: Makefile.inc,v 1.6 2007/02/27 18:17:28 he Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.7 2007/03/06 21:47:46 bouyer Exp $
|
||||
#
|
||||
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
|
||||
#
|
||||
|
||||
KERNEL_SETS= GENERIC GENERIC.MP GENERIC_ACPI
|
||||
KERNEL_SETS= GENERIC GENERIC.MP
|
||||
|
||||
BUILD_KERNELS= INSTALL INSTALL_ACPI
|
||||
BUILD_KERNELS= INSTALL
|
||||
|
||||
INSTALLATION_DIRS+= installation/cdrom
|
||||
INSTALLATION_DIRS+= installation/floppy
|
||||
INSTALLATION_DIRS+= installation/misc
|
||||
|
||||
# mkisofs arguments to generate bootable iso image
|
||||
MKISOFS_FLAGS+= -b ${MACHINE}/installation/floppy/boot-big.fs
|
||||
|
||||
snap_md_post:
|
||||
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
|
||||
${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/cdrom '*.iso'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.inc,v 1.48 2007/02/27 18:17:28 he Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.49 2007/03/06 21:47:46 bouyer Exp $
|
||||
#
|
||||
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
|
||||
#
|
||||
@ -7,7 +7,6 @@ KERNEL_SETS= GENERIC
|
||||
KERNEL_SETS+= GENERIC_LAPTOP
|
||||
KERNEL_SETS+= GENERIC_DIAGNOSTIC
|
||||
KERNEL_SETS+= GENERIC.MP
|
||||
KERNEL_SETS+= GENERIC.MPACPI
|
||||
KERNEL_SETS+= XEN2_DOM0
|
||||
KERNEL_SETS+= XEN2_DOMU
|
||||
KERNEL_SETS+= XEN3_DOM0
|
||||
@ -16,6 +15,7 @@ KERNEL_SETS+= XEN3_DOMU
|
||||
# KERNEL_SETS+= GENERIC_PS2TINY
|
||||
|
||||
BUILD_KERNELS= ALL
|
||||
BUILD_KERNELS+= INSTALL_LARGE
|
||||
BUILD_KERNELS+= INSTALL
|
||||
BUILD_KERNELS+= INSTALL_LAPTOP
|
||||
BUILD_KERNELS+= INSTALL_XEN2_DOMU
|
||||
@ -36,9 +36,3 @@ snap_md_post:
|
||||
${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/cdrom '*.iso'
|
||||
${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/floppy '*.fs'
|
||||
${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc '*.*'
|
||||
|
||||
# For "make iso-image"
|
||||
# mkisofs arguments to generate bootable iso image
|
||||
CDROM_BOOT_IMAGE?= boot-big.fs
|
||||
|
||||
MKISOFS_FLAGS+= -b ${MACHINE}/installation/floppy/${CDROM_BOOT_IMAGE} -c boot.catalog
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: GENERIC,v 1.129 2007/03/06 11:28:46 dillo Exp $
|
||||
# $NetBSD: GENERIC,v 1.130 2007/03/06 21:47:46 bouyer Exp $
|
||||
#
|
||||
# GENERIC machine description file
|
||||
#
|
||||
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
|
||||
|
||||
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
|
||||
|
||||
#ident "GENERIC-$Revision: 1.129 $"
|
||||
#ident "GENERIC-$Revision: 1.130 $"
|
||||
|
||||
maxusers 32 # estimated number of users
|
||||
|
||||
@ -79,20 +79,20 @@ options POWERNOW_K8
|
||||
#options BUFQ_PRIOCSCAN
|
||||
|
||||
# Diagnostic/debugging support options
|
||||
#options DIAGNOSTIC # expensive kernel consistency checks
|
||||
options DIAGNOSTIC # expensive kernel consistency checks
|
||||
#options DEBUG # expensive debugging checks/support
|
||||
#options KMEMSTATS # kernel memory statistics (vmstat -m)
|
||||
options KMEMSTATS # kernel memory statistics (vmstat -m)
|
||||
|
||||
#
|
||||
# Because gcc omits the frame pointer for any -O level, the line below
|
||||
# is needed to make backtraces in DDB work.
|
||||
#
|
||||
#makeoptions COPTS="-O2 -fno-omit-frame-pointer"
|
||||
#options DDB # in-kernel debugger
|
||||
options DDB # in-kernel debugger
|
||||
#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
|
||||
#options KGDB # remote debugger
|
||||
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
|
||||
#makeoptions DEBUG="-g" # compile full symbol table
|
||||
makeoptions DEBUG="-g" # compile full symbol table
|
||||
|
||||
# Compatibility options
|
||||
options COMPAT_15 # compatibility with NetBSD 1.5,
|
||||
@ -231,8 +231,9 @@ config netbsd root on ? type ?
|
||||
|
||||
mainbus0 at root
|
||||
|
||||
#acpi0 at mainbus0
|
||||
#options ACPI_SCANPCI # find PCI roots using ACPI
|
||||
# ACPI will be used if present. If not it will fall back to MPBIOS
|
||||
acpi0 at mainbus0
|
||||
options ACPI_SCANPCI # find PCI roots using ACPI
|
||||
options MPBIOS # configure CPUs and APICs using MPBIOS
|
||||
options MPBIOS_SCANPCI # MPBIOS configures PCI roots
|
||||
#options PCI_INTR_FIXUP # PCI interrupt routing via ACPI
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
# $NetBSD: GENERIC_ACPI,v 1.2 2006/07/04 00:30:22 christos Exp $
|
||||
#
|
||||
# GENERIC_ACPI machine description file
|
||||
|
||||
include "arch/amd64/conf/GENERIC"
|
||||
|
||||
no options MPBIOS_SCANPCI
|
||||
acpi0 at mainbus0
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: INSTALL,v 1.65 2007/02/01 21:07:45 tron Exp $
|
||||
# $NetBSD: INSTALL,v 1.66 2007/03/06 21:47:46 bouyer Exp $
|
||||
#
|
||||
# GENERIC machine description file
|
||||
#
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
include "arch/amd64/conf/std.amd64"
|
||||
|
||||
#ident "INSTALL-$Revision: 1.65 $"
|
||||
#ident "INSTALL-$Revision: 1.66 $"
|
||||
|
||||
maxusers 32 # estimated number of users
|
||||
|
||||
@ -163,7 +163,10 @@ config netbsd root on ? type ?
|
||||
|
||||
mainbus0 at root
|
||||
|
||||
options MPBIOS
|
||||
# ACPI will be used if present. If not it will fall back to MPBIOS
|
||||
acpi0 at mainbus0
|
||||
options ACPI_SCANPCI
|
||||
options MPBIOS
|
||||
options MPBIOS_SCANPCI
|
||||
cpu* at mainbus0
|
||||
ioapic* at mainbus0
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
# $NetBSD: INSTALL_ACPI,v 1.31 2006/07/04 00:30:22 christos Exp $
|
||||
#
|
||||
# INSTALL_ACPI machine description file
|
||||
|
||||
include "arch/amd64/conf/INSTALL"
|
||||
|
||||
no options MPBIOS_SCANPCI
|
||||
acpi0 at mainbus0
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: GENERIC,v 1.812 2007/03/06 11:28:46 dillo Exp $
|
||||
# $NetBSD: GENERIC,v 1.813 2007/03/06 21:47:46 bouyer Exp $
|
||||
#
|
||||
# GENERIC machine description file
|
||||
#
|
||||
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
|
||||
|
||||
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
|
||||
|
||||
#ident "GENERIC-$Revision: 1.812 $"
|
||||
#ident "GENERIC-$Revision: 1.813 $"
|
||||
|
||||
maxusers 32 # estimated number of users
|
||||
|
||||
@ -308,7 +308,7 @@ config netbsd root on ? type ?
|
||||
mainbus0 at root
|
||||
|
||||
cpu* at mainbus?
|
||||
#ioapic* at mainbus?
|
||||
ioapic* at mainbus?
|
||||
|
||||
# Doesn't do anything yet.
|
||||
#p64h2apic* at pci? dev? function? # P64H2 IOxAPIC
|
||||
@ -337,41 +337,43 @@ cpu* at mainbus?
|
||||
#options MPBIOS_SCANPCI # find PCI roots using MPBIOS
|
||||
#options ACPI_SCANPCI # find PCI roots using ACPI
|
||||
|
||||
#acpi0 at mainbus0
|
||||
acpi0 at mainbus0
|
||||
|
||||
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
|
||||
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
|
||||
options ACPIVERBOSE
|
||||
options ACPI_SCANPCI
|
||||
|
||||
# ACPI devices
|
||||
#acpiacad* at acpi? # ACPI AC Adapter
|
||||
#acpibat* at acpi? # ACPI Battery
|
||||
#acpibut* at acpi? # ACPI Button
|
||||
#acpiec* at acpi? # ACPI Embedded Controller
|
||||
#acpilid* at acpi? # ACPI Lid Switch
|
||||
#acpitz* at acpi? # ACPI Thermal Zone
|
||||
acpiacad* at acpi? # ACPI AC Adapter
|
||||
acpibat* at acpi? # ACPI Battery
|
||||
acpibut* at acpi? # ACPI Button
|
||||
acpiec* at acpi? # ACPI Embedded Controller
|
||||
acpilid* at acpi? # ACPI Lid Switch
|
||||
acpitz* at acpi? # ACPI Thermal Zone
|
||||
|
||||
# Mainboard devices
|
||||
#attimer* at acpi? # AT Timer
|
||||
#com* at acpi? # Serial communications interface
|
||||
#fdc* at acpi? # Floppy disk controller
|
||||
#joy* at acpi? # Joystick/Game port
|
||||
#lpt* at acpi? # Parallel port
|
||||
#mpu* at acpi? # Roland MPU-401 MIDI UART
|
||||
#npx* at acpi? # Math coprocessor
|
||||
#pckbc* at acpi? # PC keyboard controller
|
||||
#pcppi* at acpi? # AT-style speaker sound
|
||||
#wss* at acpi? # NeoMagic 256AV in wss mode
|
||||
#ym* at acpi? # Yamaha OPL3-SA[23] audio
|
||||
attimer* at acpi? # AT Timer
|
||||
com* at acpi? # Serial communications interface
|
||||
fdc* at acpi? # Floppy disk controller
|
||||
joy* at acpi? # Joystick/Game port
|
||||
lpt* at acpi? # Parallel port
|
||||
mpu* at acpi? # Roland MPU-401 MIDI UART
|
||||
npx* at acpi? # Math coprocessor
|
||||
pckbc* at acpi? # PC keyboard controller
|
||||
pcppi* at acpi? # AT-style speaker sound
|
||||
wss* at acpi? # NeoMagic 256AV in wss mode
|
||||
ym* at acpi? # Yamaha OPL3-SA[23] audio
|
||||
|
||||
# Sony Vaio jog dial
|
||||
#spic* at acpi? # Sony Programmable I/O Controller
|
||||
#wsmouse* at spic?
|
||||
spic* at acpi? # Sony Programmable I/O Controller
|
||||
wsmouse* at spic?
|
||||
|
||||
# Sony LCD brightness etc.
|
||||
#sony* at acpi? # Sony Miscellaneous Controller
|
||||
sony* at acpi? # Sony Miscellaneous Controller
|
||||
|
||||
# Toshiba Libretto devices
|
||||
#vald* at acpi?
|
||||
vald* at acpi?
|
||||
|
||||
# Plug-and-Play BIOS and attached devices
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: GENERIC.MP,v 1.8 2006/07/04 00:30:22 christos Exp $
|
||||
# $NetBSD: GENERIC.MP,v 1.9 2007/03/06 21:47:47 bouyer Exp $
|
||||
#
|
||||
# GENERIC.MP -- Generic, plus enable Multiprocessor support.
|
||||
#
|
||||
@ -14,5 +14,3 @@ options APM_NO_IDLE
|
||||
#options MPVERBOSE
|
||||
#options DEBUG
|
||||
options MPBIOS # configure CPUs and APICs using MPBIOS
|
||||
|
||||
ioapic* at mainbus? apid ?
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
# $NetBSD: GENERIC.MPACPI,v 1.62 2006/11/28 16:15:37 christos Exp $
|
||||
#
|
||||
# GENERIC.MP -- Generic, plus enable Multiprocessor support.
|
||||
#
|
||||
|
||||
include "arch/i386/conf/GENERIC"
|
||||
|
||||
options MULTIPROCESSOR
|
||||
|
||||
options APM_NO_IDLE
|
||||
#options DIAGNOSTIC # STRONGLY RECOMMENDED
|
||||
#options LOCKDEBUG
|
||||
#options MPDEBUG
|
||||
#options MPVERBOSE
|
||||
#options DEBUG
|
||||
options ACPIVERBOSE
|
||||
|
||||
ioapic* at mainbus? apid ?
|
||||
|
||||
acpi0 at mainbus0
|
||||
|
||||
# ACPI devices
|
||||
acpiacad* at acpi? # ACPI AC Adapter
|
||||
acpibat* at acpi? # ACPI Battery
|
||||
acpibut* at acpi? # ACPI Button
|
||||
acpiec* at acpi? # ACPI Embedded Controller
|
||||
acpilid* at acpi? # ACPI Lid Switch
|
||||
acpitz* at acpi? # ACPI Thermal Zone
|
||||
|
||||
# Mainboard devices
|
||||
attimer* at acpi? # AT Timer
|
||||
com* at acpi? # Serial communications interface
|
||||
fdc* at acpi? # Floppy disk controller
|
||||
joy* at acpi? # Joystick/Game port
|
||||
lpt* at acpi? # Parallel port
|
||||
mpu* at acpi? # Roland MPU-401 MIDI UART
|
||||
npx* at acpi? # Math coprocessor
|
||||
pckbc* at acpi? # PC keyboard controller
|
||||
pcppi* at acpi? # AT-style speaker sound
|
||||
wss* at acpi? # NeoMagic 256AV in wss mode
|
||||
|
||||
# Sony Vaio jog dial
|
||||
#spic* at acpi? # Sony Programmable I/O Controller
|
||||
#wsmouse* at spic?
|
||||
|
||||
# Sony LCD brightness etc.
|
||||
#sony* at acpi? # Sony Miscellaneous Controller
|
||||
|
||||
# Remove support for old cpus
|
||||
no options I486_CPU, I586_CPU
|
||||
#no options MATH_EMULATE
|
||||
no makeoptions CPUFLAGS
|
||||
makeoptions CPUFLAGS="-march=pentiumpro -mtune=pentiumpro"
|
||||
|
||||
# It is doubtful that an EISA system supports ACPI
|
||||
no options EISAVERBOSE
|
||||
no eisa
|
||||
no pceb
|
||||
|
||||
# and even more doubtful that an MCA system supports ACPI
|
||||
no options MCAVERBOSE
|
||||
no mca
|
||||
no pcmb
|
||||
|
||||
# ISA slots are also unlikely, isapnp can be removed, but the build fails
|
||||
# badly if isa is disabled.
|
||||
# no isapnp
|
||||
# no isa
|
||||
|
||||
# Disable non-acpi mainboard devices
|
||||
# XXX: Is this list complete?
|
||||
no isa0 at mainbus?
|
||||
no com0 at isa?
|
||||
no com1 at isa?
|
||||
no com2 at isa?
|
||||
no fdc0 at isa?
|
||||
no lpt0 at isa?
|
||||
no lpt1 at isa?
|
||||
no lpt2 at isa?
|
||||
no npx0 at isa?
|
||||
no pcdisplay0 at isa?
|
||||
no pckbc0 at isa?
|
||||
no vga0 at isa?
|
||||
|
||||
# Disable miscellaneous drivers that can't be needed.
|
||||
no geodewdog
|
||||
|
||||
# These were absent from the pre-merged GENERIC.MPACPI
|
||||
# no options WSDISPLAY_CUSTOM_OUTPUT, WSDISPLAY_CUSTOM_BORDER
|
||||
# no options PCKBD_CNATTACH_MAY_FAIL
|
||||
# no options VND_COMPRESSION
|
||||
# no njs
|
||||
# no ciphy
|
||||
# no cdce
|
||||
# no fwohci
|
||||
# no uipaq
|
||||
# no atu
|
||||
18
sys/arch/i386/conf/INSTALL_LARGE
Normal file
18
sys/arch/i386/conf/INSTALL_LARGE
Normal file
@ -0,0 +1,18 @@
|
||||
# $NetBSD: INSTALL_LARGE,v 1.1 2007/03/06 21:47:47 bouyer Exp $
|
||||
#
|
||||
# INSTALL_LARGE -- INSTALL suitable for modern machines
|
||||
#
|
||||
|
||||
include "arch/i386/conf/INSTALL"
|
||||
|
||||
acpi0 at mainbus0
|
||||
|
||||
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
|
||||
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
|
||||
options ACPIVERBOSE
|
||||
options ACPI_SCANPCI
|
||||
|
||||
ioapic* at mainbus?
|
||||
bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
|
||||
txp* at pci? dev ? function ? # 3com 3cr990
|
||||
vge* at pci? dev ? function ? # VIATech VT612X Gigabit Ethernet
|
||||
Loading…
Reference in New Issue
Block a user