From 3b1445d49c316a73d53f5d9550a2a20d65282f76 Mon Sep 17 00:00:00 2001
From: guo <guozhanxin@rt-thread.com>
Date: Mon, 14 Mar 2022 22:54:12 +0800
Subject: [PATCH] [bsp][imxrt1060]fix gcc can't runing issue. (#5667)

---
 bsp/imxrt/imxrt1060-nxp-evk/board/board.c     |  3 +--
 .../board/linker_scripts/link.lds             | 26 +++++++++----------
 bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py       |  4 +--
 bsp/imxrt/libraries/drivers/SConscript        |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/board.c b/bsp/imxrt/imxrt1060-nxp-evk/board/board.c
index dcbc5b2679..59eb64e3e7 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/board.c
+++ b/bsp/imxrt/imxrt1060-nxp-evk/board/board.c
@@ -1008,7 +1008,6 @@ void BOARD_ReconfigFlexSpiRxBuffer(void)
     SCB_EnableICache();
 }
 
-
 /**
  * This function will initial rt1050 board.
  */
@@ -1021,7 +1020,7 @@ void rt_hw_board_init()
     *((volatile uint32_t *)0x41044100) = 5;
 
     BOARD_ConfigMPU();
-    BOARD_ReconfigFlexSpiRxBuffer();
+    // BOARD_ReconfigFlexSpiRxBuffer();
     BOARD_InitPins();
     BOARD_InitSemcPins();
     BOARD_BootClockRUN();
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds b/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds
index 641ae6931c..6d8b2f0450 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds
+++ b/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds
@@ -53,11 +53,11 @@ STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0400;
 /* Specify the memory areas */
 MEMORY
 {
-  m_boot_data           (RX)  : ORIGIN = 0x70000000, LENGTH = 0x00001000
-  m_image_vertor_table  (RX)  : ORIGIN = 0x70001000, LENGTH = 0x00001000
+  m_boot_data           (RX)  : ORIGIN = 0x60000000, LENGTH = 0x00001000
+  m_image_vertor_table  (RX)  : ORIGIN = 0x60001000, LENGTH = 0x00001000
 
-  m_interrupts          (RX)  : ORIGIN = 0x70002000, LENGTH = 0x00000400
-  m_text                (RX)  : ORIGIN = 0x70002400, LENGTH = 0x003FDC00
+  m_interrupts          (RX)  : ORIGIN = 0x60002000, LENGTH = 0x00000400
+  m_text                (RX)  : ORIGIN = 0x60002400, LENGTH = 0x003FDC00
 
   m_itcm                (RW)  : ORIGIN = 0x00000000, LENGTH = 0x00020000
   m_dtcm                (RW)  : ORIGIN = 0x20000000, LENGTH = 0x00020000
@@ -220,25 +220,25 @@ SECTIONS
     *(.data)                 /* .data sections */
     *(.data*)                /* .data* sections */
     KEEP(*(.jcr*))
+    *(NonCacheable.init)
+    *(NonCacheable)
     . = ALIGN(4);
     __data_end__ = .;        /* define a global symbol at data end */
-  } > m_dtcm
+  } > m_sdram
 
   __NDATA_ROM = __DATA_ROM + (__data_end__ - __data_start__);
   .ncache.init : AT(__NDATA_ROM)
   {
     __noncachedata_start__ = .;   /* create a global symbol at ncache data start */
-    *(NonCacheable.init)
     . = ALIGN(4);
     __noncachedata_init_end__ = .;   /* create a global symbol at initialized ncache data end */
-  } > m_nocache
+  } > m_ocram
   . = __noncachedata_init_end__;
   .ncache :
   {
-    *(NonCacheable)
     . = ALIGN(4);
     __noncachedata_end__ = .;     /* define a global symbol at ncache data end */
-  } > m_nocache
+  } > m_ocram
 
   __DATA_END = __NDATA_ROM + (__noncachedata_init_end__ - __noncachedata_start__);
   text_end = ORIGIN(m_text) + LENGTH(m_text);
@@ -258,7 +258,7 @@ SECTIONS
     . = ALIGN(4);
     __bss_end__ = .;
     __END_BSS = .;
-  } > m_dtcm
+  } > m_sdram
 
   .stack :
   {
@@ -267,15 +267,15 @@ SECTIONS
     . += STACK_SIZE;
     stack_end = .;
     __StackTop = .;
-  } > m_dtcm
+  } > m_sdram
   
   .RTT_HEAP :
   {
     heap_start = .;
     . = ALIGN(8);
-  } > m_dtcm
+  } > m_sdram
 
-  PROVIDE(heap_end = ORIGIN(m_dtcm) + LENGTH(m_dtcm));
+  PROVIDE(heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram));
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
 
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py
index 9689ac0bcb..8a6000ad09 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py
+++ b/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py
@@ -29,8 +29,8 @@ elif CROSS_TOOL == 'iar':
 if os.getenv('RTT_EXEC_PATH'):
     EXEC_PATH = os.getenv('RTT_EXEC_PATH')
 
-#BUILD = 'debug'
-BUILD = 'release'
+BUILD = 'debug'
+# BUILD = 'release'
 
 if PLATFORM == 'gcc':
     PREFIX = 'arm-none-eabi-'
diff --git a/bsp/imxrt/libraries/drivers/SConscript b/bsp/imxrt/libraries/drivers/SConscript
index e166989a24..e145c24b4d 100644
--- a/bsp/imxrt/libraries/drivers/SConscript
+++ b/bsp/imxrt/libraries/drivers/SConscript
@@ -70,7 +70,7 @@ if GetDepend('RT_USING_USB_HOST'):
 if GetDepend('BSP_USING_PULSE_ENCODER'):
     src += ['drv_pulse_encoder.c']
 
-path =  [cwd,cwd + '/config']
+path =  [cwd]
 
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
 
-- 
GitLab