diff options
author | Mahesh Radhakrishnan | 2019-10-08 11:30:18 -0500 |
---|---|---|
committer | Mahesh Radhakrishnan | 2019-10-08 11:30:18 -0500 |
commit | 989f802266d52f50a6db8f2be6967eacd9d2b409 (patch) | |
tree | 95112c5432ff005347a9e6127d936717f59753cd | |
parent | 914a5aab5080413fe848fa2903ace4d15e43699a (diff) | |
parent | dcec67e4130143e5070ce7fb0fcecabb991fa8a9 (diff) | |
download | pruss-lld-DEV.PRUSS_LLD.01.00.00.15B.tar.gz pruss-lld-DEV.PRUSS_LLD.01.00.00.15B.tar.xz pruss-lld-DEV.PRUSS_LLD.01.00.00.15B.zip |
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
-rw-r--r-- | example/apps/icssg_pwm/firmware/src/Makefile | 2 | ||||
-rw-r--r-- | example/apps/icssg_pwm/firmware/src/iepPwm.c | 4 | ||||
-rw-r--r-- | example/apps/icssg_pwm/firmware/src/iepPwm.h | 2 | ||||
-rw-r--r-- | example/apps/icssg_pwm/firmware/src/iepPwmHwRegs.h | 2 |
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 | |||
33 | 33 | ||
34 | LIBS= | 34 | LIBS= |
35 | 35 | ||
36 | PDK_INSTALL_DIR ?= $(PRSDK_INSTALL_DIR)/pdk_am65xx_1_0_5/packages | 36 | PDK_INSTALL_DIR ?= $(PRSDK_INSTALL_DIR)/pdk_am65xx_1_0_6/packages |
37 | 37 | ||
38 | INCLUDE=--include_path=$(PDK_INSTALL_DIR) | 38 | INCLUDE=--include_path=$(PDK_INSTALL_DIR) |
39 | STACK_SIZE=0x100 | 39 | 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( | |||
571 | pIcssgIepPwmCtrlObj->iepPwmGblEn[i] = FALSE; | 571 | pIcssgIepPwmCtrlObj->iepPwmGblEn[i] = FALSE; |
572 | } | 572 | } |
573 | 573 | ||
574 | pIcssgIepPwmCtrlObj->pIcssgCfgHwRegs = (CSL_icss_g_pr1_cfg_slvRegs *)CSL_ICSS_CFG_BASE; | 574 | pIcssgIepPwmCtrlObj->pIcssgCfgHwRegs = (CSL_IcssCfgRegs *)CSL_ICSS_CFG_BASE; |
575 | pIcssgIepPwmCtrlObj->pIepPwmCtrlFwRegs = (IepPwmCtrlFwRegs *)ICSSG_IEPPWM_PWM_CTRL_ADDR; | 575 | pIcssgIepPwmCtrlObj->pIepPwmCtrlFwRegs = (IepPwmCtrlFwRegs *)ICSSG_IEPPWM_PWM_CTRL_ADDR; |
576 | return IEP_STS_NERR; | 576 | return IEP_STS_NERR; |
577 | } | 577 | } |
@@ -582,7 +582,7 @@ Int32 resetIepPwmObj( | |||
582 | IepId iepId | 582 | IepId iepId |
583 | ) | 583 | ) |
584 | { | 584 | { |
585 | CSL_icss_g_pr1_cfg_slvRegs *pruIcssgCfg = (CSL_icss_g_pr1_cfg_slvRegs *)CSL_ICSS_CFG_BASE; | 585 | CSL_IcssCfgRegs *pruIcssgCfg = (CSL_IcssCfgRegs *)CSL_ICSS_CFG_BASE; |
586 | CSL_icss_g_pr1_iep1_slvRegs *pIepHwRegs; | 586 | CSL_icss_g_pr1_iep1_slvRegs *pIepHwRegs; |
587 | volatile uint32_t *pIepCmpSr; | 587 | volatile uint32_t *pIepCmpSr; |
588 | Uint8 pwmIdx; | 588 | 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 | |||
148 | typedef struct IcssgIepPwmCtrlObj_s | 148 | typedef struct IcssgIepPwmCtrlObj_s |
149 | { | 149 | { |
150 | Bool iepPwmGblEn[ICSSG_NUM_IEP]; /* IEP PWM global disable/enable flags */ | 150 | Bool iepPwmGblEn[ICSSG_NUM_IEP]; /* IEP PWM global disable/enable flags */ |
151 | CSL_icss_g_pr1_cfg_slvRegs *pIcssgCfgHwRegs; /* ICSSG CFG registers, init to CSL_ICSS_CFG_BASE */ | 151 | CSL_IcssCfgRegs *pIcssgCfgHwRegs; /* ICSSG CFG registers, init to CSL_ICSS_CFG_BASE */ |
152 | IepPwmCtrlFwRegs *pIepPwmCtrlFwRegs; /* IEP PWM FW control registers, init to &PWM_CTRL */ | 152 | IepPwmCtrlFwRegs *pIepPwmCtrlFwRegs; /* IEP PWM FW control registers, init to &PWM_CTRL */ |
153 | } IcssgIepPwmCtrlObj; | 153 | } IcssgIepPwmCtrlObj; |
154 | 154 | ||
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 @@ | |||
42 | #define ICSS_IEP1_CFG_BASE ( ICSS_IEP0_CFG_BASE + CSL_ICSS_IEP_CFG_SIZE ) | 42 | #define ICSS_IEP1_CFG_BASE ( ICSS_IEP0_CFG_BASE + CSL_ICSS_IEP_CFG_SIZE ) |
43 | 43 | ||
44 | /* PWM trip reset event mask */ | 44 | /* PWM trip reset event mask */ |
45 | #define PWM_TRIP_RESET_MASK ( CSL_ICSS_G_PR1_CFG_SLV_PWM0_PWM0_TRIP_RESET_MASK ) | 45 | #define PWM_TRIP_RESET_MASK ( CSL_ICSSCFG_PWM0_PWM0_TRIP_RESET_MASK ) |
46 | 46 | ||
47 | /* ICSSG_PWM0m_n, set m=0...4, pos/neg signal n=0...3 */ | 47 | /* ICSSG_PWM0m_n, set m=0...4, pos/neg signal n=0...3 */ |
48 | #define PWM_INIT_HIZ ( 0 ) | 48 | #define PWM_INIT_HIZ ( 0 ) |