[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1271-g93e4bed05

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  93e4bed0566fa783fc5f2524920f11ba250ea7dd (commit)
       via  ae4113d877c8f2a0518fb3246610b1518ce7c03f (commit)
      from  fe13f61539b5ee27e14e8675c9ebe36a6ca034d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 93e4bed0566fa783fc5f2524920f11ba250ea7dd
Author: tscn92 <ts...@ka...>
Date:   Mon Apr 6 16:05:08 2020 +0200

    jtag/drivers/bcm2835gpio: bcm2835gpio_init has been updated
    
    For jtag/drivers/bcm2835gpio dev_mem_fd has been updated within
    bcm2835gpio_init with the add on of gpio to mem. This permits the
    access to memory of GPIO without the need for root access.
    For failed attempt, a fallback to original memory follows.
    It should be noted that any printed error is relative to original
    memory ("dev/mem").
    Tested on EFM32GG12B390F board
    
    Change-Id: I4540bdf62fb3b91a51221e277881adfae138dcc5
    Signed-off-by: tscn92 <ts...@ka...>
    Reviewed-on: http://openocd.zylin.com/5568
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/bcm2835gpio.c b/src/jtag/drivers/bcm2835gpio.c
index bbc87d3dd..df557c5c6 100644
--- a/src/jtag/drivers/bcm2835gpio.c
+++ b/src/jtag/drivers/bcm2835gpio.c
@@ -466,7 +466,11 @@ static int bcm2835gpio_init(void)
 		return ERROR_JTAG_INIT_FAILED;
 	}
 
-	dev_mem_fd = open("/dev/mem", O_RDWR | O_SYNC);
+	dev_mem_fd = open("/dev/gpiomem", O_RDWR | O_SYNC);
+	if (dev_mem_fd < 0) {
+		LOG_DEBUG("Cannot open /dev/gpiomem, fallback to /dev/mem");
+		dev_mem_fd = open("/dev/mem", O_RDWR | O_SYNC);
+	}
 	if (dev_mem_fd < 0) {
 		perror("open");
 		return ERROR_JTAG_INIT_FAILED;

commit ae4113d877c8f2a0518fb3246610b1518ce7c03f
Author: Marc Schink <de...@za...>
Date:   Wed Feb 26 12:58:27 2020 +0100

    tcl/boards: Rename 'ek-tm4c1294xl.cfg' to 'ti_ek-tm4c1294xl.cfg'
    
    The new filename has a proper vendor prefix. Keep the old
    configuration file for now but show a "deprecated" warning
    at runtime.
    
    Change-Id: If7465a752f47f3292e430c8b311148badfd384cd
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: http://openocd.zylin.com/5478
    Tested-by: jenkins
    Reviewed-by: Karl Palsson <ka...@tw...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/board/ek-tm4c1294xl.cfg b/tcl/board/ek-tm4c1294xl.cfg
index b3f384c0e..676386680 100644
--- a/tcl/board/ek-tm4c1294xl.cfg
+++ b/tcl/board/ek-tm4c1294xl.cfg
@@ -1,14 +1,3 @@
-#
-# TI Tiva C Series ek-tm4c1294xl Launchpad Evaluation Kit
-#
-# http://www.ti.com/tool/ek-tm4c1294xl
-#
+echo "WARNING: board/ek-tm4c1294xl.cfg is deprecated, please switch to board/ti_ek-tm4c1294xl.cfg"
 
-source [find interface/ti-icdi.cfg]
-
-transport select hla_jtag
-
-set WORKAREASIZE 0x8000
-set CHIPNAME tm4c1294ncpdt
-
-source [find target/stellaris.cfg]
+source [find board/ti_ek-tm4c1294xl.cfg]
diff --git a/tcl/board/ek-tm4c1294xl.cfg b/tcl/board/ti_ek-tm4c1294xl.cfg
similarity index 100%
copy from tcl/board/ek-tm4c1294xl.cfg
copy to tcl/board/ti_ek-tm4c1294xl.cfg

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/bcm2835gpio.c                        |  6 +++++-
 tcl/board/ek-tm4c1294xl.cfg                           | 15 ++-------------
 tcl/board/{ek-tm4c1294xl.cfg => ti_ek-tm4c1294xl.cfg} |  0
 3 files changed, 7 insertions(+), 14 deletions(-)
 copy tcl/board/{ek-tm4c1294xl.cfg => ti_ek-tm4c1294xl.cfg} (100%)


hooks/post-receive
-- 
Main OpenOCD repository