diff options
| author | Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> | 2017-04-06 11:32:12 +0530 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-04-07 16:38:10 -0700 |
| commit | 3fd18eead7b265bd0f72630473b08354c5a1a4e3 (patch) | |
| tree | 83de1d3bb6424213d62c5901287a66cc799b2077 /platform | |
| parent | e69e24e59771f23f991c05a3230ff73d868c1b27 (diff) | |
vf6xx: Avoid multiple symbol defined spurious compile time errors
When not using --allow-multiple-definition (-z muldefs)
in LD flags build fails with symbol multiply defined error.
Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/drivers/inc/ccm_vf6xx.h | 16 | ||||
| -rw-r--r-- | platform/drivers/src/ccm_vf6xx.c | 15 |
2 files changed, 17 insertions, 14 deletions
diff --git a/platform/drivers/inc/ccm_vf6xx.h b/platform/drivers/inc/ccm_vf6xx.h index 0443926..2a45a49 100644 --- a/platform/drivers/inc/ccm_vf6xx.h +++ b/platform/drivers/inc/ccm_vf6xx.h @@ -248,20 +248,8 @@ enum ccm_clock_gate { ccmCg191Reserved }; -uint32_t ccm_ccgr_offset[] = { - (uint32_t)(&CCM_CCGR0), - (uint32_t)(&CCM_CCGR1), - (uint32_t)(&CCM_CCGR2), - (uint32_t)(&CCM_CCGR3), - (uint32_t)(&CCM_CCGR4), - (uint32_t)(&CCM_CCGR5), - (uint32_t)(&CCM_CCGR6), - (uint32_t)(&CCM_CCGR7), - (uint32_t)(&CCM_CCGR8), - (uint32_t)(&CCM_CCGR9), - (uint32_t)(&CCM_CCGR10), - (uint32_t)(&CCM_CCGR11), -}; +extern const uint32_t ccm_ccgr_offset[]; + /*! * @brief CCM gate control value */ diff --git a/platform/drivers/src/ccm_vf6xx.c b/platform/drivers/src/ccm_vf6xx.c index b666443..3c57a77 100644 --- a/platform/drivers/src/ccm_vf6xx.c +++ b/platform/drivers/src/ccm_vf6xx.c @@ -31,6 +31,21 @@ #include <ccm_vf6xx.h> +const uint32_t ccm_ccgr_offset[] = { + (uint32_t)(&CCM_CCGR0), + (uint32_t)(&CCM_CCGR1), + (uint32_t)(&CCM_CCGR2), + (uint32_t)(&CCM_CCGR3), + (uint32_t)(&CCM_CCGR4), + (uint32_t)(&CCM_CCGR5), + (uint32_t)(&CCM_CCGR6), + (uint32_t)(&CCM_CCGR7), + (uint32_t)(&CCM_CCGR8), + (uint32_t)(&CCM_CCGR9), + (uint32_t)(&CCM_CCGR10), + (uint32_t)(&CCM_CCGR11), +}; + /* ARM Cortex-A5 clock, core clock */ uint32_t ccmCoreClk = 0; /* Platform bus clock and Cortex-M4 core clock */ |