Fix the build failed issue of MPS2 targets with ARMC6.

ChangwuShan · ChangwuShan · commit 3d9b7df8e0e4 · 2019-04-15T16:56:44.000+08:00
Change-Id: I0205d381de331a827435d667c16297aaf5bb609e
Signed-off-by: Shawn Shan &lt;shawn.shan@arm.com&gt;
diff --git a/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M0/device/TOOLCHAIN_ARM_STD/MPS2.sct b/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M0/device/TOOLCHAIN_ARM_STD/MPS2.sct
@@ -44,11 +44,11 @@ LR_IROM1 0x00000000 0x00400000  {    ; load region size_region
   ER_IROM1 0x00000000 0x00400000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
-   .ANY (+RO)
+   *(+RO)
   }
   ; Total: 64 vectors = 256 bytes (0x100) to be reserved in RAM
   RW_IRAM1 (0x20000000+0x100) (0x400000-0x100-Stack_Size)  {  ; RW data
-   .ANY (+RW +ZI)
+   *(+RW +ZI)
   }
   ARM_LIB_STACK 0x20000000+0x400000 EMPTY -Stack_Size { ; Stack region growing down
   }
diff --git a/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M0P/device/TOOLCHAIN_ARM_STD/MPS2.sct b/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M0P/device/TOOLCHAIN_ARM_STD/MPS2.sct
@@ -44,11 +44,11 @@ LR_IROM1 0x00000000 0x00400000  {    ; load region size_region
   ER_IROM1 0x00000000 0x00400000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
-   .ANY (+RO)
+   *(+RO)
   }
   ; Total: 64 vectors = 256 bytes (0x100) to be reserved in RAM
   RW_IRAM1 (0x20000000+0x100) (0x400000-0x100-Stack_Size)  {  ; RW data
-   .ANY (+RW +ZI)
+   *(+RW +ZI)
   }
   ARM_LIB_STACK 0x20000000+0x400000 EMPTY -Stack_Size { ; Stack region growing down
   }
diff --git a/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M3/device/TOOLCHAIN_ARM_STD/MPS2.sct b/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M3/device/TOOLCHAIN_ARM_STD/MPS2.sct
@@ -44,11 +44,11 @@ LR_IROM1 0x00000000 0x00400000  {    ; load region size_region
   ER_IROM1 0x00000000 0x00400000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
-   .ANY (+RO)
+   *(+RO)
   }
   ; Total: 64 vectors = 256 bytes (0x100) to be reserved in RAM
   RW_IRAM1 (0x20000000+0x100) (0x400000-0x100-Stack_Size)  {  ; RW data
-   .ANY (+RW +ZI)
+   *(+RW +ZI)
   }
   ARM_LIB_STACK 0x20000000+0x400000 EMPTY -Stack_Size { ; Stack region growing down
   }
diff --git a/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M4/device/TOOLCHAIN_ARM_STD/MPS2.sct b/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M4/device/TOOLCHAIN_ARM_STD/MPS2.sct
@@ -45,11 +45,11 @@ LR_IROM1 0x00000000 0x00400000  {    ; load region size_region
   ER_IROM1 0x00000000 0x00400000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
-   .ANY (+RO)
+   *(+RO)
   }
   ; Total: 64 vectors = 256 bytes (0x100) to be reserved in RAM
   RW_IRAM1 (0x20000000+0x100) (0x400000-0x100-Stack_Size)  {  ; RW data
-   .ANY (+RW +ZI)
+   *(+RW +ZI)
   }
   ARM_LIB_STACK 0x20000000+0x400000 EMPTY -Stack_Size { ; Stack region growing down
   }
