From 9308c5b22b8ff80c7de04d26b019802a9eb494d4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 5 Mar 2019 06:42:54 -0600
Subject: [PATCH] configs/imxrt1060-evk:  Per coding standard, all global
 variables must begin with g_

---
 configs/imxrt1060-evk/scripts/flash-ocram.ld        | 6 +++---
 configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c  | 6 +++---
 configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h  | 4 ++--
 configs/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configs/imxrt1060-evk/scripts/flash-ocram.ld b/configs/imxrt1060-evk/scripts/flash-ocram.ld
index aa1382311f..f8224ef0a1 100644
--- a/configs/imxrt1060-evk/scripts/flash-ocram.ld
+++ b/configs/imxrt1060-evk/scripts/flash-ocram.ld
@@ -46,9 +46,9 @@ MEMORY
 
 OUTPUT_ARCH(arm)
 EXTERN(_vectors)
-EXTERN(flash_config)
-EXTERN(image_vector_table)
-EXTERN(boot_data)
+EXTERN(g_flash_config)
+EXTERN(g_image_vector_table)
+EXTERN(g_boot_data)
 
 ENTRY(_stext)
 
diff --git a/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c b/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c
index ba45058d5c..d070dd3d6d 100644
--- a/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c
+++ b/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c
@@ -44,20 +44,20 @@
  ****************************************************************************/
 
 __attribute__((section(".boot_hdr.ivt")))
-const struct ivt_s image_vector_table =
+const struct ivt_s g_image_vector_table =
 {
   IVT_HEADER,                         /* IVT Header */
   0x60002000,                         /* Image  Entry Function */
   IVT_RSVD,                           /* Reserved = 0 */
   (uint32_t)DCD_ADDRESS,              /* Address where DCD information 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 */
   IVT_RSVD                            /* Reserved = 0 */
 };
 
 __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_END - FLASH_BASE),           /* size */
diff --git a/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h b/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h
index 5be42408ae..54c598112c 100644
--- a/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h
+++ b/configs/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h
@@ -79,7 +79,7 @@
 #define SCLK 1
 
 #define DCD_ADDRESS                 0
-#define BOOT_DATA_ADDRESS           &boot_data
+#define BOOT_DATA_ADDRESS           &g_boot_data
 #define CSF_ADDRESS                 0
 #define PLUGIN_FLAG                 (uint32_t)0
 
@@ -144,6 +144,6 @@ struct boot_data_s
  * 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 */
diff --git a/configs/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c b/configs/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c
index 5ea868c72d..524b6d2f09 100644
--- a/configs/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c
+++ b/configs/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c
@@ -47,7 +47,7 @@
 
 #if defined (CONFIG_IMXRT1060_EVK_HYPER_FLASH)
 __attribute__((section(".boot_hdr.conf")))
-const struct flexspi_nor_config_s flash_config =
+const struct flexspi_nor_config_s g_flash_config =
 {
   .mem_config               =
   {
@@ -85,7 +85,7 @@ const struct flexspi_nor_config_s flash_config =
 
 #elif defined (CONFIG_IMXRT1060_EVK_QSPI_FLASH)
 __attribute__((section(".boot_hdr.conf")))
-const struct flexspi_nor_config_s flash_config =
+const struct flexspi_nor_config_s g_flash_config =
 {
   .mem_config =
   {