From e6089585af669d5271d99d5affdc27295ae3c46a Mon Sep 17 00:00:00 2001 From: Davorin Mista Date: Sun, 31 May 2015 21:13:56 -0700 Subject: [PATCH] PMUFW: PM: Remove workaround for older PMU-ROM version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit XpbrPwrUpFpdHandler used to not always return XST_SUCCESS, this problem no longer exists hence the workaround can be dropped. Signed-off-by: Davorin Mista Acked-by: Sören Brinkmann Acked-by: Jyotheeswar Reddy Mutthareddyvari --- lib/sw_apps/zynqmp_pmufw/src/pm_power.c | 8 -------- lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_power.c b/lib/sw_apps/zynqmp_pmufw/src/pm_power.c index 73dd7420..b921417b 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_power.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_power.c @@ -180,14 +180,6 @@ static int PmPwrUpHandler(PmNode* const nodePtr) switch (nodePtr->nodeId) { case NODE_FPD: status = XpbrPwrUpFpdHandler(); -#ifdef DEBUG_PM - /* FIXME workaround for old version of pmu-rom */ - if (XST_SUCCESS != status) { - PmDbg("XpbrPwrUpFpdHandler returned #%d." - "Ignoring error\n", status); - status = XST_SUCCESS; - } -#endif if (XST_SUCCESS == status) { PmCrfRestoreContext(); } diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h index 3699af78..7fcf658e 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h +++ b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h @@ -1,4 +1,4 @@ #ifndef ZYNQMP_XPFW_VERSION__H_ #define ZYNQMP_XPFW_VERSION__H_ - #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-41-g884008482155" + #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-42-gfc7dbb7b2e11" #endif