diff options
4 files changed, 7 insertions, 5 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig index b6cdb942e..05819c679 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig @@ -74,7 +74,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ASPEED_BT_IPMI_HOST=y CONFIG_EEPROM_AT24=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_ARC is not set @@ -119,6 +118,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_ASPEED_VUART=y +CONFIG_ASPEED_BT_IPMI_BMC=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig index 3d5d23669..ab6f91ba6 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig @@ -77,7 +77,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ASPEED_BT_IPMI_HOST=y CONFIG_EEPROM_AT24=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_ARC is not set @@ -122,6 +121,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_ASPEED_VUART=y +CONFIG_ASPEED_BT_IPMI_BMC=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb index e9741b35b..af79bbe5c 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb @@ -1,5 +1,5 @@ KBRANCH ?= "dev-4.7" LINUX_VERSION ?= "4.7" -SRCREV="731a90c2a97d8909c27cf0ce6b52b03c0068274b" +SRCREV="9e654d63fbc0b383944d8a13914669547f27d904" require linux-obmc.inc diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb index 9c55cf422..601e5e2e3 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb @@ -4,6 +4,7 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +inherit autotools pkgconfig inherit obmc-phosphor-dbus-service DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service" @@ -12,13 +13,14 @@ PROVIDES += "virtual/obmc-host-ipmi-hw" RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" RRECOMMENDS_${PN} += "host-ipmid" +DEPENDS += "autoconf-archive-native" DEPENDS += "systemd" RDEPENDS_${PN} += "libsystemd" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/btbridge" -SRCREV="39b3700766d851009258544aa0f75365f024c597" +SRCREV="68bcce035ac7029d3110b53fb07848067da56b40" # This is how linux-libc-headers says to include custom uapi headers -EXTRA_OEMAKE_append = "CFLAGS=-I${STAGING_KERNEL_DIR}/include/uapi" +CFLAGS_append = "-I ${STAGING_KERNEL_DIR}/include/uapi" do_configure[depends] += "virtual/kernel:do_shared_workdir" |
