[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openocd-development
Subject:    [OpenOCD-devel] [PATCH]: d4e3dd7 lpc2000: add support for auto variant for LPC15xx parts
From:       gerrit () openocd ! org (gerrit)
Date:       2015-08-25 18:35:10
Message-ID: 20150825183510.26A6A1980796 () mail ! openocd ! org
[Download RAW message or body]

This is an automated email from Gerrit.

Jean-François Wauthy (jfw@spancircle.be) just uploaded a new patch set to Gerrit, \
which you can find at http://openocd.zylin.com/2944

-- gerrit

commit d4e3dd7ccdacc09ef15c854f0e79a20248d3b4e4
Author: Jean-François Wauthy <jfw@spancircle.be>
Date:   Tue Aug 25 20:33:04 2015 +0200

    lpc2000: add support for auto variant for LPC15xx parts
    
    Change-Id: I33123516b18010f7d9afebd611b364ea89b5fd20
    Signed-off-by: Jean-François Wauthy <jfw@spancircle.be>

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index 8340aea..01e4ba2 100644
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -105,6 +105,8 @@
  * - 11Uxx
  * - 131x
  * - 134x
+ * - 151x
+ * - 154x
  * - 175x
  * - 176x
  * - 177x
@@ -217,6 +219,13 @@
 #define LPC1346        0x08018542
 #define LPC1347        0x08020543
 
+#define LPC1517        0x00001517
+#define LPC1518        0x00001518
+#define LPC1519        0x00001519
+#define LPC1547        0x00001547
+#define LPC1548        0x00001548
+#define LPC1549        0x00001549
+
 #define LPC1751_1      0x25001110
 #define LPC1751_2      0x25001118
 #define LPC1752        0x25001121
@@ -1322,6 +1331,22 @@ static int lpc2000_auto_probe_flash(struct flash_bank *bank)
 			bank->size = 32 * 1024;
 			break;
 
+    case LPC1517:
+    case LPC1547:
+      lpc2000_info->variant = lpc1500;
+      bank->size = 64 * 1024;
+      break;
+    case LPC1518:
+    case LPC1548:
+      lpc2000_info->variant = lpc1500;
+      bank->size = 128 * 1024;
+      break;
+    case LPC1519:
+    case LPC1549:
+      lpc2000_info->variant = lpc1500;
+      bank->size = 256 * 1024;
+      break;
+
 		case LPC1751_1:
 		case LPC1751_2:
 			lpc2000_info->variant = lpc1700;
diff --git a/tcl/target/lpc1549.cfg b/tcl/target/lpc1549.cfg
index 3707b60..2e3dd4b 100644
--- a/tcl/target/lpc1549.cfg
+++ b/tcl/target/lpc1549.cfg
@@ -1,6 +1,5 @@
 # NXP LPC1549 Cortex-M3 with 36kB of SRAM and 256 kB of Flash
 set CHIPNAME lpc1549
-set CHIPROMSIZE 0x40000
 set WORKAREASIZE 0x9000
 
 source [find target/lpc15xx.cfg]
diff --git a/tcl/target/lpc1xxx.cfg b/tcl/target/lpc1xxx.cfg
index c239829..4a579f8 100644
--- a/tcl/target/lpc1xxx.cfg
+++ b/tcl/target/lpc1xxx.cfg
@@ -106,21 +106,9 @@ if { $_CHIPSERIES == "lpc1500" } {
 # transfers).
 #
 # flash bank <name> lpc2000 <base> <size> 0 0 <target#> <variant> <clock> [calc \
                checksum]
-if { $_CHIPSERIES == "lpc1500" } {
-  if { [info exists CHIPROMSIZE] } {
-    set _CHIPROMSIZE $CHIPROMSIZE
-  } else {
-    error "CHIPROMSIZE is not set. The $CHIPNAME part is available in several Flash \
                size configurations and cannot be detected automatically. Please set \
                CHIPROMSIZE."
-  }
-
-  set _FLASHNAME $_CHIPNAME.flash
-  flash bank $_FLASHNAME lpc2000 0x0 $_CHIPROMSIZE 0 0 $_TARGETNAME \
-    lpc1500 $_CCLK calc_checksum
-} else {
-  set _FLASHNAME $_CHIPNAME.flash
-  flash bank $_FLASHNAME lpc2000 0x0 0 0 0 $_TARGETNAME \
-    auto $_CCLK calc_checksum
-}
+set _FLASHNAME $_CHIPNAME.flash
+flash bank $_FLASHNAME lpc2000 0x0 0 0 0 $_TARGETNAME \
+  auto $_CCLK calc_checksum
 
 if { $_CHIPSERIES == "lpc800" || $_CHIPSERIES == "lpc1100" || $_CHIPSERIES == \
"lpc1200" || $_CHIPSERIES == "lpc1300" } {  # Do not remap 0x0000-0x0200 to anything \
but the flash (i.e. select

-- 

------------------------------------------------------------------------------
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel


[prev in list] [next in list] [prev in thread] [next in thread]