diff --git a/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M7/device/TOOLCHAIN_ARM_STD/MPS2.sct b/targets/TARGET_ARM_SSG/TARGET_MPS2/TARGET_MPS2_M7/device/TOOLCHAIN_ARM_STD/MPS2.sct
@@ -45,11 +45,11 @@ LR_IROM1 0x00000000 0x00400000  {    ; load region size_region
   ER_IROM1 0x00000000 0x00400000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
-   .ANY (+RO)
+   *(+RO)
   }
   ; Total: 64 vectors = 256 bytes (0x100) to be reserved in RAM
   RW_IRAM1 (0x20000000+0x100) (0x400000-0x100-Stack_Size)  {  ; RW data
-   .ANY (+RW +ZI)
+   *(+RW +ZI)
   }
   ARM_LIB_STACK 0x20000000+0x400000 EMPTY -Stack_Size { ; Stack region growing down
   }
diff --git a/targets/targets.json b/targets/targets.json
@@ -5225,7 +5225,8 @@
             "SERIAL",
             "SPI",
             "SPISLAVE",
-            "TSC"
+            "TSC",
+            "USTICKER"
         ],
         "release_versions": ["2", "5"],
         "copy_method": "mps2",
@@ -5250,7 +5251,8 @@
             "SERIAL",
             "SPI",
             "SPISLAVE",
-            "TSC"
+            "TSC",
+            "USTICKER"
         ],
         "release_versions": ["2", "5"],
         "copy_method": "mps2",
@@ -5276,7 +5278,8 @@
             "SPI",
             "SPISLAVE",
             "TSC",
-            "MPU"
+            "MPU",
+            "USTICKER"
         ],
         "release_versions": ["2", "5"],
         "copy_method": "mps2",
@@ -5302,7 +5305,8 @@
             "SPI",
             "SPISLAVE",
             "TSC",
-            "MPU"
+            "MPU",
+            "USTICKER"
         ],
         "release_versions": ["2", "5"],
         "copy_method": "mps2",
@@ -5328,7 +5332,8 @@
             "SPI",
             "SPISLAVE",
             "TSC",
-            "MPU"
+            "MPU",
+            "USTICKER"
         ],
         "release_versions": ["2", "5"],
         "copy_method": "mps2",

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,11 @@ LR_IROM1 0x00000000 0x00400000 { ; load region size_region`
`44`	`44`	`ER_IROM1 0x00000000 0x00400000 { ; load address = execution address`
`45`	`45`	`*.o (RESET, +First)`
`46`	`46`	`*(InRoot$$Sections)`
`47`		`- .ANY (+RO)`
	`47`	`+ *(+RO)`
`48`	`48`	`}`
`49`	`49`	`; Total: 64 vectors = 256 bytes (0x100) to be reserved in RAM`
`50`	`50`	`RW_IRAM1 (0x20000000+0x100) (0x400000-0x100-Stack_Size) { ; RW data`
`51`		`- .ANY (+RW +ZI)`
	`51`	`+ *(+RW +ZI)`
`52`	`52`	`}`
`53`	`53`	`ARM_LIB_STACK 0x20000000+0x400000 EMPTY -Stack_Size { ; Stack region growing down`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ LR_IROM1 0x00000000 0x00400000 { ; load region size_region`
`45`	`45`	`ER_IROM1 0x00000000 0x00400000 { ; load address = execution address`
`46`	`46`	`*.o (RESET, +First)`
`47`	`47`	`*(InRoot$$Sections)`
`48`		`- .ANY (+RO)`
	`48`	`+ *(+RO)`
`49`	`49`	`}`
`50`	`50`	`; Total: 64 vectors = 256 bytes (0x100) to be reserved in RAM`
`51`	`51`	`RW_IRAM1 (0x20000000+0x100) (0x400000-0x100-Stack_Size) { ; RW data`
`52`		`- .ANY (+RW +ZI)`
	`52`	`+ *(+RW +ZI)`
`53`	`53`	`}`
`54`	`54`	`ARM_LIB_STACK 0x20000000+0x400000 EMPTY -Stack_Size { ; Stack region growing down`
`55`	`55`	`}`