Ensure CRP is set correctly for IAR, GCC and ARM

Author: chrissnow

targets/TARGET_NXP/TARGET_LPC176X/device/CRP.c

@@ -38,10 +38,12 @@ Caution: If CRP3 is selected, no future factory testing can be
 performed on the device.
 */
 
-#if !defined(BOOTLOADER_ADDR) // do not include CRP if there is a bootloader.
+#if !defined(BOOTLOADER_ADDR) // Do not include CRP if there is a bootloader.
     #if defined (__ICCARM__)
-        const long CRP_Key @0x000002FC = 0xFFFFFFFF;
+        __root const long CRP_Key@0x000002FC = 0xFFFFFFFF;
+    #elif defined (__GNUC__)
+        const long CRP_Key __attribute__((used)) __attribute__((section(".CRPSection"))) = 0xFFFFFFFF;
     #else
-        const long CRP_Key __attribute__((section(".ARM.__at_0x000002FC "))) = 0xFFFFFFFF;
-	#endif
+        const long CRP_Key __attribute__((used)) __attribute__((section(".ARM.__at_0x000002FC"))) = 0xFFFFFFFF;
+    #endif
 #endif

targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_MICRO/startup_LPC17xx.S

@@ -99,12 +99,6 @@ __Vectors       DCD     __initial_sp              ; Top of Stack
                 DCD     PLL1_IRQHandler           ; 48: PLL1 Lock (USB PLL)
 
 
-                IF      :LNOT::DEF:NO_CRP
-                AREA    |.ARM.__at_0x02FC|, CODE, READONLY
-CRP_Key         DCD     0xFFFFFFFF
-                ENDIF
-
-
                 AREA    |.text|, CODE, READONLY
 
 

targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_GCC_ARM/LPC1768.ld

@@ -46,6 +46,10 @@ ENTRY(Reset_Handler)
 
 SECTIONS
 {
+    .CRPSection 0x000002FC :
+    {
+        KEEP(*(.CRPSection))
+    } > m_data
     .text :
     {
         KEEP(*(.isr_vector))

targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_IAR/startup_LPC17xx.S

@@ -350,26 +350,4 @@ USBActivity_IRQHandler
 CANActivity_IRQHandler
         B CANActivity_IRQHandler
 
-#ifndef SRAM
-        SECTION .crp:CODE:ROOT(2)
-        DATA
-/* Code Read Protection
-CRP1    0x12345678 - Write to RAM command can not access RAM below 0x10000200.
-                   - Read Memory command: disabled.
-                   - Copy RAM to Flash command: cannot write to Sector 0.
-                   - "Go" command: disabled.
-                   - Erase sector(s) command: can erase any individual sector except 
-                   	 sector 0 only, or can erase all sectors at once.
-                   - Compare command: disabled
-CRP2    0x87654321 - Write to RAM command: disabled.
-                   - Copy RAM to Flash: disabled.
-                   - Erase command: only allows erase of all sectors.
-CRP3    0x43218765 - Access to chip via the SWD pins is disabled. ISP entry
-                     by pulling PIO0_1 LOW is disabled if a valid user code is
-                     present in flash sector 0.
-Caution: If CRP3 is selected, no future factory testing can be
-performed on the device.
-*/
-	DCD	0xFFFFFFFF
-#endif
         END