remove NCS36510 specific changes from this branch

Author: Thomas Sailer

targets/TARGET_ONSEMI/TARGET_NCS36510/device/TOOLCHAIN_GCC_ARM/NCS36510.ld

@@ -3,12 +3,10 @@
  */
 
 MEMORY {
-    FIB (rx)              : ORIGIN = 0x00002000, LENGTH = 0x00000800
-    TRIM (rx)             : ORIGIN = 0x00002800, LENGTH = 0x00000800
     VECTORS (rx)          : ORIGIN = 0x00003000, LENGTH = 0x00000090
-    FLASH (rx)            : ORIGIN = 0x00003090, LENGTH = 320K - 4K - 0x90
-    RAM (rwx)             : ORIGIN = 0x3FFF4090, LENGTH = 48K - 0x90 /* 8_byte_aligned(35 vectors * 4 bytes each) = 0x90 */
-}
+        FLASH (rx)            : ORIGIN = 0x00003090, LENGTH = 320K - 4K - 0x90
+        RAM (rwx)             : ORIGIN = 0x3FFF4090, LENGTH = 48K - 0x90 /* 8_byte_aligned(35 vectors * 4 bytes each) = 0x90 */
+    }
 
     /* Linker script to place sections and symbol values. Should be used together
      * with other linker script that defines memory regions FLASH and RAM.
@@ -39,17 +37,7 @@ MEMORY {
     ENTRY(Reset_Handler)
 
     SECTIONS {
-    .fib :
-    {
-        KEEP(*(.fib))
-    } > FIB
-
-    .trim :
-    {
-        KEEP(*(.trim))
-    } > TRIM
-
-    .isr_vector :
+.isr_vector :
     {
         __vector_table = .;
         KEEP(*(.vector_table))

targets/TARGET_ONSEMI/TARGET_NCS36510/ncs36510Init.c

@@ -147,13 +147,13 @@ void fClockInit()
     for(Timer = 0; Timer < 10; Timer++);
 
     /** - Enable calibration */
-    //CLOCKREG->CCR.BITS.CAL32M = True;
+    CLOCKREG->CCR.BITS.CAL32M = True;
 
     /** - Wait calibration to be completed */
-    //while(CLOCKREG->CSR.BITS.CAL32MDONE == False); /* If you stuck here, issue with internal 32M calibration */
+    while(CLOCKREG->CSR.BITS.CAL32MDONE == False); /* If you stuck here, issue with internal 32M calibration */
 
     /** - Check calibration status */
-    //while(CLOCKREG->CSR.BITS.CAL32MFAIL == True); /* If you stuck here, issue with internal 32M calibration */
+    while(CLOCKREG->CSR.BITS.CAL32MFAIL == True); /* If you stuck here, issue with internal 32M calibration */
 
     /** - Power down internal 32MHz osc */
     PMUREG->CONTROL.BITS.INT32M = 1;

tools/export/codeblocks/__init__.py

@@ -78,11 +78,6 @@ def generate(self):
                                             not x.startswith('obj'))];
 
         c_sources = [self.filter_dot(s) for s in self.resources.c_sources]
-        ncs36510fib = (hasattr(self.toolchain.target, 'post_binary_hook') and
-                       self.toolchain.target.post_binary_hook['function'] == 'NCS36510TargetCode.ncs36510_addfib')
-        if ncs36510fib:
-            c_sources.append('ncs36510fib.c')
-            c_sources.append('ncs36510trim.c')
 
         ctx = {
             'project_name': self.project_name,
@@ -96,7 +91,6 @@ def generate(self):
             'include_paths': inc_dirs,
             'linker_script': self.filter_dot(self.resources.linker_script),
             'libraries': self.resources.libraries,
-            'ncs36510addfib': ncs36510fib,
             'openocdboard': ''
             }
 
@@ -123,36 +117,14 @@ def generate(self):
 
         self.gen_file('codeblocks/cbp.tmpl', ctx, "%s.%s" % (self.project_name, 'cbp'))
 
