summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/intel')
-rw-r--r--usr/src/uts/intel/Makefile.intel.shared2
-rw-r--r--usr/src/uts/intel/ia32/ml/modstubs.s1
-rw-r--r--usr/src/uts/intel/sys/Makefile2
-rw-r--r--usr/src/uts/intel/sys/kd.h57
-rw-r--r--usr/src/uts/intel/tem/Makefile31
-rw-r--r--usr/src/uts/intel/warlock/Makefile5
-rw-r--r--usr/src/uts/intel/wc/Makefile40
7 files changed, 71 insertions, 67 deletions
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index 280b7b5c07..185eb386ea 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -82,7 +82,7 @@ include $(UTSTREE)/common/Makefile.files
# defined before we include Makefile.uts, or else genunix's build
# won't be as parallel as we might like.
#
-NOT_YET_KMODS = $(OLDPTY_OBJS) $(PTY_OBJS) $(MOD_OBJS)
+NOT_YET_KMODS = $(OLDPTY_OBJS) $(PTY_OBJS) $(VCONS_CONF_OBJS) $(MOD_OBJS)
#
# ----- END OF TRANSITIONAL SECTION -------------------------------------------
diff --git a/usr/src/uts/intel/ia32/ml/modstubs.s b/usr/src/uts/intel/ia32/ml/modstubs.s
index bec4b20e5d..a1352a260b 100644
--- a/usr/src/uts/intel/ia32/ml/modstubs.s
+++ b/usr/src/uts/intel/ia32/ml/modstubs.s
@@ -428,6 +428,7 @@ fcnname/**/_info: \
NO_UNLOAD_STUB(dev, devname_profile_update, nomod_minus_one);
NO_UNLOAD_STUB(dev, sdev_module_register, nomod_minus_one);
NO_UNLOAD_STUB(dev, sdev_devstate_change, nomod_minus_one);
+ NO_UNLOAD_STUB(dev, devvt_getvnodeops, nomod_minus_one);
NO_UNLOAD_STUB(dev, devpts_getvnodeops, nomod_zero);
END_MODULE(dev);
#endif
diff --git a/usr/src/uts/intel/sys/Makefile b/usr/src/uts/intel/sys/Makefile
index 8ac0deba85..2b242ba979 100644
--- a/usr/src/uts/intel/sys/Makefile
+++ b/usr/src/uts/intel/sys/Makefile
@@ -22,7 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#
include ../../../Makefile.master
@@ -48,7 +47,6 @@ HDRS = \
inline.h \
iommulib.h \
hypervisor.h \
- kd.h \
kdi_machimpl.h \
kdi_regs.h \
machlock.h \
diff --git a/usr/src/uts/intel/sys/kd.h b/usr/src/uts/intel/sys/kd.h
deleted file mode 100644
index 4daffa1e4f..0000000000
--- a/usr/src/uts/intel/sys/kd.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 1999 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */
-
-/* Copyright (c) 1984, 1986, 1987, 1988, 1989, 1990 AT&T */
-/* All Rights Reserved */
-
-#ifndef _SYS_KD_H
-#define _SYS_KD_H
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-/*
- * Minimal compatibility support for "kd" ioctls.
- *
- * This file may be deleted or changed without notice.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define KDIOC ('K'<<8)
-#define KDGETMODE (KDIOC|9) /* get text/graphics mode */
-#define KDSETMODE (KDIOC|10) /* set text/graphics mode */
-#define KD_TEXT 0
-#define KD_GRAPHICS 1
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SYS_KD_H */
diff --git a/usr/src/uts/intel/tem/Makefile b/usr/src/uts/intel/tem/Makefile
index ac45575c5e..9962a28f30 100644
--- a/usr/src/uts/intel/tem/Makefile
+++ b/usr/src/uts/intel/tem/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This makefile drives the production of the tem module
#
# intel implementation architecture dependent
@@ -42,6 +40,9 @@ MODULE = tem
OBJECTS = $(TEM_OBJS:%=$(OBJS_DIR)/%)
LINTS = $(TEM_OBJS:%.o=$(LINTS_DIR)/%.ln)
ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE)
+WARLOCK_OUT = $(TEM_OBJS:%.o=%.ll)
+WARLOCK_OK = $(MODULE).ok
+WLCMD_DIR = $(UTSBASE)/common/io/warlock
#
# Include common rules.
@@ -63,7 +64,6 @@ LDFLAGS += -dy -Ndacf/consconfig_dacf
# Please do not carry these forward to new Makefiles.
#
LINTTAGS += -erroff=E_STATIC_UNUSED
-LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
#
# Default build targets.
@@ -90,3 +90,26 @@ install: $(INSTALL_DEPS)
# Include common targets.
#
include $(UTSBASE)/intel/Makefile.targ
+
+#
+# Defines for local commands
+#
+TEST = test
+WLCC = wlcc
+TOUCH = touch
+WARLOCK = warlock
+
+#
+# warlock targets
+#
+
+warlock: $(WARLOCK_OUT) warlock_ddi.files
+ $(WARLOCK) -c $(WLCMD_DIR)/tem.wlcmd $(WARLOCK_OUT) \
+ -l ../../intel/warlock/ddi_dki_impl.ll
+ $(TOUCH) $(WARLOCK_OK)
+
+%.ll: $(UTSBASE)/common/io/%.c
+ $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
+
+warlock_ddi.files:
+ @cd ../../intel/warlock; pwd; $(MAKE) warlock
diff --git a/usr/src/uts/intel/warlock/Makefile b/usr/src/uts/intel/warlock/Makefile
index 028c88d4a4..fbefb9b95d 100644
--- a/usr/src/uts/intel/warlock/Makefile
+++ b/usr/src/uts/intel/warlock/Makefile
@@ -52,7 +52,7 @@ include $(UTSBASE)/intel/Makefile.intel
# lock_lint rules
#
all: warlock warlock.1394 warlock.audio warlock.ecpp warlock.scsi \
- warlock.usb warlock.ib warlock.sata warlock.sdcard
+ warlock.usb warlock.ib warlock.sata warlock.sdcard warlock.wc
warlock: $(MODULE).ok
@@ -137,3 +137,6 @@ $(CLOSED_BUILD) @cd $(CLOSED)/uts/intel/marvell88sx; \
warlock.sdcard:
@cd ../sda; $(MAKE) clean; $(MAKE) warlock
@cd ../sdhost; $(MAKE) clean; $(MAKE) warlock
+
+warlock.wc:
+ @cd ../wc; $(MAKE) clean; $(MAKE) warlock
diff --git a/usr/src/uts/intel/wc/Makefile b/usr/src/uts/intel/wc/Makefile
index efdad561f7..b7461a4bed 100644
--- a/usr/src/uts/intel/wc/Makefile
+++ b/usr/src/uts/intel/wc/Makefile
@@ -23,7 +23,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
#
# This makefile drives the production of the wc driver
# kernel module.
@@ -44,6 +43,9 @@ OBJECTS = $(WC_OBJS:%=$(OBJS_DIR)/%)
LINTS = $(WC_OBJS:%.o=$(LINTS_DIR)/%.ln)
ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE)
CONF_SRCDIR = $(UTSBASE)/common/io
+WARLOCK_OUT = $(WC_OBJS:%.o=%.ll)
+WARLOCK_OK = $(MODULE).ok
+WLCMD_DIR = $(UTSBASE)/common/io/warlock
#
# Include common rules.
@@ -60,7 +62,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
#
# Overrides.
#
-LDFLAGS += -dy -Nmisc/tem
+LDFLAGS += -dy -Nmisc/tem -Ndacf/consconfig_dacf
#
# Default build targets.
@@ -87,3 +89,37 @@ install: $(INSTALL_DEPS)
# Include common targets.
#
include $(UTSBASE)/intel/Makefile.targ
+
+#
+# Defines for local commands
+#
+TEST = test
+WLCC = wlcc
+TOUCH = touch
+WARLOCK = warlock
+
+#
+# warlock targets
+#
+
+#
+# vcons_conf.c is compile to genunix, add it to WARLOCK_OUT
+#
+WARLOCK_OUT += vcons_conf.ll
+
+warlock: $(WARLOCK_OUT) sdev_vtops.file warlock_ddi.files
+ $(WARLOCK) -c $(WLCMD_DIR)/wc.wlcmd $(WARLOCK_OUT) \
+ -l ../../intel/warlock/ddi_dki_impl.ll
+ $(WARLOCK) -c $(WLCMD_DIR)/wc_devfs.wlcmd sdev_vtops.ll vcons_conf.ll \
+ -l ../../intel/warlock/ddi_dki_impl.ll
+ $(TOUCH) $(WARLOCK_OK)
+
+%.ll: $(UTSBASE)/common/io/%.c
+ $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
+
+sdev_vtops.file:
+ $(WLCC) $(CPPFLAGS) -DDEBUG -o sdev_vtops.ll -c \
+ ../../common/fs/dev/sdev_vtops.c
+
+warlock_ddi.files:
+ @cd ../../intel/warlock; pwd; $(MAKE) warlock
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-04 20:58:43 +0000