Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Aug 2019 22:58:56 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r350965 - head/sys/conf
Message-ID:  <201908122258.x7CMwulJ013011@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Mon Aug 12 22:58:56 2019
New Revision: 350965
URL: https://svnweb.freebsd.org/changeset/base/350965

Log:
  Create files.x86
  
  files.x86 is for the parts of the system that are common to both i386 and amd64
  due too their nature. First up, to get the ball rolling, is fdc, the floppy disk
  support. It works only on amd64 and i386 these days, and that's unlikely to
  change.
  
  Reviewed by: jhb, cem (earlier versrions)
  Differential Revision: https://reviews.freebsd.org/D21210

Added:
  head/sys/conf/files.x86   (contents, props changed)
Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Mon Aug 12 22:58:50 2019	(r350964)
+++ head/sys/conf/files.amd64	Mon Aug 12 22:58:56 2019	(r350965)
@@ -3,6 +3,10 @@
 #
 # $FreeBSD$
 #
+
+# common files stuff between i386 and amd64
+include 	"conf/files.x86"
+
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
@@ -298,10 +302,6 @@ dev/ixl/i40e_adminq.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_dcb.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/fdc/fdc.c			optional	fdc
-dev/fdc/fdc_acpi.c		optional	fdc
-dev/fdc/fdc_isa.c		optional	fdc isa
-dev/fdc/fdc_pccard.c		optional	fdc pccard
 dev/gpio/bytgpio.c		optional	bytgpio
 dev/gpio/chvgpio.c		optional	chvgpio
 dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Mon Aug 12 22:58:50 2019	(r350964)
+++ head/sys/conf/files.i386	Mon Aug 12 22:58:56 2019	(r350965)
@@ -3,6 +3,10 @@
 #
 # $FreeBSD$
 #
+
+# common files stuff between i386 and amd64
+include 	"conf/files.x86"
+
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
@@ -208,10 +212,6 @@ dev/fb/fb.c			optional fb | vga
 dev/fb/s3_pci.c			optional s3pci
 dev/fb/vesa.c			optional vga vesa
 dev/fb/vga.c			optional vga
-dev/fdc/fdc.c			optional fdc
-dev/fdc/fdc_acpi.c		optional fdc
-dev/fdc/fdc_isa.c		optional fdc isa
-dev/fdc/fdc_pccard.c		optional fdc pccard
 dev/fe/if_fe_isa.c		optional fe isa
 dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb

Added: head/sys/conf/files.x86
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/conf/files.x86	Mon Aug 12 22:58:56 2019	(r350965)
@@ -0,0 +1,14 @@
+# This file tells config what files go into building a kernel,
+# files marked standard are always included.
+#
+# $FreeBSD$
+#
+# This file contains all the x86 devices and such that are
+# common between i386 and amd64, but aren't applicable to
+# any other architecture we support.
+#
+
+dev/fdc/fdc.c			optional	fdc
+dev/fdc/fdc_acpi.c		optional	fdc
+dev/fdc/fdc_isa.c		optional	fdc isa
+dev/fdc/fdc_pccard.c		optional	fdc pccard



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908122258.x7CMwulJ013011>