| commit | 7679048deb140faef141951a213435c074ab2dec | [log] [tgz] |
|---|---|---|
| author | nkskjames <nkskjames@gmail.com> | Wed Feb 10 12:58:16 2016 -0600 |
| committer | nkskjames <nkskjames@gmail.com> | Wed Feb 10 12:58:16 2016 -0600 |
| tree | 72fac8677e392f22feea36b0aee800951e3748c4 | |
| parent | 4d9450c8effd1f86231731465f51585f5c749286 [diff] | |
| parent | 1c2fa8ab6b37d4e60341d51e71fc856e3a69120b [diff] |
Merge pull request #139 from hramasub/systemd-networkd-dbus-patch Dbus API for systemd/networkd for network configuration.
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 998323c..2b7d6e8 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
@@ -122,6 +122,9 @@ # CONFIG_SERIAL_8250_DMA is not set CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_RUNTIME_UARTS=6 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_ASPEED_VUART=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_HW_RANDOM=y CONFIG_I2C=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb index e14d168..14aaa30 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb
@@ -10,7 +10,7 @@ LINUX_VERSION ?= "4.3" LINUX_VERSION_EXTENSION ?= "-${SRCREV}" -SRCREV="fe68a785afbaa305506c87c6324f70ed0605385c" +SRCREV="openbmc-20160210-1" PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index a7ea6f6..37019f9 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
@@ -13,10 +13,10 @@ inherit obmc-phosphor-system-mgmt DEPENDS += "glib-2.0" -RDEPENDS_${PN} += "python-subprocess python-compression" +RDEPENDS_${PN} += "python-subprocess python-compression libsystemd" SRC_URI += "git://github.com/openbmc/skeleton" -SRCREV = "8a65a54d94f7caeb50516f476c8f382235b61586" +SRCREV = "7cd8ff61591033a70bb3535b8f55a9f5a3c3e6e1" S = "${WORKDIR}"