diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-10-14 10:30:03 +1100 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-10-14 15:04:09 +0000 |
| commit | 0df9bcf913a57f0ee2b1f793e677c05860a229de (patch) | |
| tree | ea1e0384fc67178b31b36b6b1af10adf77fa94a1 /meta-openbmc-machines | |
| parent | 8a844de1c272f66f35560a864b97a6672aa0e95b (diff) | |
| download | talos-openbmc-0df9bcf913a57f0ee2b1f793e677c05860a229de.tar.gz talos-openbmc-0df9bcf913a57f0ee2b1f793e677c05860a229de.zip | |
meta-obmc-machines: Witherspoon kernel override
This was an oversight when moving all of the systems to the 4.7 kernel
tree.
Fixes openbmc/openbmc#662 and fixes openbmc/openbmc#648.
Change-Id: Idc39a1e8b8406f72f1c2c20a6a37af06eb2ad002
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-machines')
3 files changed, 0 insertions, 64 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc/0001-Add-flash-and-layout-to-Witherspoon-devtree.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc/0001-Add-flash-and-layout-to-Witherspoon-devtree.patch deleted file mode 100644 index d8343a91e..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc/0001-Add-flash-and-layout-to-Witherspoon-devtree.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 2e7be544f38127097b44799c5ec8004a3faafe2a Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Thu, 16 Jun 2016 22:17:45 -0400 -Subject: [PATCH] Add flash and layout to Witherspoon devtree - -Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> ---- - arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 33 ++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts -index bb5ec59..e0bbaf8 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts -@@ -19,6 +19,39 @@ - memory { - reg = <0x80000000 0x40000000>; - }; -+ -+ ahb { -+ -+ fmc@1e620000 { -+ reg = < 0x1e620000 0x94 -+ 0x20000000 0x02000000 >; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ compatible = "aspeed,fmc"; -+ -+ flash@0 { -+ reg = < 0 >; -+ compatible = "jedec,spi-nor" ; -+#include "aspeed-bmc-opp-flash-layout.dtsi" -+ }; -+ }; -+ spi@1e630000 { -+ reg = < 0x1e630000 0x18 -+ 0x30000000 0x02000000 >; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ compatible = "aspeed,smc"; -+ flash { -+ reg = < 0 >; -+ compatible = "jedec,spi-nor" ; -+ label = "pnor"; -+ /* spi-max-frequency = <>; */ -+ /* m25p,fast-read; */ -+ }; -+ }; -+ -+ }; -+ - }; - - &uart5 { --- -1.8.3.1 - diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend index 9c31713fe..3d0b856c4 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:" SRC_URI += "file://witherspoon.cfg" -SRC_URI += "file://0001-Add-flash-and-layout-to-Witherspoon-devtree.patch" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_4.7.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_4.7.bb deleted file mode 100644 index 04fe6726f..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_4.7.bb +++ /dev/null @@ -1,6 +0,0 @@ -KBRANCH ?= "dev-4.7" -LINUX_VERSION ?= "4.7" -SRCREV="b172f8b68d85450a12d4348ee4a006ef8844fe95" -KSRC = "git://github.com/shenki/linux;protocol=git;branch=${KBRANCH}" - -require common/recipes-kernel/linux/linux-obmc.inc |
