Merge pull request #68 in PROCESSOR-SDK/pruss-lld from ~A0271908/pruss-lld:master to masterDEV.PRUSS_LLD.01.00.00.15B

* commit 'dcec67e4130143e5070ce7fb0fcecabb991fa8a9':
  pru-pwm-firmware: update symbol names changed in pdk 1.0.6
  pru-pwm-firmware: update the pdk version in Makefile

4 files changed, 5 insertions, 5 deletions

diff --git a/example/apps/icssg_pwm/firmware/src/Makefile b/example/apps/icssg_pwm/firmware/src/Makefile
index d2d41b6..4a7eb88 100644
--- a/example/apps/icssg_pwm/firmware/src/Makefile
+++ b/example/apps/icssg_pwm/firmware/src/Makefile
@@ -33,7 +33,7 @@ LINKER_COMMAND_FILE=./AM654x_PRU.cmd
 
 LIBS=
 
-PDK_INSTALL_DIR ?= $(PRSDK_INSTALL_DIR)/pdk_am65xx_1_0_5/packages
+PDK_INSTALL_DIR ?= $(PRSDK_INSTALL_DIR)/pdk_am65xx_1_0_6/packages
 
 INCLUDE=--include_path=$(PDK_INSTALL_DIR)
 STACK_SIZE=0x100
diff --git a/example/apps/icssg_pwm/firmware/src/iepPwm.c b/example/apps/icssg_pwm/firmware/src/iepPwm.c
index a1a999a..bf92b19 100644
--- a/example/apps/icssg_pwm/firmware/src/iepPwm.c
+++ b/example/apps/icssg_pwm/firmware/src/iepPwm.c
@@ -571,7 +571,7 @@ Int32 resetPwmCtrlObj(
         pIcssgIepPwmCtrlObj->iepPwmGblEn[i] = FALSE;
     }
     
-    pIcssgIepPwmCtrlObj->pIcssgCfgHwRegs = (CSL_icss_g_pr1_cfg_slvRegs *)CSL_ICSS_CFG_BASE;
+    pIcssgIepPwmCtrlObj->pIcssgCfgHwRegs = (CSL_IcssCfgRegs *)CSL_ICSS_CFG_BASE;
     pIcssgIepPwmCtrlObj->pIepPwmCtrlFwRegs = (IepPwmCtrlFwRegs *)ICSSG_IEPPWM_PWM_CTRL_ADDR;
     return IEP_STS_NERR;
 }
@@ -582,7 +582,7 @@ Int32 resetIepPwmObj(
     IepId iepId
 )
 {
-    CSL_icss_g_pr1_cfg_slvRegs *pruIcssgCfg = (CSL_icss_g_pr1_cfg_slvRegs *)CSL_ICSS_CFG_BASE;
+    CSL_IcssCfgRegs *pruIcssgCfg = (CSL_IcssCfgRegs *)CSL_ICSS_CFG_BASE;
     CSL_icss_g_pr1_iep1_slvRegs *pIepHwRegs;
     volatile uint32_t *pIepCmpSr;
     Uint8 pwmIdx;
diff --git a/example/apps/icssg_pwm/firmware/src/iepPwm.h b/example/apps/icssg_pwm/firmware/src/iepPwm.h
index 61673a8..f2fe830 100644
--- a/example/apps/icssg_pwm/firmware/src/iepPwm.h
+++ b/example/apps/icssg_pwm/firmware/src/iepPwm.h
@@ -148,7 +148,7 @@ typedef enum IepSm_States_e
 typedef struct IcssgIepPwmCtrlObj_s
 {
     Bool                        iepPwmGblEn[ICSSG_NUM_IEP];             /* IEP PWM global disable/enable flags */
-    CSL_icss_g_pr1_cfg_slvRegs  *pIcssgCfgHwRegs;                       /* ICSSG CFG registers, init to CSL_ICSS_CFG_BASE */
+    CSL_IcssCfgRegs             *pIcssgCfgHwRegs;                       /* ICSSG CFG registers, init to CSL_ICSS_CFG_BASE */
     IepPwmCtrlFwRegs            *pIepPwmCtrlFwRegs;                     /* IEP PWM FW control registers, init to &PWM_CTRL */
 } IcssgIepPwmCtrlObj;
 
diff --git a/example/apps/icssg_pwm/firmware/src/iepPwmHwRegs.h b/example/apps/icssg_pwm/firmware/src/iepPwmHwRegs.h
index 88529bd..61ed1f7 100644
--- a/example/apps/icssg_pwm/firmware/src/iepPwmHwRegs.h
+++ b/example/apps/icssg_pwm/firmware/src/iepPwmHwRegs.h
@@ -42,7 +42,7 @@
 #define ICSS_IEP1_CFG_BASE  ( ICSS_IEP0_CFG_BASE + CSL_ICSS_IEP_CFG_SIZE )
 
 /* PWM trip reset event mask */
-#define PWM_TRIP_RESET_MASK ( CSL_ICSS_G_PR1_CFG_SLV_PWM0_PWM0_TRIP_RESET_MASK )
+#define PWM_TRIP_RESET_MASK ( CSL_ICSSCFG_PWM0_PWM0_TRIP_RESET_MASK )
 
 /* ICSSG_PWM0m_n, set m=0...4, pos/neg signal n=0...3 */
 #define PWM_INIT_HIZ            ( 0 )