merge for nrf52

src/flash/nor/Makefile.am

-noinst_LTLIBRARIES += %D%/libocdflashnor.la
-%C%_libocdflashnor_la_SOURCES = \
-	%D%/core.c \
-	%D%/tcl.c \
-	$(NOR_DRIVERS) \
-	%D%/drivers.c \
-	$(NORHEADERS)
-
-NOR_DRIVERS = \
-	%D%/aduc702x.c \
-	%D%/aducm360.c \
-	%D%/ambiqmicro.c \
-	%D%/at91sam4.c \
-	%D%/at91sam4l.c \
-	%D%/at91samd.c \
-	%D%/at91sam3.c \
-	%D%/at91sam7.c \
-	%D%/ath79.c \
-	%D%/atsamv.c \
-	%D%/avrf.c \
-	%D%/cfi.c \
-	%D%/dsp5680xx_flash.c \
-	%D%/efm32.c \
-	%D%/em357.c \
-	%D%/faux.c \
-	%D%/fm3.c \
-	%D%/fm4.c \
-	%D%/jtagspi.c \
-	%D%/kinetis.c \
-	%D%/kinetis_ke.c \
-	%D%/lpc2000.c \
-	%D%/lpc288x.c \
-	%D%/lpc2900.c \
-	%D%/lpcspifi.c \
-	%D%/mdr.c \
-	%D%/mrvlqspi.c \
-	%D%/niietcm4.c \
-	%D%/non_cfi.c \
-	%D%/nrf51.c \
-	%D%/numicro.c \
-	%D%/ocl.c \
-	%D%/pic32mx.c \
-	%D%/psoc4.c \
-	%D%/sim3x.c \
-	%D%/spi.c \
-	%D%/stmsmi.c \
-	%D%/stellaris.c \
-	%D%/stm32f1x.c \
-	%D%/stm32f2x.c \
-	%D%/stm32lx.c \
-	%D%/stm32l4x.c \
-	%D%/str7x.c \
-	%D%/str9x.c \
-	%D%/str9xpec.c \
-	%D%/tms470.c \
-	%D%/virtual.c \
-	%D%/xmc1xxx.c \
-	%D%/xmc4xxx.c
-
-NORHEADERS = \
-	%D%/core.h \
-	%D%/cfi.h \
-	%D%/driver.h \
-	%D%/imp.h \
-	%D%/non_cfi.h \
-	%D%/ocl.h \
-	%D%/spi.h
+noinst_LTLIBRARIES += %D%/libocdflashnor.la
+%C%_libocdflashnor_la_SOURCES = \
+	%D%/core.c \
+	%D%/tcl.c \
+	$(NOR_DRIVERS) \
+	%D%/drivers.c \
+	$(NORHEADERS)
+
+NOR_DRIVERS = \
+	%D%/aduc702x.c \
+	%D%/aducm360.c \
+	%D%/ambiqmicro.c \
+	%D%/at91sam4.c \
+	%D%/at91sam4l.c \
+	%D%/at91samd.c \
+	%D%/at91sam3.c \
+	%D%/at91sam7.c \
+	%D%/ath79.c \
+	%D%/atsamv.c \
+	%D%/avrf.c \
+	%D%/cfi.c \
+	%D%/efm32.c \
+	%D%/em357.c \
+	%D%/faux.c \
+	%D%/fm3.c \
+	%D%/fm4.c \
+	%D%/jtagspi.c \
+        %D%/kinetis.c \
+        %D%/kinetis_ke.c \
+	%D%/lpc2000.c \
+	%D%/lpc288x.c \
+	%D%/lpc2900.c \
+	%D%/lpcspifi.c \
+	%D%/mdr.c \
+	%D%/non_cfi.c \
+	%D%/ocl.c \
+	%D%/pic32mx.c \
+	%D%/spi.c \
+	%D%/stmsmi.c \
+	%D%/stellaris.c \
+	%D%/stm32f1x.c \
+	%D%/stm32f2x.c \
+	%D%/stm32lx.c \
+	%D%/stm32l4x.c \
+	%D%/str7x.c \
+	%D%/str9x.c \
+	%D%/str9xpec.c \
+	%D%/tms470.c \
+	%D%/virtual.c \
+	%D%/fm3.c \
+	%D%/dsp5680xx_flash.c \
+	%D%/kinetis.c \
+	%D%/numicro.c \
+	%D%/nrf51.c \
+	%D%/nrf52.c \
+	%D%/mrvlqspi.c \
+	%D%/psoc4.c \
+	%D%/sim3x.c \
+        %D%/xmc1xxx.c \
+	%D%/xmc4xxx.c \
+	%D%/niietcm4.c
+
+noinst_HEADERS = \
+        %D%/core.h \
+        %D%/cfi.h \
+        %D%/driver.h \
+        %D%/imp.h \
+        %D%/non_cfi.h \
+        %D%/ocl.h \
+        %D%/spi.h
+
+
+NORHEADERS = \
+	%D%/core.h \
+	%D%/cfi.h \
+	%D%/driver.h \
+	%D%/imp.h \
+	%D%/non_cfi.h \
+	%D%/ocl.h \
+	%D%/spi.h
\ No newline at end of file

src/flash/nor/drivers.c

@@ -46,10 +46,11 @@ extern struct flash_driver lpc288x_flash;
 extern struct flash_driver lpc2900_flash;
 extern struct flash_driver lpcspifi_flash;
 extern struct flash_driver mdr_flash;
+extern struct flash_driver numicro_flash;
+extern struct flash_driver nrf51_flash;
+extern struct flash_driver nrf52_flash;
 extern struct flash_driver mrvlqspi_flash;
 extern struct flash_driver niietcm4_flash;
-extern struct flash_driver nrf51_flash;
-extern struct flash_driver numicro_flash;
 extern struct flash_driver ocl_flash;
 extern struct flash_driver pic32mx_flash;
 extern struct flash_driver psoc4_flash;
@@ -99,6 +100,9 @@ static struct flash_driver *flash_drivers[] = {
 	&lpc2900_flash,
 	&lpcspifi_flash,
 	&mdr_flash,
+	&numicro_flash,
+	&nrf51_flash,
+	&nrf52_flash,
 	&mrvlqspi_flash,
 	&niietcm4_flash,
 	&nrf51_flash,

tcl/target/nrf52.cfg

@@ -16,11 +16,24 @@ if { [info exists CPUTAPID] } {
 	set _CPUTAPID 0x2ba01477
 }
 
+# Work-area is a space in RAM used for flash programming
+# By default use 16kB
+if { [info exists WORKAREASIZE] } {
+   set _WORKAREASIZE $WORKAREASIZE
+} else {
+   set _WORKAREASIZE 0x4000
+}
+
 swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m -chain-position $_TARGETNAME
 
+$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
+
+flash bank $_CHIPNAME.flash nrf52 0x00000000 0 1 1 $_TARGETNAME
+flash bank $_CHIPNAME.uicr nrf52 0x10001000 0 1 1 $_TARGETNAME
+
 adapter_khz 10000
 
 if { ![using_hla] } {