This is an automated email from Gerrit.

Khem Raj (raj.k...@gmail.com) just uploaded a new patch set to Gerrit, which 
you can find at http://openocd.zylin.com/5180

-- gerrit

commit 531c96b4fd99ea046750591af36c5b3f92479fa6
Author: Khem Raj <raj.k...@gmail.com>
Date:   Mon May 20 23:24:26 2019 -0700

    esirisc_flash: Define PAGE_SIZE if its not already defined
    
    Fixes
    | src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined 
[-Werror,-Wmacro-redefined]
    | #define PAGE_SIZE                       4096
    |         ^
    | 
/mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu
    de/limits.h:89:9: note: previous definition is here
    | #define PAGE_SIZE PAGESIZE
    
    Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc
    Signed-off-by: Khem Raj <raj.k...@gmail.com>

diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c
index 4e33b94..90661b7 100644
--- a/src/flash/nor/esirisc_flash.c
+++ b/src/flash/nor/esirisc_flash.c
@@ -92,7 +92,9 @@
 #endif
 
 #define CONTROL_TIMEOUT                5000            /* 5s    */
+#ifndef PAGE_SIZE
 #define PAGE_SIZE                      4096
+#endif
 #define PB_MAX                         32
 
 #define NUM_NS_PER_S           1000000000ULL

-- 


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

Reply via email to