-        if ncs36510fib:
-            ctx = {
-                'mac_addr_low': 0xFFFFFFFF,
-                'mac_addr_high': 0xFFFFFFFF,
-                'clk_32k_trim': 0x39,
-                'clk_32m_trim': 0x17,
-                'rssi': 0x3D,
-                'txtune': 0xFFFFFFFF
-            }
-            if hasattr(self.toolchain.target, 'config'):
-                for an, cn in [ ['mac-addr-low', 'mac_addr_low'],
-                                ['mac-addr-high', 'mac_addr_high'],
-                                ['32KHz-clk-trim', 'clk_32k_trim'],
-                                ['32MHz-clk-trim', 'clk_32m_trim'],
-                                ['rssi-trim', 'rssi'],
-                                ['txtune-trim', 'txtune'] ]:
-                    if an in self.toolchain.target.config:
-                        if 'value' in self.toolchain.target.config[an]:
-                            ctx[cn] = int(self.toolchain.target.config[an]['value'], 0)
-            for f in [ 'ncs36510fib.c', 'ncs36510trim.c' ]:
-                self.gen_file("codeblocks/%s" % f, ctx, f)
-
         # finally, generate the project file
         super(CodeBlocks, self).generate()
 
     @staticmethod
     def clean(project_name):
         for ext in ['cbp', 'depend', 'layout']:
             remove("%s.%s" % (project_name, ext))
-        for f in ['openocd.log', 'ncs36510fib.c', 'ncs36510trim.c']:
+        for f in ['openocd.log']:
             remove(f)
         for d in ['bin', 'obj']:
             rmtree(d, ignore_errors=True)

tools/export/codeblocks/cbp.tmpl

@@ -20,14 +20,6 @@
 				<Linker>
 					<Add option='-Wl,-Map,&quot;bin/Debug/{{project_name}}.map&quot;' />
 				</Linker>
-				{% if ncs36510addfib -%}
-				<ExtraCommands>
-					<Add after="arm-none-eabi-objcopy -O ihex -R .fib -R .trim bin/Debug/{{project_name}}.elf bin/Debug/{{project_name}}.hex" />
-					<Add after="mbed-os/tools/export/codeblocks/ncs36510addfib.py bin/Debug/{{project_name}}.hex bin/Debug/{{project_name}}.fib" />
-					<Add after="arm-none-eabi-objcopy --update-section .fib=bin/Debug/{{project_name}}.fib bin/Debug/{{project_name}}.elf" />
-					<Add after="arm-none-eabi-objcopy -O ihex bin/Debug/{{project_name}}.elf bin/Debug/{{project_name}}.hex" />
-				</ExtraCommands>
-				{% endif -%}
 			</Target>
 			<Target title="Release">
 				<Option output="bin/Release/{{project_name}}.elf" prefix_auto="1" extension_auto="0" />
@@ -38,14 +30,6 @@
 				<Linker>
 					<Add option='-Wl,-Map,&quot;bin/Release/{{project_name}}.map&quot;' />
 				</Linker>
-				{% if ncs36510addfib -%}
-				<ExtraCommands>
-					<Add after="arm-none-eabi-objcopy -O ihex -R .fib -R .trim bin/Release/{{project_name}}.elf bin/Release/{{project_name}}.hex" />
-					<Add after="mbed-os/tools/export/codeblocks/ncs36510addfib.py bin/Release/{{project_name}}.hex bin/Release/{{project_name}}.fib" />
-					<Add after="arm-none-eabi-objcopy --update-section .fib=bin/Release/{{project_name}}.fib bin/Release/{{project_name}}.elf" />
-					<Add after="arm-none-eabi-objcopy -O ihex bin/Release/{{project_name}}.elf bin/Release/{{project_name}}.hex" />
-				</ExtraCommands>
-				{% endif -%}
 			</Target>
 		</Build>
 		<Compiler>