summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-11-16 14:00:05 +1030
committerPatrick Williams <patrick@stwcx.xyz>2016-11-17 00:46:58 +0000
commit1d9800bc3d3d122d39e9a019f102852dc29dcf02 (patch)
tree33327c551911dc8d840a7b5a435d6dc433680ad6 /meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
parentb0960a5dba86a4c16dabf567556358910b5f4b4d (diff)
downloadtalos-openbmc-1d9800bc3d3d122d39e9a019f102852dc29dcf02.tar.gz
talos-openbmc-1d9800bc3d3d122d39e9a019f102852dc29dcf02.zip
Fix pflash PNOR access
pflash changes: Move to latest upstream release of skiboot which includes the mtd erase patch we were carrying. Adds a patch to fix parsing of the longer mtd labels we have since updating the device tree bindings. dev: size erasesize name mtd0: 00060000 00001000 "u-boot" mtd1: 00020000 00001000 "u-boot-env" mtd2: 00280000 00001000 "kernel" mtd3: 001c0000 00001000 "initramfs" mtd4: 01740000 00001000 "rofs" mtd5: 00400000 00001000 "rwfs" mtd6: 02000000 00001000 "1e620000.flash-controller:flash@1" mtd7: 08000000 00001000 "1e630000.flash-controller:pnor@0" Linux kernel changes: Three of the patches move the comaptible string for the bt interface to match what we have sent upstream. There is also a dts change to the mtd nodes that add back the 'pnor' label to the PNOR mtd device, as required by pflash. Cédric Le Goater (2): ipmi/bt-bmc: change compatible node to 'aspeed, ast2400-ibt-bmc' ARM: dts: aspeed: fix flash module device nodes Joel Stanley (2): ipmi/bt-bmc: Add comaptible node for ast2500 arm: dts: aspeed: Use upstream comaptible string Fixes openbmc/openbmc#785 Change-Id: If2c293b85075edcf3078ef599e7b61f3a6d77c66 Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc')
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
index fa30f091e..702d86512 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
@@ -3,14 +3,14 @@ LICENSE = "Apache-2.0"
SRC_URI += "git://github.com/open-power/skiboot.git;nobranch=1"
SRC_URI += "file://0001-external-Use-more-standard-PREFIX-vs-prefix.patch"
-SRC_URI += "file://0002-external-common-Teach-ARM-code-to-erase-mtd-chips.patch"
+SRC_URI += "file://0002-arch_flash_arm-Don-t-assume-mtd-partitions-are-short.patch"
FILESEXTRAPATHS_append := "${THISDIR}/skiboot:"
LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRCREV = "skiboot-5.4.0-rc3"
-PV = "5.4.0-rc3"
+SRCREV = "skiboot-5.4.0"
+PV = "5.4.0"
S = "${WORKDIR}/git"
OpenPOWER on IntegriCloud