diff options
| author | imp <imp@FreeBSD.org> | 2012-10-24 16:53:02 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2012-10-24 16:53:02 +0000 |
| commit | da47e6313bc2f9d97c2c285679c71d7a5298670c (patch) | |
| tree | 49dcf2d04888701d819925a195b905b86a3fa781 | |
| parent | fa013d15544fcdb266f9b2235cff076ae1d55add (diff) | |
| download | FreeBSD-src-da47e6313bc2f9d97c2c285679c71d7a5298670c.zip FreeBSD-src-da47e6313bc2f9d97c2c285679c71d7a5298670c.tar.gz | |
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.
| -rw-r--r-- | sys/conf/files | 6 | ||||
| -rw-r--r-- | sys/conf/files.arm | 6 | ||||
| -rw-r--r-- | sys/conf/files.mips | 6 | ||||
| -rw-r--r-- | sys/conf/files.powerpc | 12 |
4 files changed, 12 insertions, 18 deletions
diff --git a/sys/conf/files b/sys/conf/files index a80084a..7594665 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 775dfcb..cef8cb1 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -62,12 +62,6 @@ cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs compile-with "${Z 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 diff --git a/sys/conf/files.mips b/sys/conf/files.mips index 39e3dfa..1bb2d4f 100644 --- a/sys/conf/files.mips +++ b/sys/conf/files.mips @@ -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 diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 915e20c..036e79d 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -37,14 +37,14 @@ dev/iicbus/ds1775.c optional ds1775 powermac 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 |
