From b793546316544eb6cb48362ad91d60c42dbee9e4 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Thu, 28 May 2015 12:12:13 -0700 Subject: [PATCH] flash_ec: move openocd configs from chip/ to util/ Avoid duplicating servo configurations for every chip. BRANCH=none BUG=chrome-os-partner:22990 TEST=None. This is an intermediate step to make it clear what's happening. CQ-DEPEND=CL:273950 Change-Id: I448543b6ab9d39423955e8d2589b6035c59e838a Signed-off-by: Myles Watson Reviewed-on: https://chromium-review.googlesource.com/273906 Reviewed-by: Randall Spangler --- chip/lm4/openocd/servo_v3.cfg | 13 ------------- chip/npcx/openocd/servo_v2.cfg | 13 ------------- {chip/lm4 => util}/openocd/lm4x_cmds.tcl | 0 {chip/npcx => util}/openocd/npcx.cfg | 0 .../openocd/jlink.cfg => util/openocd/npcx_chip.cfg | 0 {chip/npcx => util}/openocd/npcx_cmds.tcl | 0 .../openocd/servo_v2.cfg => util/openocd/servo.cfg | 0 7 files changed, 26 deletions(-) delete mode 100644 chip/lm4/openocd/servo_v3.cfg delete mode 100644 chip/npcx/openocd/servo_v2.cfg rename {chip/lm4 => util}/openocd/lm4x_cmds.tcl (100%) rename {chip/npcx => util}/openocd/npcx.cfg (100%) rename chip/npcx/openocd/jlink.cfg => util/openocd/npcx_chip.cfg (100%) rename {chip/npcx => util}/openocd/npcx_cmds.tcl (100%) rename chip/lm4/openocd/servo_v2.cfg => util/openocd/servo.cfg (100%) diff --git a/chip/lm4/openocd/servo_v3.cfg b/chip/lm4/openocd/servo_v3.cfg deleted file mode 100644 index 39fb1bd639..0000000000 --- a/chip/lm4/openocd/servo_v3.cfg +++ /dev/null @@ -1,13 +0,0 @@ -telnet_port 4444 -gdb_port 3333 -gdb_memory_map enable -gdb_flash_program enable - -interface ftdi -ftdi_vid_pid 0x18d1 0x5004 -ftdi_layout_init 0x0c08 0x0f1b -ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400 -ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800 - -source [find target/stellaris.cfg] -source [find lm4x_cmds.tcl] diff --git a/chip/npcx/openocd/servo_v2.cfg b/chip/npcx/openocd/servo_v2.cfg deleted file mode 100644 index 578e3f9c43..0000000000 --- a/chip/npcx/openocd/servo_v2.cfg +++ /dev/null @@ -1,13 +0,0 @@ -telnet_port 4444 -gdb_port 3333 -gdb_memory_map enable -gdb_flash_program enable - -interface ftdi -ftdi_vid_pid 0x18d1 0x5002 -ftdi_layout_init 0x0c08 0x0f1b -ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400 -ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800 - -source [find npcx.cfg] -source [find npcx_cmds.tcl] diff --git a/chip/lm4/openocd/lm4x_cmds.tcl b/util/openocd/lm4x_cmds.tcl similarity index 100% rename from chip/lm4/openocd/lm4x_cmds.tcl rename to util/openocd/lm4x_cmds.tcl diff --git a/chip/npcx/openocd/npcx.cfg b/util/openocd/npcx.cfg similarity index 100% rename from chip/npcx/openocd/npcx.cfg rename to util/openocd/npcx.cfg diff --git a/chip/npcx/openocd/jlink.cfg b/util/openocd/npcx_chip.cfg similarity index 100% rename from chip/npcx/openocd/jlink.cfg rename to util/openocd/npcx_chip.cfg diff --git a/chip/npcx/openocd/npcx_cmds.tcl b/util/openocd/npcx_cmds.tcl similarity index 100% rename from chip/npcx/openocd/npcx_cmds.tcl rename to util/openocd/npcx_cmds.tcl diff --git a/chip/lm4/openocd/servo_v2.cfg b/util/openocd/servo.cfg similarity index 100% rename from chip/lm4/openocd/servo_v2.cfg rename to util/openocd/servo.cfg