diff options
| author | Joel Stanley <joel@jms.id.au> | 2017-07-20 14:29:07 +0930 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-07-21 13:29:21 +0000 |
| commit | 66287189fc93c2ced402802be31cbf63404857ba (patch) | |
| tree | bd4dcc5521793c5f9631fc847519566847faed85 /meta-openbmc-machines/meta-openpower | |
| parent | 79036e5ce6c0130f86de9092c948bc339de3cda7 (diff) | |
| download | talos-openbmc-66287189fc93c2ced402802be31cbf63404857ba.tar.gz talos-openbmc-66287189fc93c2ced402802be31cbf63404857ba.zip | |
pflash: bump to v5.7-rc2
Benjamin Herrenschmidt (1):
libffs: Fix ffs_lookup_part() return value
Cyril Bur (4):
libflash/mbox-flash: Minor fixups before V2
libflash/mbox-flash: Update to V2 of the protocol
libflash/libffs: Correctly update the actual size of the partition
libflash/libffs: Zero checksum words
Oliver O'Halloran (1):
libflash: Initialise entries list earlier
Suraj Jitindar Singh (1):
libflash/mbox-flash: Implement MARK_WRITE_ERASED mbox call
Change-Id: If49644ef2680aeed901002b201391ae7abbbe651
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
2 files changed, 2 insertions, 36 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 5e943c170..60fc4a1dd 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,13 @@ 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-libflash-libffs-Correctly-update-the-actual-size-of-.patch" FILESEXTRAPATHS_append := "${THISDIR}/skiboot:" LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "skiboot-5.6.0" -PV = "5.6.0" +SRCREV = "v5.7-rc2" +PV = "v5.7-rc2" S = "${WORKDIR}/git" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0002-libflash-libffs-Correctly-update-the-actual-size-of-.patch b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0002-libflash-libffs-Correctly-update-the-actual-size-of-.patch deleted file mode 100644 index b63430c63..000000000 --- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0002-libflash-libffs-Correctly-update-the-actual-size-of-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 73e1e8a727a9e7179719eb7844bd4248d9890114 Mon Sep 17 00:00:00 2001 -From: Cyril Bur <cyril.bur@au1.ibm.com> -Date: Wed, 21 Jun 2017 16:34:36 +1000 -Subject: [PATCH] libflash/libffs: Correctly update the actual size of the - partition - -libffs has been updating FFS partition information in the wrong place -which leads to incomplete erases and corruption. - -Fixes: 602dee45 libflash/libffs: Rework libffs -Signed-off-by: Cyril Bur <cyril.bur@au1.ibm.com> -Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com> -Signed-off-by: Joel Stanley <joel@jms.id.au> ---- - libflash/libffs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libflash/libffs.c b/libflash/libffs.c -index 763e061c7a19..7ae9050e77f2 100644 ---- a/libflash/libffs.c -+++ b/libflash/libffs.c -@@ -781,7 +781,7 @@ int ffs_update_act_size(struct ffs_handle *ffs, uint32_t part_idx, - FL_DBG("FFS: Entry not found\n"); - return FFS_ERR_PART_NOT_FOUND; - } -- offset = ent->base; -+ offset = ffs->toc_offset + ffs_hdr_raw_size(part_idx); - FL_DBG("FFS: part index %d at offset 0x%08x\n", - part_idx, offset); - --- -2.11.0 - |
