From 1f36fb57361cceb7de3e7dc80be10fc08c94c407 Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Mon, 29 Jun 2015 10:05:14 -0700 Subject: [PATCH] PMUFW: ROM interface: Fix hook table type The ROM handlers and hooks have a different signature. Fixes: aea3444396c3 'ROM interface: Add ROM hook table' Cc: Kristopher Bechamp Signed-off-by: Soren Brinkmann Acked-by: Jyotheeswar Reddy Mutthareddyvari --- lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.c | 2 +- lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.h | 3 ++- lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.c b/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.c index d3b20589..9092bc29 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.c +++ b/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.c @@ -31,4 +31,4 @@ #include "xpfw_rom_interface.h" __attribute__((used, section(".xpbr_serv_ext_tbl"))) - XpbrServHndlr_t XpbrServExtTbl[XPBR_SERV_EXT_TBL_MAX]; + XpbrServExtHndlr_t XpbrServExtTbl[XPBR_SERV_EXT_TBL_MAX]; diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.h b/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.h index ee626928..9354bb60 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.h +++ b/lib/sw_apps/zynqmp_pmufw/src/xpfw_rom_interface.h @@ -313,9 +313,10 @@ enum xpbr_serv_ext_id { }; typedef u32 (*XpbrServHndlr_t) (void); +typedef u32 (*XpbrServExtHndlr_t) (XpbrServHndlr_t RomHandler); extern const XpbrServHndlr_t XpbrServHndlrTbl[XPBR_SERV_EXT_TBL_MAX]; -extern XpbrServHndlr_t XpbrServExtTbl[XPBR_SERV_EXT_TBL_MAX]; +extern XpbrServExtHndlr_t XpbrServExtTbl[XPBR_SERV_EXT_TBL_MAX]; static inline u32 XpbrACPU0SleepHandler(void) { diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h index 10be77ee..89e88559 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-44-gae07580d347d" + #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-47-g664cb2bea224" #endif