diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-02-05 14:44:22 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-02-05 14:44:22 +0000 |
| commit | c9c7c29042edbacac0655e50d2cb5bce2dfcf868 (patch) | |
| tree | a1c26991ebc26c8653ff139a31f4170c40ded476 /sys/conf | |
| parent | 1df1f0b35425dc8e9fad0cd70aa71dcd532433d4 (diff) | |
| download | FreeBSD-src-c9c7c29042edbacac0655e50d2cb5bce2dfcf868.zip FreeBSD-src-c9c7c29042edbacac0655e50d2cb5bce2dfcf868.tar.gz | |
Move Open Firmware device root on PowerPC, ARM, and MIPS systems to
a sub-node of nexus (ofwbus) rather than direct attach under nexus. This
fixes FDT on x86 and will make coexistence with ACPI on ARM systems easier.
SPARC is unchanged.
Reviewed by: imp, ian
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 3 | ||||
| -rw-r--r-- | sys/conf/files.powerpc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files index dea5920..dba13a7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1370,7 +1370,6 @@ dev/fdt/fdt_common.c optional fdt dev/fdt/fdt_slicer.c optional fdt cfi | fdt nand dev/fdt/fdt_static_dtb.S optional fdt fdt_dtb_static \ dependency "$S/boot/fdt/dts/${FDT_DTS_FILE}" -dev/fdt/fdtbus.c optional fdtbus dev/fdt/simplebus.c optional fdt dev/fe/if_fe.c optional fe dev/fe/if_fe_pccard.c optional fe pccard @@ -1886,7 +1885,7 @@ dev/ofw/ofw_bus_subr.c optional fdt dev/ofw/ofw_fdt.c optional fdt dev/ofw/ofw_if.m optional fdt dev/ofw/ofw_iicbus.c optional fdt iicbus -dev/ofw/ofw_nexus.c optional fdt +dev/ofw/ofwbus.c optional fdt dev/ofw/openfirm.c optional fdt dev/ofw/openfirmio.c optional fdt dev/patm/if_patm.c optional patm pci diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 63b70c4..0e9d1c3 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -48,7 +48,7 @@ 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_iicbus.c optional iicbus aim -dev/ofw/ofw_nexus.c optional aim | fdt +dev/ofw/ofwbus.c optional aim | fdt dev/ofw/ofw_standard.c optional aim powerpc dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_fdt.c optional quicc mpc85xx |
