diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-05-20 23:53:00 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-05-21 10:45:33 -0700 |
| commit | 09ee9889e4d9ee2b985f56b6c8641e7dbfc8f202 (patch) | |
| tree | 7687f974df2738d5211a3d9d1abb5f837a9967f7 | |
| parent | 75c7d0058a66a60a58f1acc8e6d08556621c602c (diff) | |
| download | meta-openembedded-09ee9889e4d9ee2b985f56b6c8641e7dbfc8f202.tar.gz | |
openocd: Fix build on x86_64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch | 59 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd_git.bb | 1 |
2 files changed, 60 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch new file mode 100644 index 0000000000..c80d9f19f8 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch @@ -0,0 +1,59 @@ +From bee22f143ffa0457aefcf31053f76416e6d242e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2019 23:24:26 -0700 +Subject: [PATCH] esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE + +PAGE_SIZE is defined in system includes on some systems, this would +avoid the unintended conflict + +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 + +Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/2] +Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/flash/nor/esirisc_flash.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c +index 4e33b942..3bed0658 100644 +--- a/src/flash/nor/esirisc_flash.c ++++ b/src/flash/nor/esirisc_flash.c +@@ -92,7 +92,7 @@ + #endif + + #define CONTROL_TIMEOUT 5000 /* 5s */ +-#define PAGE_SIZE 4096 ++#define FLASH_PAGE_SIZE 4096 + #define PB_MAX 32 + + #define NUM_NS_PER_S 1000000000ULL +@@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last) + (void)esirisc_flash_disable_protect(bank); + + for (int page = first; page < last; ++page) { +- uint32_t address = page * PAGE_SIZE; ++ uint32_t address = page * FLASH_PAGE_SIZE; + + target_write_u32(target, esirisc_info->cfg + ADDRESS, address); + +@@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank) + if (target->state != TARGET_HALTED) + return ERROR_TARGET_NOT_HALTED; + +- bank->num_sectors = bank->size / PAGE_SIZE; +- bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors); ++ bank->num_sectors = bank->size / FLASH_PAGE_SIZE; ++ bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors); + + retval = esirisc_flash_init(bank); + if (retval != ERROR_OK) { +-- +2.21.0 + diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 9a8a09a913..b50c3acf4c 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,6 +9,7 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ + file://0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch \ " SRCREV_FORMAT = "openocd" |