Merge pull request #7505 from naveenkaje/pushbranch

Cruz Monrreal · web-flow · commit cc8651e45ccc · 2018-07-13T13:30:25.000-05:00
Fix linker script for NRF52840/ARM
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct
@@ -26,8 +26,8 @@
 LR_IROM1 MBED_APP_START MBED_APP_SIZE {
   ER_IROM1 MBED_APP_START MBED_APP_SIZE {
    *.o (RESET, +First)
-   *(InRoot$$Sections)    
-    .ANY (+RO)
+   *(InRoot$$Sections) 
+   .ANY (+RO)
   }
 
   RW_IRAM0 MBED_RAM0_START UNINIT MBED_RAM0_SIZE { ;no init section
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52840.sct b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52840.sct
@@ -30,7 +30,7 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE {
    .ANY (+RO)
   }
   RW_IRAM0 MBED_RAM0_START UNINIT MBED_RAM0_SIZE { ;no init section
-        *(*noinit)
+        *(*nvictable)
   }
   RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE {
    .ANY (+RW +ZI)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE {`
`30`	`30`	`.ANY (+RO)`
`31`	`31`	`}`
`32`	`32`	`RW_IRAM0 MBED_RAM0_START UNINIT MBED_RAM0_SIZE { ;no init section`
`33`		`- (noinit)`
	`33`	`+ (nvictable)`
`34`	`34`	`}`
`35`	`35`	`RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE {`
`36`	`36`	`.ANY (+RW +ZI)`