diff options
| -rw-r--r-- | sys/conf/files.powerpc | 2 | ||||
| -rw-r--r-- | sys/dev/ipmi/ipmi_opal.c (renamed from sys/powerpc/powernv/opal_ipmi.c) | 2 | ||||
| -rw-r--r-- | sys/modules/Makefile | 1 | ||||
| -rw-r--r-- | sys/modules/ipmi/Makefile | 10 |
4 files changed, 11 insertions, 4 deletions
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 981ffbc75166..183796dc4cfc 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -43,6 +43,7 @@ dev/iicbus/ds1775.c optional ds1775 powermac dev/iicbus/max6690.c optional max6690 powermac dev/iicbus/ofw_iicbus.c optional iicbus aim dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_opal.c optional powernv ipmi dev/nand/nfc_fsl.c optional nand mpc85xx dev/nand/nfc_rb.c optional nand mpc85xx # Most ofw stuff below is brought in by conf/files for options FDT, but @@ -192,7 +193,6 @@ powerpc/powernv/opal_console.c optional powernv powerpc/powernv/opal_dev.c optional powernv powerpc/powernv/opal_i2c.c optional iicbus fdt powernv powerpc/powernv/opal_i2cm.c optional iicbus fdt powernv -powerpc/powernv/opal_ipmi.c optional powernv ipmi powerpc/powernv/opal_pci.c optional powernv pci powerpc/powernv/opal_sensor.c optional powernv powerpc/powernv/opalcall.S optional powernv diff --git a/sys/powerpc/powernv/opal_ipmi.c b/sys/dev/ipmi/ipmi_opal.c index 051822d48712..c0a244373b2d 100644 --- a/sys/powerpc/powernv/opal_ipmi.c +++ b/sys/dev/ipmi/ipmi_opal.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/ipmi.h> #include <dev/ipmi/ipmivars.h> -#include "opal.h" +#include <powerpc/powernv/opal.h> struct opal_ipmi_softc { struct ipmi_softc ipmi; diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f4f9ad02328c..483b25089508 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -794,6 +794,7 @@ _wi= wi .if ${MACHINE_ARCH} == "powerpc64" _drm2= drm2 +_ipmi= ipmi .endif .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" # Don't build powermac_nvram for powerpcspe, it's never supported. diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile index 12de0068a410..fe827ef1bcd3 100644 --- a/sys/modules/ipmi/Makefile +++ b/sys/modules/ipmi/Makefile @@ -7,9 +7,15 @@ SUBDIR+= ipmi_linux # XXX - ipmi_smbus and ipmi_ssif depend on smbus # XXX - ipmi_acpi depends on acpi KMOD= ipmi -SRCS= ipmi.c ipmi_kcs.c ipmi_smic.c ipmi_smbios.c ipmi_ssif.c +SRCS= ipmi.c +SRCS+= bus_if.h device_if.h +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "i386" +SRCS+= ipmi_kcs.c ipmi_smic.c ipmi_smbios.c ipmi_ssif.c SRCS+= ipmi_acpi.c ipmi_isa.c ipmi_pci.c ipmi_smbus.c SRCS+= opt_acpi.h -SRCS+= acpi_if.h bus_if.h device_if.h isa_if.h pci_if.h smbus_if.h +SRCS+= acpi_if.h isa_if.h pci_if.h smbus_if.h +.elif ${MACHINE_ARCH} == "powerpc64" +SRCS+= ipmi_opal.c +.endif .include <bsd.kmod.mk> |