Merge pull request #987 from stewart-ibm/remove-master-next
CONTRIBUTING.md: Remove reference to master-next branch
diff --git a/openpower/configs/hostboot/romulus.config b/openpower/configs/hostboot/romulus.config
index 3a7ea98..3d8aaad 100755
--- a/openpower/configs/hostboot/romulus.config
+++ b/openpower/configs/hostboot/romulus.config
@@ -32,8 +32,8 @@
# Enable SBE updates
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
-unset SBE_UPDATE_SIMULTANEOUS
-set NO_SBE_UPDATES
+set SBE_UPDATE_SIMULTANEOUS
+unset NO_SBE_UPDATES
unset PCIE_HOTPLUG_CONTROLLER
diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 552a799..a6f9452 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -74,7 +74,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_ATA_OVER_ETH=m
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_NVME=m
CONFIG_EEPROM_AT24=y
@@ -148,14 +147,13 @@
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_MISC=y
# CONFIG_SERIO_SERPORT is not set
+# CONFIG_DEVMEM is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_IPMI_HANDLER=y
CONFIG_IPMI_DEVICE_INTERFACE=y
CONFIG_IPMI_POWERNV=y
CONFIG_HW_RANDOM=y
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=1024
CONFIG_TCG_TIS_I2C_NUVOTON=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
@@ -200,11 +198,7 @@
CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_CIFS=m
-# CONFIG_CIFS_DEBUG is not set
+# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ASCII=y
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index a7c72f5..c76588f 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -59,7 +59,7 @@
BR2_OCC_BIN_FILENAME="occ.bin"
BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c3e405b3b1e0c47efbbf31ce37ea02e9a1e005e3"
BR2_PACKAGE_LOADKEYS=y
BR2_ROMULUS_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml"
BR2_ROMULUS_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 74fcca3..031d527 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -57,7 +57,7 @@
BR2_OCC_BIN_FILENAME="occ.bin"
BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c3e405b3b1e0c47efbbf31ce37ea02e9a1e005e3"
BR2_PACKAGE_LOADKEYS=y
BR2_WITHERSPOON_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
BR2_WITHERSPOON_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index b1c2916..6333fff 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -56,7 +56,7 @@
BR2_OCC_BIN_FILENAME="occ.bin"
BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c3e405b3b1e0c47efbbf31ce37ea02e9a1e005e3"
BR2_PACKAGE_LOADKEYS=y
BR2_ZAIUS_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml"
BR2_ZAIUS_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index bcbe33a..3d4ca59 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -51,7 +51,7 @@
# BR2_PACKAGE_OCC is not set
# BR2_PACKAGE_CAPP_UCODE is not set
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="c3e405b3b1e0c47efbbf31ce37ea02e9a1e005e3"
BR2_PACKAGE_LOADKEYS=y
# BR2_PACKAGE_HOST_PPE42_BINUTILS is not set
# BR2_PACKAGE_HOST_PPE42_GCC is not set
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index f47247f..340ebe6 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,8 +4,9 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 82b82cd06369f42a68935043427fa2bb5628372e
+HOSTBOOT_BINARIES_VERSION ?= 5c78ef330dac3cefb44032ca14b53ed75856f3b6
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
+
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
HOSTBOOT_BINARIES_LICENSE_FILES = LICENSE
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index c9d9374..ce4e14e 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= a0157757a0e3c229e81f5b1dc779e3c911c70161
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 009456d1d6f548cf9596a223e935ff048d0cffad
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0010-Revert-Enablement-of-additional-eq_ana_bndy-rings-fo.patch b/openpower/package/hostboot/p9Patches/hostboot-0010-Revert-Enablement-of-additional-eq_ana_bndy-rings-fo.patch
deleted file mode 100644
index 114d484..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0010-Revert-Enablement-of-additional-eq_ana_bndy-rings-fo.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-From d03736195bb489ec8cee484d4c91b6e7348d4dc9 Mon Sep 17 00:00:00 2001
-From: Bill Hoffa <wghoffa@us.ibm.com>
-Date: Tue, 28 Mar 2017 08:17:31 -0500
-Subject: [PATCH] Revert "Enablement of additional eq_ana_bndy rings for Nimbus
- DD2"
-
-This reverts commit b4b696de54dedb5e835a0f8abca5731b1f1bdeea.
----
- .../p9/procedures/hwp/lib/p9_hcode_image_defines.H | 20 +------
- .../chips/p9/procedures/hwp/pm/p9_scan_ring_util.C | 40 ++-----------
- src/import/chips/p9/utils/imageProcs/p9_ringId.C | 30 +++-------
- src/import/chips/p9/utils/imageProcs/p9_ringId.H | 67 ++++------------------
- src/import/chips/p9/utils/imageProcs/p9_ring_id.h | 24 ++------
- 5 files changed, 32 insertions(+), 149 deletions(-)
-
-diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
-index f6b9eea..6df1dbf 100644
---- a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
-+++ b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
-@@ -488,24 +488,10 @@ typedef struct
- uint16_t eqAnaBndyRingBucket23;
- uint16_t eqAnaBndyRingBucket24;
- uint16_t eqAnaBndyRingBucket25;
-- uint16_t eqAnaBndyRingl3dccBucket;
-+ uint16_t eqAnaBndyRingl3dccBucket26;
- uint16_t eqAnaModeRing;
-- uint16_t eqAnaBndyRingBucket26;
-- uint16_t eqAnaBndyRingBucket27;
-- uint16_t eqAnaBndyRingBucket28;
-- uint16_t eqAnaBndyRingBucket29;
-- uint16_t eqAnaBndyRingBucket30;
-- uint16_t eqAnaBndyRingBucket31;
-- uint16_t eqAnaBndyRingBucket32;
-- uint16_t eqAnaBndyRingBucket33;
-- uint16_t eqAnaBndyRingBucket34;
-- uint16_t eqAnaBndyRingBucket35;
-- uint16_t eqAnaBndyRingBucket36;
-- uint16_t eqAnaBndyRingBucket37;
-- uint16_t eqAnaBndyRingBucket38;
-- uint16_t eqAnaBndyRingBucket39;
-- uint16_t eqAnaBndyRingBucket40;
-- uint16_t eqAnaBndyRingBucket41;
-+ uint16_t ex_l2_fure_1;
-+ uint16_t ex_l3_fure_1;
- } QuadCmnRingsList_t;
-
- typedef struct
-diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
-index 63e07e0..3df8232 100644
---- a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
-+++ b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
-@@ -182,24 +182,10 @@ RingBucket::RingBucket( PlatId i_plat, uint8_t* i_pRingStart, RingDebugMode_t i_
- { eq_ana_bndy_bucket_23, 0, 0 },
- { eq_ana_bndy_bucket_24, 0, 0 },
- { eq_ana_bndy_bucket_25, 0, 0 },
-- { eq_ana_bndy_bucket_l3dcc, 0, 0 },
-+ { eq_ana_bndy_l3dcc_bucket_26, 0, 0 },
- { eq_ana_mode, 0, 0 },
-- { eq_ana_bndy_bucket_26, 0, 0 },
-- { eq_ana_bndy_bucket_27, 0, 0 },
-- { eq_ana_bndy_bucket_28, 0, 0 },
-- { eq_ana_bndy_bucket_29, 0, 0 },
-- { eq_ana_bndy_bucket_30, 0, 0 },
-- { eq_ana_bndy_bucket_31, 0, 0 },
-- { eq_ana_bndy_bucket_32, 0, 0 },
-- { eq_ana_bndy_bucket_33, 0, 0 },
-- { eq_ana_bndy_bucket_34, 0, 0 },
-- { eq_ana_bndy_bucket_35, 0, 0 },
-- { eq_ana_bndy_bucket_36, 0, 0 },
-- { eq_ana_bndy_bucket_37, 0, 0 },
-- { eq_ana_bndy_bucket_38, 0, 0 },
-- { eq_ana_bndy_bucket_39, 0, 0 },
-- { eq_ana_bndy_bucket_40, 0, 0 },
-- { eq_ana_bndy_bucket_41, 0, 0 },
-+ { ex_l2_fure_1, 0, 0 },
-+ { ex_l3_fure_1, 0, 0 },
- };
-
- RingProfile l_quadSpecRings[TEMP_MAX_QUAD_SPEC_RINGS * MAX_QUADS_PER_CHIP] =
-@@ -321,24 +307,10 @@ RingBucket::RingBucket( PlatId i_plat, uint8_t* i_pRingStart, RingDebugMode_t i_
- iv_ringName[ eq_ana_bndy_bucket_23 ] = (char*)"eq_ana_bndy_bucket_23";
- iv_ringName[ eq_ana_bndy_bucket_24 ] = (char*)"eq_ana_bndy_bucket_24";
- iv_ringName[ eq_ana_bndy_bucket_25 ] = (char*)"eq_ana_bndy_bucket_25";
-- iv_ringName[ eq_ana_bndy_bucket_l3dcc ] = (char*)"eq_ana_bndy_bucket_l3dcc";
-+ iv_ringName[ eq_ana_bndy_l3dcc_bucket_26 ] = (char*)"eq_ana_bndy_l3dcc_bucket_26";
- iv_ringName[ eq_ana_mode ] = (char*)"eq_ana_mode ";
-- iv_ringName[ eq_ana_bndy_bucket_26 ] = (char*)"eq_ana_bndy_bucket_26";
-- iv_ringName[ eq_ana_bndy_bucket_27 ] = (char*)"eq_ana_bndy_bucket_27";
-- iv_ringName[ eq_ana_bndy_bucket_28 ] = (char*)"eq_ana_bndy_bucket_28";
-- iv_ringName[ eq_ana_bndy_bucket_29 ] = (char*)"eq_ana_bndy_bucket_29";
-- iv_ringName[ eq_ana_bndy_bucket_30 ] = (char*)"eq_ana_bndy_bucket_30";
-- iv_ringName[ eq_ana_bndy_bucket_31 ] = (char*)"eq_ana_bndy_bucket_31";
-- iv_ringName[ eq_ana_bndy_bucket_32 ] = (char*)"eq_ana_bndy_bucket_32";
-- iv_ringName[ eq_ana_bndy_bucket_33 ] = (char*)"eq_ana_bndy_bucket_33";
-- iv_ringName[ eq_ana_bndy_bucket_34 ] = (char*)"eq_ana_bndy_bucket_34";
-- iv_ringName[ eq_ana_bndy_bucket_35 ] = (char*)"eq_ana_bndy_bucket_35";
-- iv_ringName[ eq_ana_bndy_bucket_36 ] = (char*)"eq_ana_bndy_bucket_36";
-- iv_ringName[ eq_ana_bndy_bucket_37 ] = (char*)"eq_ana_bndy_bucket_37";
-- iv_ringName[ eq_ana_bndy_bucket_38 ] = (char*)"eq_ana_bndy_bucket_38";
-- iv_ringName[ eq_ana_bndy_bucket_39 ] = (char*)"eq_ana_bndy_bucket_39";
-- iv_ringName[ eq_ana_bndy_bucket_40 ] = (char*)"eq_ana_bndy_bucket_40";
-- iv_ringName[ eq_ana_bndy_bucket_41 ] = (char*)"eq_ana_bndy_bucket_41";
-+ iv_ringName[ ex_l2_fure_1 ] = (char*)"ex_l2_fure_1 ";
-+ iv_ringName[ ex_l3_fure_1 ] = (char*)"ex_l3_fure_1 ";
- iv_ringName[ eq_repr ] = (char*)"eq_repr ";
- iv_ringName[ ex_l3_repr ] = (char*)"ex_l3_repr ";
- iv_ringName[ ex_l2_repr ] = (char*)"ex_l2_repr ";
-diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
-index 1d21023..3bd7d2a 100644
---- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C
-+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
-@@ -395,32 +395,18 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
- {"eq_ana_bndy_bucket_23" , 0x29, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
- {"eq_ana_bndy_bucket_24" , 0x2a, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
- {"eq_ana_bndy_bucket_25" , 0x2b, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_l3dcc" , 0x2c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-+ {"eq_ana_bndy_l3dcc_bucket_26", 0x2c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
- {"eq_ana_mode" , 0x2d, 0x10, 0x10, EKB_RING , 0x10030101},
-- {"eq_ana_bndy_bucket_26" , 0x2e, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_27" , 0x2f, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_28" , 0x30, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_29" , 0x31, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_30" , 0x32, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_31" , 0x33, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_32" , 0x34, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_33" , 0x35, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_34" , 0x36, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_35" , 0x37, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_36" , 0x38, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_37" , 0x39, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_38" , 0x3a, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_39" , 0x3b, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_40" , 0x3c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-- {"eq_ana_bndy_bucket_41" , 0x3d, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
-+ {"ex_l2_fure_1" , 0x2e, 0x10, 0x10, EKB_RING , 0x1003040F},
-+ {"ex_l3_fure_1" , 0x2f, 0x10, 0x10, EKB_RING , 0x1003100F},
- };
- const GenRingIdList RING_ID_LIST_INSTANCE[] =
- {
-- {"eq_repr" , 0x3e, 0x10, 0x1b, VPD_RING , 0x10036086},
-- {"ex_l3_repr" , 0x3f, 0x10, 0x1b, VPD_RING , 0x10031006},
-- {"ex_l2_repr" , 0x40, 0x10, 0x1b, VPD_RING , 0x10030406},
-- {"ex_l3_refr_repr" , 0x41, 0x10, 0x1b, VPD_RING , 0x10030046},
-- {"ex_l3_refr_time" , 0x42, 0x10, 0x1b, VPD_RING , 0x10030047},
-+ {"eq_repr" , 0x30, 0x10, 0x1b, VPD_RING , 0x10036086},
-+ {"ex_l3_repr" , 0x31, 0x10, 0x1b, VPD_RING , 0x10031006},
-+ {"ex_l2_repr" , 0x32, 0x10, 0x1b, VPD_RING , 0x10030406},
-+ {"ex_l3_refr_repr" , 0x33, 0x10, 0x1b, VPD_RING , 0x10030046},
-+ {"ex_l3_refr_time" , 0x34, 0x10, 0x1b, VPD_RING , 0x10030047},
- };
- const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL };
- };
-diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.H b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
-index a0e8261..b49ad89 100644
---- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H
-+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
-@@ -778,24 +778,10 @@ enum RingOffset
- eq_ana_bndy_bucket_23 = 41,
- eq_ana_bndy_bucket_24 = 42,
- eq_ana_bndy_bucket_25 = 43,
-- eq_ana_bndy_bucket_l3dcc = 44,
-+ eq_ana_bndy_l3dcc_bucket_26 = 44,
- eq_ana_mode = 45,
-- eq_ana_bndy_bucket_26 = 46,
-- eq_ana_bndy_bucket_27 = 47,
-- eq_ana_bndy_bucket_28 = 48,
-- eq_ana_bndy_bucket_29 = 49,
-- eq_ana_bndy_bucket_30 = 50,
-- eq_ana_bndy_bucket_31 = 51,
-- eq_ana_bndy_bucket_32 = 52,
-- eq_ana_bndy_bucket_33 = 53,
-- eq_ana_bndy_bucket_34 = 54,
-- eq_ana_bndy_bucket_35 = 55,
-- eq_ana_bndy_bucket_36 = 56,
-- eq_ana_bndy_bucket_37 = 57,
-- eq_ana_bndy_bucket_38 = 58,
-- eq_ana_bndy_bucket_39 = 59,
-- eq_ana_bndy_bucket_40 = 60,
-- eq_ana_bndy_bucket_41 = 61,
-+ ex_l2_fure_1 = 46,
-+ ex_l3_fure_1 = 47,
-
- // Instance Rings
- eq_repr = (0 | INSTANCE_RING_MARK),
-@@ -808,7 +794,7 @@ enum RingOffset
- static const CHIPLET_DATA g_eqData =
- {
- 16, // Quad Chiplet ID range is 16 - 21. The base ID is 16.
-- 62, // 62 common rings for Quad chiplet.
-+ 48, // 48 common rings for Quad chiplet.
- 5, // 5 instance specific rings for each EQ chiplet
- 9 // 9 different rings since 2 per EX ring and 1 per EQ
- };
-@@ -1085,7 +1071,7 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
- { EQ::eq_ana_bndy_bucket_23 , "eq_ana_bndy_bucket_23" , EQ_TYPE }, // 215
- { EQ::eq_ana_bndy_bucket_24 , "eq_ana_bndy_bucket_24" , EQ_TYPE }, // 216
- { EQ::eq_ana_bndy_bucket_25 , "eq_ana_bndy_bucket_25" , EQ_TYPE }, // 217
-- { EQ::eq_ana_bndy_bucket_l3dcc , "eq_ana_bndy_bucket_l3dcc" , EQ_TYPE }, // 218
-+ { EQ::eq_ana_bndy_l3dcc_bucket_26 , "eq_ana_bndy_l3dcc_bucket_26" , EQ_TYPE }, // 218
- { EQ::eq_ana_mode , "eq_ana_mode" , EQ_TYPE }, // 219
- { EQ::eq_repr , "eq_repr" , EQ_TYPE }, // 220
- { EQ::ex_l3_repr , "ex_l3_repr" , EQ_TYPE }, // 221
-@@ -1096,25 +1082,10 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
- { EC::ec_time , "ec_time" , EC_TYPE }, // 226
- { EC::ec_mode , "ec_mode" , EC_TYPE }, // 227
- { EC::ec_repr , "ec_repr" , EC_TYPE }, // 228
-- { INVALID_RING , "invalid" , EQ_TYPE }, // 229
-- { INVALID_RING , "invalid" , EQ_TYPE }, // 230
-+ { EQ::ex_l2_fure_1 , "ex_l2_fure_1" , EQ_TYPE }, // 229
-+ { EQ::ex_l3_fure_1 , "ex_l3_fure_1" , EQ_TYPE }, // 230
- { EC::ec_abst , "ec_abst" , EC_TYPE }, // 231
-- { EQ::eq_ana_bndy_bucket_26 , "eq_ana_bndy_bucket_26" , EQ_TYPE }, // 232
-- { EQ::eq_ana_bndy_bucket_27 , "eq_ana_bndy_bucket_27" , EQ_TYPE }, // 233
-- { EQ::eq_ana_bndy_bucket_28 , "eq_ana_bndy_bucket_28" , EQ_TYPE }, // 234
-- { EQ::eq_ana_bndy_bucket_29 , "eq_ana_bndy_bucket_29" , EQ_TYPE }, // 235
-- { EQ::eq_ana_bndy_bucket_30 , "eq_ana_bndy_bucket_30" , EQ_TYPE }, // 236
-- { EQ::eq_ana_bndy_bucket_31 , "eq_ana_bndy_bucket_31" , EQ_TYPE }, // 237
-- { EQ::eq_ana_bndy_bucket_32 , "eq_ana_bndy_bucket_32" , EQ_TYPE }, // 238
-- { EQ::eq_ana_bndy_bucket_33 , "eq_ana_bndy_bucket_33" , EQ_TYPE }, // 239
-- { EQ::eq_ana_bndy_bucket_34 , "eq_ana_bndy_bucket_34" , EQ_TYPE }, // 240
-- { EQ::eq_ana_bndy_bucket_35 , "eq_ana_bndy_bucket_35" , EQ_TYPE }, // 241
-- { EQ::eq_ana_bndy_bucket_36 , "eq_ana_bndy_bucket_36" , EQ_TYPE }, // 242
-- { EQ::eq_ana_bndy_bucket_37 , "eq_ana_bndy_bucket_37" , EQ_TYPE }, // 243
-- { EQ::eq_ana_bndy_bucket_38 , "eq_ana_bndy_bucket_38" , EQ_TYPE }, // 244
-- { EQ::eq_ana_bndy_bucket_39 , "eq_ana_bndy_bucket_39" , EQ_TYPE }, // 245
-- { EQ::eq_ana_bndy_bucket_40 , "eq_ana_bndy_bucket_40" , EQ_TYPE }, // 246
-- { EQ::eq_ana_bndy_bucket_41 , "eq_ana_bndy_bucket_41" , EQ_TYPE }, // 247
-+
- };
- #endif
- #ifdef __PPE__
-@@ -1338,7 +1309,7 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
- { EQ::eq_ana_bndy_bucket_23 , EQ_TYPE }, // 215
- { EQ::eq_ana_bndy_bucket_24 , EQ_TYPE }, // 216
- { EQ::eq_ana_bndy_bucket_25 , EQ_TYPE }, // 217
-- { EQ::eq_ana_bndy_bucket_l3dcc , EQ_TYPE }, // 218
-+ { EQ::eq_ana_bndy_l3dcc_bucket_26 , EQ_TYPE }, // 218
- { EQ::eq_ana_mode , EQ_TYPE }, // 219
- { EQ::eq_repr , EQ_TYPE }, // 220
- { EQ::ex_l3_repr , EQ_TYPE }, // 221
-@@ -1349,25 +1320,9 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
- { EC::ec_time , EC_TYPE }, // 226
- { EC::ec_mode , EC_TYPE }, // 227
- { EC::ec_repr , EC_TYPE }, // 228
-- { INVALID_RING , EQ_TYPE }, // 229
-- { INVALID_RING , EQ_TYPE }, // 230
-+ { EQ::ex_l2_fure_1 , EQ_TYPE }, // 229
-+ { EQ::ex_l3_fure_1 , EQ_TYPE }, // 230
- { EC::ec_abst , EC_TYPE }, // 231
-- { EQ::eq_ana_bndy_bucket_26 , EQ_TYPE }, // 232
-- { EQ::eq_ana_bndy_bucket_27 , EQ_TYPE }, // 233
-- { EQ::eq_ana_bndy_bucket_28 , EQ_TYPE }, // 234
-- { EQ::eq_ana_bndy_bucket_29 , EQ_TYPE }, // 235
-- { EQ::eq_ana_bndy_bucket_30 , EQ_TYPE }, // 236
-- { EQ::eq_ana_bndy_bucket_31 , EQ_TYPE }, // 237
-- { EQ::eq_ana_bndy_bucket_32 , EQ_TYPE }, // 238
-- { EQ::eq_ana_bndy_bucket_33 , EQ_TYPE }, // 239
-- { EQ::eq_ana_bndy_bucket_34 , EQ_TYPE }, // 240
-- { EQ::eq_ana_bndy_bucket_35 , EQ_TYPE }, // 241
-- { EQ::eq_ana_bndy_bucket_36 , EQ_TYPE }, // 242
-- { EQ::eq_ana_bndy_bucket_37 , EQ_TYPE }, // 243
-- { EQ::eq_ana_bndy_bucket_38 , EQ_TYPE }, // 244
-- { EQ::eq_ana_bndy_bucket_39 , EQ_TYPE }, // 245
-- { EQ::eq_ana_bndy_bucket_40 , EQ_TYPE }, // 246
-- { EQ::eq_ana_bndy_bucket_41 , EQ_TYPE }, // 247
- };
- #endif
-
-diff --git a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
-index 1b4860d..71634a8 100644
---- a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
-+++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
-@@ -299,7 +299,7 @@ enum RingID
- eq_ana_bndy_bucket_23 = 215,
- eq_ana_bndy_bucket_24 = 216,
- eq_ana_bndy_bucket_25 = 217,
-- eq_ana_bndy_bucket_l3dcc = 218,
-+ eq_ana_bndy_l3dcc_bucket_26 = 218,
- eq_ana_mode = 219,
-
- // Quad Chiplet Rings
-@@ -320,30 +320,14 @@ enum RingID
- // EC0 - EC23 instance specific Ring
- ec_repr = 228,
-
-- // Values 229-230 unused
-+ // Additional rings
-+ ex_l2_fure_1 = 229,
-+ ex_l3_fure_1 = 230,
-
- // Core Chiplet Rings
- // ABIST engine mode
- ec_abst = 231,
-
-- // Additional rings for Nimbus DD2
-- eq_ana_bndy_bucket_26 = 232,
-- eq_ana_bndy_bucket_27 = 233,
-- eq_ana_bndy_bucket_28 = 234,
-- eq_ana_bndy_bucket_29 = 235,
-- eq_ana_bndy_bucket_30 = 236,
-- eq_ana_bndy_bucket_31 = 237,
-- eq_ana_bndy_bucket_32 = 238,
-- eq_ana_bndy_bucket_33 = 239,
-- eq_ana_bndy_bucket_34 = 240,
-- eq_ana_bndy_bucket_35 = 241,
-- eq_ana_bndy_bucket_36 = 242,
-- eq_ana_bndy_bucket_37 = 243,
-- eq_ana_bndy_bucket_38 = 244,
-- eq_ana_bndy_bucket_39 = 245,
-- eq_ana_bndy_bucket_40 = 246,
-- eq_ana_bndy_bucket_41 = 247,
--
- //***************************
- // Rings needed for SBE - End
- //***************************
---
-1.8.2.2
-
diff --git a/openpower/package/ppe42-binutils/ppe42-binutils.mk b/openpower/package/ppe42-binutils/ppe42-binutils.mk
index 68579d8..b63e2a1 100644
--- a/openpower/package/ppe42-binutils/ppe42-binutils.mk
+++ b/openpower/package/ppe42-binutils/ppe42-binutils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PPE42_BINUTILS_VERSION ?= 5b161fc30519a965f16e7e73c3410a388140cba1
+PPE42_BINUTILS_VERSION ?= ded0eff199fa1d9bd8be5a78935e8f023a2c5fad
PPE42_BINUTILS_SITE ?= $(call github,open-power,ppe42-binutils,$(PPE42_BINUTILS_VERSION))
PPE42_BINUTILS_LICENSE = GPLv3+
diff --git a/openpower/package/witherspoon-xml/witherspoon.mk b/openpower/package/witherspoon-xml/witherspoon.mk
index 67a3a08..feb5b66 100644
--- a/openpower/package/witherspoon-xml/witherspoon.mk
+++ b/openpower/package/witherspoon-xml/witherspoon.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WITHERSPOON_XML_VERSION ?= b208e4f2c91a653e20cc2ed79b02140bcbaf039e
+WITHERSPOON_XML_VERSION ?= ca46aa87075f406deda3c50482c32d42eac215c8
WITHERSPOON_XML_SITE ?= $(call github,open-power,witherspoon-xml,$(WITHERSPOON_XML_VERSION))
WITHERSPOON_XML_LICENSE = Apache-2.0