Merge pull request #3660 from tyustli/imxrt

BernardXiong · web-flow · commit 64ac4928f4a4 · 2020-06-06T09:45:18.000+08:00
[bsp][imxrt] fix docs and templates err
diff --git a/bsp/imxrt/docs/figures/link-lds.png b/bsp/imxrt/docs/figures/link-lds.png
diff --git a/bsp/imxrt/docs/figures/link-scf.png b/bsp/imxrt/docs/figures/link-scf.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.lds b/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.lds
@@ -65,7 +65,7 @@ MEMORY
   m_flash_config        (RX)  : ORIGIN = 0x60000000, LENGTH = 0x00001000
   m_ivt                 (RX)  : ORIGIN = 0x60001000, LENGTH = 0x00001000
   m_interrupts          (RX)  : ORIGIN = 0x60002000, LENGTH = 0x00000400
-  m_text                (RX)  : ORIGIN = 0x60002400, LENGTH = 0x1fffdbff
+  m_text                (RX)  : ORIGIN = 0x60002400, LENGTH = 0x01FFDC00
   m_data                (RW)  : ORIGIN = 0x20000000, LENGTH = 0x00020000
   m_data2               (RW)  : ORIGIN = 0x20200000, LENGTH = 0x00040000
 }
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.sct b/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.sct
@@ -36,7 +36,7 @@
 #define m_interrupts_size              0x00000400
 
 #define m_text_start                   0x60002400
-#define m_text_size                    0x1fffdbff
+#define m_text_size                    0x01FFDC00
 
 #define m_data_start                   0x20000000
 #define m_data_size                    0x00020000
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/Kconfig b/bsp/imxrt/libraries/templates/imxrt1050xxx/board/Kconfig
@@ -3,6 +3,8 @@ menu "Hardware Drivers Config"
 config SOC_IMXRT1052CVL5B
     bool 
     select SOC_MIMXRT1050_SERIES
+    select RT_USING_COMPONENTS_INIT
+    select RT_USING_USER_MAIN
     default y
 
 menu "On-chip Peripheral Drivers"
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/Kconfig b/bsp/imxrt/libraries/templates/imxrt1064xxx/board/Kconfig
@@ -13,6 +13,8 @@ config SOC_MIMXRT1064DVL6A
     bool
     select SOC_MIMXRT1064_SERIES
     select BSP_USING_4MFLASH
+    select RT_USING_COMPONENTS_INIT
+    select RT_USING_USER_MAIN
     default y
 
 menu "On-chip Peripheral Drivers"

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ MEMORY`
`65`	`65`	`m_flash_config (RX) : ORIGIN = 0x60000000, LENGTH = 0x00001000`
`66`	`66`	`m_ivt (RX) : ORIGIN = 0x60001000, LENGTH = 0x00001000`
`67`	`67`	`m_interrupts (RX) : ORIGIN = 0x60002000, LENGTH = 0x00000400`
`68`		`- m_text (RX) : ORIGIN = 0x60002400, LENGTH = 0x1fffdbff`
	`68`	`+ m_text (RX) : ORIGIN = 0x60002400, LENGTH = 0x01FFDC00`
`69`	`69`	`m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00020000`
`70`	`70`	`m_data2 (RW) : ORIGIN = 0x20200000, LENGTH = 0x00040000`
`71`	`71`	`}`