diff options
author | kato <kato@FreeBSD.org> | 1999-04-18 14:42:20 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1999-04-18 14:42:20 +0000 |
commit | 6b69df13a813066197b2439adba31c602f84361b (patch) | |
tree | bbea6f8600634a59bff89d96d4e7ac1343174aa3 /sys/conf | |
parent | da8f615ce6e7fe473ad98685260ce5fb84a39e75 (diff) | |
download | FreeBSD-src-6b69df13a813066197b2439adba31c602f84361b.zip FreeBSD-src-6b69df13a813066197b2439adba31c602f84361b.tar.gz |
Sync with follwing files:
Path Revision
i386/conf/GENERIC 1.162
i386/conf/Makefile.i386 1.146
i386/conf/files.i386 1.236
i386/conf/options.i386 1.111
i386/i386/machdep.c 1.329
i386/i386/userconfig.c 1.134
i386/isa/fd.c 1.135
i386/isa/if_ed.c 1.151
i386/isa/isa_dam.c 1.1
i386/isa/npx.c 1.67
isa/sio.c 1.224
dev/syscons/syscons.c 1.300
i386/isa/wd.c 1.194
isa/vga_isa.c 1.5
isa/atkbd_isa.c 1.3
isa/syscons_isa.c 1.2
Submitted by: Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/Makefile.pc98 | 60 | ||||
-rw-r--r-- | sys/conf/files.pc98 | 41 | ||||
-rw-r--r-- | sys/conf/options.pc98 | 9 |
3 files changed, 48 insertions, 62 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index f9c6717..78ffe97 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.58 1999/04/07 09:28:03 grog Exp $ +# $Id: Makefile.pc98,v 1.59 1999/04/11 03:40:11 grog Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 300010 +%VERSREQ= 400013 KERNFORMAT?= elf @@ -89,6 +89,7 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS} SYMORDER_EXCLUDE=-x symbols.exclude .endif SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET} + .if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o SYSTEM_LD= @${LD} -aout -Bforcedynamic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o @@ -96,6 +97,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ symorder -m ${SYMORDER_EXCLUDE} symbols.sort ${.TARGET}; \ size -aout ${.TARGET} ; chmod 755 ${.TARGET} .endif + .if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ setdef1.o hack.So @@ -106,6 +108,12 @@ SYSTEM_LD_TAIL= @size -elf ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+= $S/i386/conf/kernel.script .endif +.if defined(DEBUG) +FULLKERNEL= ${KERNEL}.debug +.else +FULLKERNEL= ${KERNEL} +.endif + %BEFORE_DEPEND %OBJS @@ -209,47 +217,20 @@ tags: @echo "see $S/kern/Makefile for tags" .if defined(DEBUG) -install: ${KERNEL} -.if ${KERNFORMAT} == "elf" && !defined(FORCE) - @if [ -f /${KERNEL} -a "`file /${KERNEL} 2>/dev/null | grep ELF`" = "" ]; then \ - echo "WARNING: You are about to install an ELF kernel for the first time!" ; \ - echo "Please be sure you have upgraded your bootblocks and/or /boot/loader so" ; \ - echo "that you can boot it. Old bootblocks WILL NOT WORK! Please read:" ; \ - echo "http://www.freebsd.org/~peter/elfday.html for information." ; \ - echo "If you are satisfied you can boot an ELF kernel, type: make -DFORCE install" ; \ - exit 1 ; \ - fi -.endif -.if exists(${DESTDIR}/${KERNEL}) - -chflags noschg ${DESTDIR}/${KERNEL} - mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old +${KERNEL}: ${FULLKERNEL} +.if ${KERNFORMAT} == "elf" + objcopy --strip-debug ${FULLKERNEL} ${KERNEL} +.else + cp ${FULLKERNEL} ${KERNEL} + strip -d kernel .endif - PATH=$${PATH}:/sbin:/usr/sbin; \ - if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \ - sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \ - if [ -f /var/db/kvm_kernel.db ] ; then \ - mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ - fi \ - fi - install -c -m 555 -o root -g wheel -fschg ${KERNEL} ${DESTDIR}/ - .endif -${INSTALL}: - @if [ ! -f ${KERNEL} ] ; then \ - echo "You must first build your kernel before trying to install." ; \ +install install.debug: + @if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \ + echo "You must first build a kernel first." ; \ exit 1 ; \ fi -.if ${KERNFORMAT} == "elf" && !defined(FORCE) - @if [ -f /${KERNEL} -a "`file /${KERNEL} 2>/dev/null | grep ELF`" = "" ]; then \ - echo "WARNING: You are about to install an ELF kernel for the first time!" ; \ - echo "Please be sure you have upgraded your bootblocks and/or /boot/loader so" ; \ - echo "that you can boot it. Old bootblocks WILL NOT WORK! Please read:" ; \ - echo "http://www.freebsd.org/~peter/elfday.html for information." ; \ - echo "If you are satisfied you can boot an ELF kernel, type: make -DFORCE install" ; \ - exit 1 ; \ - fi -.endif .if exists(${DESTDIR}/${KERNEL}) -chflags noschg ${DESTDIR}/${KERNEL} mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old @@ -261,7 +242,8 @@ ${INSTALL}: mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ fi \ fi - install -c -m 555 -o root -g wheel -fschg ${FULLKERNEL} ${DESTDIR}/${KERNEL} + install -c -m 555 -o root -g wheel -fschg \ + ${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL} config.o: ${NORMAL_C} diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index b85515c..65d2f09 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $Id: files.pc98,v 1.88 1999/04/02 08:51:06 kato Exp $ +# $Id: files.pc98,v 1.89 1999/04/10 04:42:46 kato Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -26,6 +26,16 @@ font8x16.o optional std8x16font \ no-implicit-rule before-depend \ clean "${STD8X16FONT}-8x16 font8x16.c" # +atkbdmap.h optional atkbd_dflt_keymap \ + compile-with "kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ + no-obj no-implicit-rule before-depend \ + clean "atkbdmap.h" +# +ukbdmap.h optional ukbd_dflt_keymap \ + compile-with "kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \ + no-obj no-implicit-rule before-depend \ + clean "ukbdmap.h" +# dev/ata/ata-all.c optional ata device-driver dev/ata/ata-dma.c optional ata device-driver dev/ata/atapi-all.c optional ata device-driver @@ -43,7 +53,7 @@ i386/apm/apm_setup.s optional apm i386/eisa/dpt_eisa.c optional eisa dpt device-driver i386/eisa/3c5x9.c optional ep device-driver #i386/eisa/adv_eisa.c optional adv device-driver -i386/eisa/ahc_eisa.c optional ahc device-driver \ +i386/eisa/ahc_eisa.c optional eisa ahc device-driver \ dependency "aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c" i386/eisa/ahb.c optional ahb device-driver i386/eisa/bt_eisa.c optional bt device-driver @@ -76,12 +86,14 @@ i386/i386/mp_machdep.c optional smp i386/i386/mpapic.c optional smp i386/i386/mpboot.s optional smp i386/i386/mplock.s optional smp +i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon profiling-routine i386/i386/perfmon.c optional perfmon i386/i386/pmap.c standard i386/i386/procfs_machdep.c standard i386/i386/simplelock.s optional smp i386/i386/support.s standard +i386/i386/swapgeneric.c standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard i386/i386/trap.c standard @@ -112,7 +124,7 @@ i386/isa/bs/bs.c optional bs device-driver i386/isa/bs/bsfunc.c optional bs device-driver i386/isa/bs/bshw.c optional bs device-driver i386/isa/bs/bsif.c optional bs device-driver -#i386/isa/adv_isa.c optional adv device-driver +i386/isa/adv_isa.c optional adv device-driver #i386/isa/aha1542.c optional aha device-driver i386/isa/aha_isa.c optional aha device-driver i386/isa/bt_isa.c optional bt device-driver @@ -156,7 +168,7 @@ contrib/dev/oltr/trlldbm.c optional oltr device-driver i386/isa/ipl_funcs.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} $<" i386/isa/intr_machdep.c standard -pc98/pc98/pc98.c optional isa device-driver +i386/isa/isa.c optional isa device-driver i386/isa/istallion.c optional stli device-driver i386/isa/joy.c optional joy device-driver pc98/pc98/pc98kbd.c optional pckbd device-driver @@ -169,20 +181,22 @@ pc98/pc98/npx.c mandatory npx device-driver pc98/pc98/pc98gdc.c optional gdc device-driver pc98/pc98/pcaudio.c optional pca device-driver i386/isa/matcd/matcd.c optional matcd device-driver +i386/isa/isa_compat.c optional isa device-driver +pc98/pc98/isa_dma.c optional isa device-driver i386/isa/pcibus.c optional pci device-driver i386/isa/pcicx.c optional ze device-driver i386/isa/pcicx.c optional zp device-driver -#i386/isa/pcvt/pcvt_drv.c optional vt device-driver -#i386/isa/pcvt/pcvt_ext.c optional vt device-driver -#i386/isa/pcvt/pcvt_kbd.c optional vt device-driver -#i386/isa/pcvt/pcvt_out.c optional vt device-driver -#i386/isa/pcvt/pcvt_sup.c optional vt device-driver -#i386/isa/pcvt/pcvt_vtf.c optional vt device-driver +i386/isa/pcvt/pcvt_drv.c optional vt device-driver +i386/isa/pcvt/pcvt_ext.c optional vt device-driver +i386/isa/pcvt/pcvt_kbd.c optional vt device-driver +i386/isa/pcvt/pcvt_out.c optional vt device-driver +i386/isa/pcvt/pcvt_sup.c optional vt device-driver +i386/isa/pcvt/pcvt_vtf.c optional vt device-driver i386/isa/pnp.c optional pnp device-driver i386/isa/prof_machdep.c optional profiling-routine i386/isa/ppc.c optional ppc device-driver i386/isa/pcf.c optional pcf device-driver -i386/isa/psm.c optional psm device-driver +isa/psm.c optional psm device-driver i386/isa/random_machdep.c standard i386/isa/rc.c optional rc device-driver i386/isa/rp.c optional rp device-driver @@ -264,13 +278,10 @@ pc98/pc98/spkr.c optional speaker device-driver i386/isa/stallion.c optional stl device-driver pc98/pc98/syscons.c optional sc device-driver pc98/pc98/scvidctl.c optional sc device-driver -#i386/isa/scvesactl.c optional sc device-driver -#i386/isa/videoio.c optional sc device-driver -#i386/isa/vesa.c optional sc device-driver i386/isa/tw.c optional tw device-driver pc98/pc98/wd.c optional wdc device-driver pc98/pc98/wd.c optional wd device-driver -i386/isa/atapi.c optional atapi device-driver +i386/isa/atapi.c optional wdc device-driver i386/isa/atapi-cd.c optional wcd device-driver i386/isa/wfd.c optional wfd device-driver i386/isa/wst.c optional wst device-driver diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 9e45a0b..9c61ad2 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -1,4 +1,4 @@ -# $Id: options.pc98,v 1.82 1999/03/10 14:51:52 kato Exp $ +# $Id: options.pc98,v 1.83 1999/03/17 09:00:33 kato Exp $ DISABLE_PSE IDE_DELAY @@ -75,8 +75,6 @@ SC_MOUSE_CHAR opt_syscons.h FB_INSTALL_CDEV opt_fb.h -VESA opt_vesa.h - GDC opt_gdc.h PSM_HOOKAPM opt_psm.h @@ -92,11 +90,6 @@ KBD_MAXWAIT opt_kbd.h KBD_RESETDELAY opt_kbd.h KBDIO_DEBUG opt_kbd.h -ATAPI opt_atapi.h -ATAPI_STATIC opt_atapi.h - -CMD640 opt_wd.h - USERCONFIG opt_userconfig.h VISUAL_USERCONFIG opt_userconfig.h INTRO_USERCONFIG opt_userconfig.h |