mirror of
https://github.com/Ponce/slackbuilds
synced 2024-12-02 13:04:42 +01:00
84 lines
3 KiB
Diff
84 lines
3 KiB
Diff
|
From 6db49eb8858023654084088c73d968e190aec491 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rene Kita <git@rkta.de>
|
||
|
|
Date: Fri, 12 Mar 2021 18:38:02 +0100
|
||
|
|
Subject: [PATCH] build: remove warnings with gcc 11
|
||
|
|
|
||
|
|
This removes some warnings which prevent a successful build with -Werror
|
||
|
|
which is enabled by default. I'm using gcc 11, so maybe others are not
|
||
|
|
getting this warnings yet.
|
||
|
|
|
||
|
|
In src/flash/nor/numicro.c the debug messages were misleadingly indented.
|
||
|
|
In src/target/arm920t.c the array size where smaller than expected from
|
||
|
|
the receiving function.
|
||
|
|
|
||
|
|
Change-Id: I66f5c6a63beb9f9416e73b726299297476c884d8
|
||
|
|
Signed-off-by: Rene Kita <git@rkta.de>
|
||
|
|
Reviewed-on: http://openocd.zylin.com/6104
|
||
|
|
Reviewed-by: Jonathan McDowell <noodles-openocd@earth.li>
|
||
|
|
Tested-by: jenkins
|
||
|
|
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
|
||
|
|
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
|
||
|
|
---
|
||
|
|
src/flash/nor/numicro.c | 6 +++---
|
||
|
|
src/target/arm920t.c | 6 +++---
|
||
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c
|
||
|
|
index 7609fa81c..1971daa24 100644
|
||
|
|
--- a/src/flash/nor/numicro.c
|
||
|
|
+++ b/src/flash/nor/numicro.c
|
||
|
|
@@ -1243,7 +1243,7 @@ static uint32_t numicro_fmc_cmd(struct target *target, uint32_t cmd, uint32_t ad
|
||
|
|
retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
|
||
|
|
if (retval != ERROR_OK)
|
||
|
|
return retval;
|
||
|
|
- LOG_DEBUG("status: 0x%" PRIx32 "", status);
|
||
|
|
+ LOG_DEBUG("status: 0x%" PRIx32 "", status);
|
||
|
|
if ((status & (ISPTRG_ISPGO)) == 0)
|
||
|
|
break;
|
||
|
|
if (timeout-- <= 0) {
|
||
|
|
@@ -1512,7 +1512,7 @@ static int numicro_erase(struct flash_bank *bank, unsigned int first,
|
||
|
|
retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
|
||
|
|
if (retval != ERROR_OK)
|
||
|
|
return retval;
|
||
|
|
- LOG_DEBUG("status: 0x%" PRIx32 "", status);
|
||
|
|
+ LOG_DEBUG("status: 0x%" PRIx32 "", status);
|
||
|
|
if (status == 0)
|
||
|
|
break;
|
||
|
|
if (timeout-- <= 0) {
|
||
|
|
@@ -1601,7 +1601,7 @@ static int numicro_write(struct flash_bank *bank, const uint8_t *buffer,
|
||
|
|
retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
|
||
|
|
if (retval != ERROR_OK)
|
||
|
|
return retval;
|
||
|
|
- LOG_DEBUG("status: 0x%" PRIx32 "", status);
|
||
|
|
+ LOG_DEBUG("status: 0x%" PRIx32 "", status);
|
||
|
|
if (status == 0)
|
||
|
|
break;
|
||
|
|
if (timeout-- <= 0) {
|
||
|
|
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
|
||
|
|
index 80f6d7045..a45dc6420 100644
|
||
|
|
--- a/src/target/arm920t.c
|
||
|
|
+++ b/src/target/arm920t.c
|
||
|
|
@@ -245,8 +245,8 @@ static int arm920t_read_cp15_interpreted(struct target *target,
|
||
|
|
uint32_t cp15_opcode, uint32_t address, uint32_t *value)
|
||
|
|
{
|
||
|
|
struct arm *arm = target_to_arm(target);
|
||
|
|
- uint32_t *regs_p[1];
|
||
|
|
- uint32_t regs[2];
|
||
|
|
+ uint32_t *regs_p[16];
|
||
|
|
+ uint32_t regs[16];
|
||
|
|
uint32_t cp15c15 = 0x0;
|
||
|
|
struct reg *r = arm->core_cache->reg_list;
|
||
|
|
|
||
|
|
@@ -295,7 +295,7 @@ int arm920t_write_cp15_interpreted(struct target *target,
|
||
|
|
{
|
||
|
|
uint32_t cp15c15 = 0x0;
|
||
|
|
struct arm *arm = target_to_arm(target);
|
||
|
|
- uint32_t regs[2];
|
||
|
|
+ uint32_t regs[16];
|
||
|
|
struct reg *r = arm->core_cache->reg_list;
|
||
|
|
|
||
|
|
/* load value, address into R0, R1 */
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|