svn commit: r336724 - in head/sys: conf dev/ipmi modules modules/ipmi powerpc/powernv
Justin Hibbits
jhibbits at FreeBSD.org
Wed Jul 25 18:58:59 UTC 2018
Author: jhibbits
Date: Wed Jul 25 18:58:57 2018
New Revision: 336724
URL: https://svnweb.freebsd.org/changeset/base/336724
Log:
Support building IPMI as a module on powerpc64
This still only supports IPMI via OPAL on powerpc64, but now it can be tested
with a GENERIC kernel.
Added:
head/sys/dev/ipmi/ipmi_opal.c
- copied, changed from r336723, head/sys/powerpc/powernv/opal_ipmi.c
Deleted:
head/sys/powerpc/powernv/opal_ipmi.c
Modified:
head/sys/conf/files.powerpc
head/sys/modules/Makefile
head/sys/modules/ipmi/Makefile
Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc Wed Jul 25 18:21:14 2018 (r336723)
+++ head/sys/conf/files.powerpc Wed Jul 25 18:58:57 2018 (r336724)
@@ -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
Copied and modified: head/sys/dev/ipmi/ipmi_opal.c (from r336723, head/sys/powerpc/powernv/opal_ipmi.c)
==============================================================================
--- head/sys/powerpc/powernv/opal_ipmi.c Wed Jul 25 18:21:14 2018 (r336723, copy source)
+++ head/sys/dev/ipmi/ipmi_opal.c Wed Jul 25 18:58:57 2018 (r336724)
@@ -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;
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Wed Jul 25 18:21:14 2018 (r336723)
+++ head/sys/modules/Makefile Wed Jul 25 18:58:57 2018 (r336724)
@@ -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.
Modified: head/sys/modules/ipmi/Makefile
==============================================================================
--- head/sys/modules/ipmi/Makefile Wed Jul 25 18:21:14 2018 (r336723)
+++ head/sys/modules/ipmi/Makefile Wed Jul 25 18:58:57 2018 (r336724)
@@ -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>
More information about the svn-src-head
mailing list