aboutsummaryrefslogtreecommitdiff
path: root/sys/sparc64
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2003-02-26 23:36:59 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2003-02-26 23:36:59 +0000
commit824018495dab02c587bd34e46749f175aa817c8e (patch)
tree24f5646a6a12f22ba761c4910b02c1dd2fc0fdc8 /sys/sparc64
parent3c6751676670a847160f0a5bdc21f64ebd199c99 (diff)
downloadsrc-824018495dab02c587bd34e46749f175aa817c8e.tar.gz
src-824018495dab02c587bd34e46749f175aa817c8e.zip
Implemented "nooption" and "nomakeoption" config(8) tokens.
Fixed memory leak in the "nodevice" option implementation. Use these instead of sed(1) in MD NOTES. Use a single makefile (sys/conf/makeLINT.mk) to generate LINT for all architectures. (Previous versions missed the LINT dependency on Makefile, and i386 version also missed the dependency on ${NOTES}.) Fixed bugs in the previous NOTES conversion using the "nodevice" token and sed(1): - i386 LINT lost "device pst". - pc98 LINT lost SC_*, MAXCONS and KBD_DISABLE_KEYMAP_LOAD options, and got needless DPT_* options. - Added nooptions PPC_DEBUG, PPC_PROBE_CHIPSET, KBD_INSTALL_CDEV to sparc64 LINT so that it has a chance to config(8). This basically returns us to where we were before.
Notes
Notes: svn path=/head/; revision=111582
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/conf/Makefile42
-rw-r--r--sys/sparc64/conf/NOTES46
2 files changed, 47 insertions, 41 deletions
diff --git a/sys/sparc64/conf/Makefile b/sys/sparc64/conf/Makefile
index c05af2cf8ecc..2c006e9c2c80 100644
--- a/sys/sparc64/conf/Makefile
+++ b/sys/sparc64/conf/Makefile
@@ -1,43 +1,3 @@
# $FreeBSD$
-all:
- @echo "make LINT only"
-
-clean:
- rm -f LINT
-
-NOTES= ../../conf/NOTES NOTES
-LINT: ${NOTES} ../../conf/makeLINT.sed
- cat ${NOTES} | sed -E -n -f ../../conf/makeLINT.sed \
- | sed -e /VGA_DEBUG/d \
- -e /SC_RENDER_DEBUG/d \
- -e /SC_DEBUG_LEVEL/d \
- -e /SC_NO_SUSPEND_VTYSWITCH/d \
- -e /SC_NO_SYSMOUSE/d \
- -e /SC_NO_HISTORY/d \
- -e /SC_NO_FONT_LOADING/d \
- -e /SC_NO_CUTPASTE/d \
- -e /SC_TWOBUTTON_MOUSE/d \
- -e /SC_CUT_SEPCHARS/d \
- -e /SC_CUT_SPACES2TABS/d \
- -e /SC_KERNEL_CONS_REV_ATTR/d \
- -e /SC_KERNEL_CONS_ATTR/d \
- -e /SC_NORM_REV_ATTR/d \
- -e /SC_NORM_ATTR/d \
- -e /SC_PIXEL_MODE/d \
- -e /SC_MOUSE_CHAR/d \
- -e /SC_HISTORY_SIZE/d \
- -e /SC_DISABLE_REBOOT/d \
- -e /SC_DISABLE_DDBKEY/d \
- -e /SC_DFLT_FONT/d \
- -e /SC_ALT_MOUSE_IMAGE/d \
- -e /MAXCONS/d \
- -e /VGA_WIDTH90/d \
- -e /VGA_SLOW_IOACCESS/d \
- -e /VGA_ALT_SEQACCESS/d \
- -e /PSM_RESETAFTERSUSPEND/d \
- -e /PSM_HOOKRESUME/d \
- -e /KBD_DISABLE_KEYMAP_LOAD/d \
- -e /ATKBD_DFLT_KEYMAP/d \
- -e /EXT2FS/d \
- > ${.TARGET}
+.include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 4f3bfc3fd70b..0af3eb0afe3a 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -82,3 +82,49 @@ nodevice bt
nodevice wds
nodevice ep
nodevice ex
+
+
+#####################################################################
+# Options we don't want to deal with
+
+nooption VGA_DEBUG
+nooption SC_RENDER_DEBUG
+nooption SC_DEBUG_LEVEL
+nooption PPC_DEBUG
+nooption PPC_PROBE_CHIPSET
+nooption SC_NO_SUSPEND_VTYSWITCH
+nooption SC_NO_SYSMOUSE
+nooption SC_NO_HISTORY
+nooption SC_NO_FONT_LOADING
+nooption SC_NO_CUTPASTE
+nooption SC_TWOBUTTON_MOUSE
+nooption SC_CUT_SEPCHARS
+nooption SC_CUT_SPACES2TABS
+nooption SC_KERNEL_CONS_REV_ATTR
+nooption SC_KERNEL_CONS_ATTR
+nooption SC_NORM_REV_ATTR
+nooption SC_NORM_ATTR
+nooption SC_PIXEL_MODE
+nooption SC_MOUSE_CHAR
+nooption SC_HISTORY_SIZE
+nooption SC_DISABLE_REBOOT
+nooption SC_DISABLE_DDBKEY
+nooption SC_DFLT_FONT
+nooption SC_ALT_MOUSE_IMAGE
+nooption MAXCONS
+nooption VGA_WIDTH90
+nooption VGA_SLOW_IOACCESS
+nooption VGA_ALT_SEQACCESS
+nooption PSM_RESETAFTERSUSPEND
+nooption PSM_HOOKRESUME
+nooption KBD_INSTALL_CDEV
+nooption KBD_DISABLE_KEYMAP_LOAD
+nooption ATKBD_DFLT_KEYMAP
+nooption EXT2FS
+
+
+#####################################################################
+# Make options we don't want to deal with
+
+nomakeoption SC_DFLT_FONT
+nomakeoption ATKBD_DFLT_KEYMAP