sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configs/imxrt1060-evk: Per coding standard, all global variables must begin with g_

Browse Source
This commit is contained in:
Gregory Nutt 2019-03-05 06:42:54 -06:00
parent 8bf4e18d35
commit 9308c5b22b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/imxrt1060-evk/scripts/flash-ocram.ld
View File

@ -46,9 +46,9 @@ MEMORY
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
EXTERN(_vectors) EXTERN(_vectors)
EXTERN(flash_config) EXTERN(g_flash_config)
EXTERN(image_vector_table) EXTERN(g_image_vector_table)
EXTERN(boot_data) EXTERN(g_boot_data)
ENTRY(_stext) ENTRY(_stext)

6
configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c
View File

@ -44,20 +44,20 @@
****************************************************************************/ ****************************************************************************/
__attribute__((section(".boot_hdr.ivt"))) __attribute__((section(".boot_hdr.ivt")))
const struct ivt_s image_vector_table = const struct ivt_s g_image_vector_table =
{ {
IVT_HEADER, /* IVT Header */ IVT_HEADER, /* IVT Header */
0x60002000, /* Image Entry Function */ 0x60002000, /* Image Entry Function */
IVT_RSVD, /* Reserved = 0 */ IVT_RSVD, /* Reserved = 0 */
(uint32_t)DCD_ADDRESS, /* Address where DCD information is stored */ (uint32_t)DCD_ADDRESS, /* Address where DCD information is stored */
(uint32_t)BOOT_DATA_ADDRESS, /* Address where BOOT Data Structure is stored */ (uint32_t)BOOT_DATA_ADDRESS, /* Address where BOOT Data Structure is stored */
(uint32_t)&image_vector_table, /* Pointer to IVT Self (absolute address */ (uint32_t)&g_image_vector_table, /* Pointer to IVT Self (absolute address */
(uint32_t)CSF_ADDRESS, /* Address where CSF file is stored */ (uint32_t)CSF_ADDRESS, /* Address where CSF file is stored */
IVT_RSVD /* Reserved = 0 */ IVT_RSVD /* Reserved = 0 */
}; };
__attribute__((section(".boot_hdr.boot_data"))) __attribute__((section(".boot_hdr.boot_data")))
const struct boot_data_s boot_data = const struct boot_data_s g_boot_data =
{ {
FLASH_BASE, /* boot start location */ FLASH_BASE, /* boot start location */
(FLASH_END - FLASH_BASE), /* size */ (FLASH_END - FLASH_BASE), /* size */

4
configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h
View File

@ -79,7 +79,7 @@
#define SCLK 1 #define SCLK 1
#define DCD_ADDRESS 0 #define DCD_ADDRESS 0
#define BOOT_DATA_ADDRESS &boot_data #define BOOT_DATA_ADDRESS &g_boot_data
#define CSF_ADDRESS 0 #define CSF_ADDRESS 0
#define PLUGIN_FLAG (uint32_t)0 #define PLUGIN_FLAG (uint32_t)0
@ -144,6 +144,6 @@ struct boot_data_s
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
extern const struct boot_data_s boot_data; extern const struct boot_data_s g_boot_data;
#endif /* __CONFIGS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ #endif /* __CONFIGS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */

4
configs/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c
View File

@ -47,7 +47,7 @@
#if defined (CONFIG_IMXRT1060_EVK_HYPER_FLASH) #if defined (CONFIG_IMXRT1060_EVK_HYPER_FLASH)
__attribute__((section(".boot_hdr.conf"))) __attribute__((section(".boot_hdr.conf")))
const struct flexspi_nor_config_s flash_config = const struct flexspi_nor_config_s g_flash_config =
{ {
.mem_config = .mem_config =
{ {
@ -85,7 +85,7 @@ const struct flexspi_nor_config_s flash_config =
#elif defined (CONFIG_IMXRT1060_EVK_QSPI_FLASH) #elif defined (CONFIG_IMXRT1060_EVK_QSPI_FLASH)
__attribute__((section(".boot_hdr.conf"))) __attribute__((section(".boot_hdr.conf")))
const struct flexspi_nor_config_s flash_config = const struct flexspi_nor_config_s g_flash_config =
{ {
.mem_config = .mem_config =
{ {