From 8bf4e18d35040b08d0f1077e6f4b2deb9200bfd2 Mon Sep 17 00:00:00 2001
From: Johannes <nivus.entwicklung@gmail.com>
Date: Tue, 5 Mar 2019 06:35:04 -0600
Subject: [PATCH] configs/imxrt1050-evk/src:  Correct some naming errors
 introduced by review changes.

---
 configs/imxrt1050-evk/scripts/flash-ocram.ld        | 7 ++++---
 configs/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c | 4 ++--
 configs/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configs/imxrt1050-evk/scripts/flash-ocram.ld b/configs/imxrt1050-evk/scripts/flash-ocram.ld
index dbb7eb65a8..0d37117d02 100644
--- a/configs/imxrt1050-evk/scripts/flash-ocram.ld
+++ b/configs/imxrt1050-evk/scripts/flash-ocram.ld
@@ -45,9 +45,10 @@ 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)
+EXTERN(g_dcd_data)
 
 ENTRY(_stext)
 
diff --git a/configs/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c b/configs/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c
index b138ea86c7..4d7787c8ac 100644
--- a/configs/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c
+++ b/configs/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c
@@ -46,7 +46,7 @@
 
 #if defined (CONFIG_IMXRT1050_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               =
   {
@@ -84,7 +84,7 @@ const struct flexspi_nor_config_s flash_config =
 
 #elif defined (CONFIG_IMXRT1050_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 =
   {
diff --git a/configs/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c b/configs/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c
index 83a4ecbd36..51a68c2a18 100644
--- a/configs/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c
+++ b/configs/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c
@@ -41,7 +41,7 @@ __attribute__((section(".boot_hdr.dcd_data")))
 
 const uint8_t g_dcd_data[] =
 {
-  /* 0000 */ dcd_tag_header,
+  /* 0000 */ DCD_TAG_HEADER,
   0x04,
   0x30,
   0x41,