Date: Wed, 24 Oct 2012 16:53:02 +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: r242008 - head/sys/conf Message-ID: <201210241653.q9OGr2Qp055573@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Oct 24 16:53:02 2012 New Revision: 242008 URL: http://svn.freebsd.org/changeset/base/242008 Log: Move common fdt into files. Duplicate in files.powerpc the files shared with aim. Config is smart enough to cope with multiple lines of the same path with different options. This reduces the needless duplication. Modified: head/sys/conf/files head/sys/conf/files.arm head/sys/conf/files.mips head/sys/conf/files.powerpc Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Oct 24 16:39:49 2012 (r242007) +++ head/sys/conf/files Wed Oct 24 16:53:02 2012 (r242008) @@ -1772,6 +1772,12 @@ dev/oce/oce_mbox.c optional oce pci dev/oce/oce_queue.c optional oce pci dev/oce/oce_sysctl.c optional oce pci dev/oce/oce_util.c optional oce pci +dev/ofw/ofw_bus_if.m optional fdt +dev/ofw/ofw_bus_subr.c optional fdt +dev/ofw/ofw_fdt.c optional fdt +dev/ofw/ofw_if.m optional fdt +dev/ofw/openfirm.c optional fdt +dev/ofw/openfirmio.c optional fdt dev/patm/if_patm.c optional patm pci dev/patm/if_patm_attach.c optional patm pci dev/patm/if_patm_intr.c optional patm pci Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Wed Oct 24 16:39:49 2012 (r242007) +++ head/sys/conf/files.arm Wed Oct 24 16:53:02 2012 (r242008) @@ -62,12 +62,6 @@ cddl/compat/opensolaris/kern/opensolaris dev/fb/fb.c optional sc dev/hwpmc/hwpmc_arm.c optional hwpmc dev/kbd/kbd.c optional sc -dev/ofw/openfirm.c optional fdt -dev/ofw/openfirmio.c optional fdt -dev/ofw/ofw_bus_if.m optional fdt -dev/ofw/ofw_if.m optional fdt -dev/ofw/ofw_bus_subr.c optional fdt -dev/ofw/ofw_fdt.c optional fdt dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc Modified: head/sys/conf/files.mips ============================================================================== --- head/sys/conf/files.mips Wed Oct 24 16:39:49 2012 (r242007) +++ head/sys/conf/files.mips Wed Oct 24 16:53:02 2012 (r242008) @@ -85,12 +85,6 @@ dev/syscons/scvtb.c optional sc mips/mips/sc_machdep.c optional sc # FDT support -dev/ofw/openfirm.c optional fdt -dev/ofw/openfirmio.c optional fdt -dev/ofw/ofw_bus_if.m optional fdt -dev/ofw/ofw_if.m optional fdt -dev/ofw/ofw_bus_subr.c optional fdt -dev/ofw/ofw_fdt.c optional fdt dev/fdt/fdt_mips.c optional fdt # crypto support -- use generic Modified: head/sys/conf/files.powerpc ============================================================================== --- head/sys/conf/files.powerpc Wed Oct 24 16:39:49 2012 (r242007) +++ head/sys/conf/files.powerpc Wed Oct 24 16:53:02 2012 (r242008) @@ -37,14 +37,14 @@ dev/iicbus/ds1775.c optional ds1775 pow dev/iicbus/max6690.c optional max6690 powermac dev/kbd/kbd.c optional sc dev/nand/nfc_fsl.c optional nand mpc85xx -dev/ofw/openfirm.c optional aim | fdt -dev/ofw/openfirmio.c optional aim | fdt -dev/ofw/ofw_bus_if.m optional aim | fdt -dev/ofw/ofw_if.m optional aim | fdt -dev/ofw/ofw_bus_subr.c optional aim | fdt +# ofw can be either aim or fdt: fdt case handled in files. aim only powerpc specific. +dev/ofw/openfirm.c optional aim +dev/ofw/openfirmio.c optional aim +dev/ofw/ofw_bus_if.m optional aim +dev/ofw/ofw_if.m optional aim +dev/ofw/ofw_bus_subr.c optional aim dev/ofw/ofw_console.c optional aim dev/ofw/ofw_disk.c optional ofwd aim -dev/ofw/ofw_fdt.c optional fdt dev/ofw/ofw_iicbus.c optional iicbus aim dev/ofw/ofw_standard.c optional aim powerpc dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210241653.q9OGr2Qp055573>