From patchwork Tue May 21 17:46:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 164745 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1902368ili; Tue, 21 May 2019 10:47:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqydv5BOlbZoj9RYcyDczawN/jICryZh7hg53eGe39uVlBdR2imkCeP836rvz4fAv3+WVO9F X-Received: by 2002:a65:64c9:: with SMTP id t9mr83452797pgv.221.1558460822683; Tue, 21 May 2019 10:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558460822; cv=none; d=google.com; s=arc-20160816; b=senF4U5PWclG31Navpt4feF4e1ysymBEmRYQAXe7xIvLKHcNK58C5uwwgBin06cNMw W3eNrJXv4kPEDT7EMkWIrLBmbL5muGmbTPaQPGoDfLCh6WHL3NJmfM0oNGitE7pmNfJT bccNIVtkDsNdQjVkx6RRGxiXjVzCnZoCH+BTKZ5pngjyMD2MtXTObxkSZWGZLDeg48LE 8WNYJxdX5HmoB9MH+h2LI4WIirzNjrSKn0YMnlZu3Trm0R7RH7hyFF/Cz9X2eYwbmNll 633C2zGWwyC5Js9BJj85R8UclGk4LeJF1wFinCCRFPHkhCr4+JXvr6FQ+KSpH4rH1t8k P1rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=Mh79qPEc1X5PBnCjl2zv8iX1IPszsmikWjK4KS9ddB0=; b=VFUNpwtgYDjKOz3YY9DMJkxVE7GhyDfCcnlVgbadNA1f8sMAmLy4rkeSZ4VFa0ahph QMp9CCMb4n8UWvlRP5IzE/gaYis5EpXDM55BD40CkbSESCzwkz8Uwd+qmY4VXZp+ENH7 5iETJLh5GgwXyAtbUt7HpKsdvRrP58WDiCQgaqCyiRXNHWlC5X29apraoEqsWAH/oIFf QGkBB64ZimUSyeznePPDX3FhbhX2zSLRriwLbItvD25ZoawbsbjBU7fD7BQxSXOkS/1r sYCFO6unozea/xDTMCzgY4RZq4/tJsQeTowdHmMb8tpougQuo/YLZr9RgMy9/P3V/Dca IRJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ICUXnbKc; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k15si22998144pgh.331.2019.05.21.10.47.02; Tue, 21 May 2019 10:47:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ICUXnbKc; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6AFF97E27A; Tue, 21 May 2019 17:47:00 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by mail.openembedded.org (Postfix) with ESMTP id B6DBF7E26A for ; Tue, 21 May 2019 17:46:58 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id h17so8959374pgv.0 for ; Tue, 21 May 2019 10:47:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b4kIzErRQ/5ht8X+Vor7hP9M+nMRQpG6lXL5HYMoIEg=; b=ICUXnbKcTvbMUjFzFbeV7RAYzN8aY35eAlQ4By/N36kQn6L2JcEGYTR8f2kfx/YPkw AHmZ/NIokrBsc7p5X4jPScbUkLaXaj/qAMfGiZQhaDzJAMbFkLdpnTmKrureD8GwOEyI ewm2S7PRXQXbCiAxBznWyBDK56uYEvtBT19NbiK0e+EvAjnSv+9nq39yxN/Q21UDUcQh aRCnAHwAf3V/zABG8Wnqo5STECzJwqHxsaTstFEEeoufljHZUsjzS94eekcmhYJnaUYh iqbsE+AdKjRX4UqMKvm1TU1yHVlKri8F4OJRjInBu0eKtKwbvx1j5+deeFywLgfEjmR6 6J8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b4kIzErRQ/5ht8X+Vor7hP9M+nMRQpG6lXL5HYMoIEg=; b=LHYEIAm+sUv63ri4x/brTSdiC8LoBEWrajKokRsQ/LuaQ6gDtFUS+m9X8tRJz1lTKJ UqGUdWLKmo8upBO+ETUlnWSKqYfREHt+IfHjBkIyDFp1VGXGrd30omfA9MrYeigQBKq5 XNTFNSFOFaA11GM1x1iuUJL1MMiZsoF7Ki//+LOrnptIeeimfZ4JNWKDZveNvS5Df+VZ dWBDeBY6t9MTGvPMMs1ibpRq3rA2QtxSY3vIerszk/56/UB+sPDvYkwnrMAClcPlwmaK cAYXLf629iLjamxHENM6KUGeRbPLdFSUemdOzQlnzXektSzBA/E8MrvqTqnfmAVoWjGU T0Lw== X-Gm-Message-State: APjAAAX3rcvaMvNdilvgbgKdrpArr7G8EVwLCCNs6rUf9FpD39g6Pnx/ H8vuMfYUmN9mgb4WFS4qfGy5fDKowqw= X-Received: by 2002:a63:fa16:: with SMTP id y22mr44353755pgh.15.1558460819123; Tue, 21 May 2019 10:46:59 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::3506]) by smtp.gmail.com with ESMTPSA id p14sm29175324pfa.112.2019.05.21.10.46.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 May 2019 10:46:58 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 21 May 2019 10:46:52 -0700 Message-Id: <20190521174652.9572-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH V2] openocd: Fix build on x86_64 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- v2: Avoid conflict by renaming ...-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch | 59 +++++++++++++++++++ .../recipes-devtools/openocd/openocd_git.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch -- 2.21.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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 +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 +--- + 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"