From patchwork Tue May 21 06:55:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 164689 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1241225ili; Mon, 20 May 2019 23:55:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqywcJkDWerlvyUZRdGSrJDgF5ni643DAxSro5/qPor36r2fNZe52QkOzqXql4opMvVTJt3S X-Received: by 2002:a63:6b41:: with SMTP id g62mr68603634pgc.240.1558421740369; Mon, 20 May 2019 23:55:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558421740; cv=none; d=google.com; s=arc-20160816; b=gw7PC7LdDHpnJJTTY+eFX5k0v8onq9zFPO4Qc6wyU+HCXGkEHXGYJ+j+FWa+CtY+SP go0v3V46ls4Q/0OqVDCyAIfFtwBhnqfZDNphmTto06Fu8RxuIuGLhB6elK7bKKYDcXiX ErLWuS0AyV2zkAGXLi0z8wBlGW6ckABJs3bw70mIn62rg/30WCvORL6ao/gYKFUYAs/y B1zu5suOFQbOF0dX7VTtxSL76BvwMJlkjNnM3b5VEOrefpb6zvP/dsS2AMYUU6T3sfcK YupMMMmybfpGegX+PiJK20TeGu16HJYkV95/dXTm9C6m0Zg3XTAA0vvICglQlcR2jhj9 56BQ== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=QbtyEkwit/SPmMUY7w5uUpP6nyQMXVVZcNYqQ/EOnz8=; b=kSo1P4teW4AgE77qPJDtq7RCmyBlA2ogqUrfBK3KcpancQ90hDgzBTxjRTg0nhlc6a BMNSFdxveRA4cO0qMY32AS9zLFTo3PQqE4yqNlQe2y+btcfJURZT6txO4nOF+KQMtDPx X93aHMayYoX7BA7yM22YYu4J0RFX/EZFcFnm3EKsmdwEz/yOahgO7MONFwaCu9mA6zkn oVh52iAqqjR4vu0LonOV3AYcSUSCRhlOwfsEnJELVviTUM/UvIMr/7jOVj3ETS7cJTg0 oD0p7ndjzrF0qDjInE6rWHheB4zesMV9z1fdLQsNUEXOtwCwh4ZN/1JE3QVDaZg53+9J ZpsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cyF5BGcw; 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 n23si12740030pgk.487.2019.05.20.23.55.40; Mon, 20 May 2019 23:55:40 -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=cyF5BGcw; 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 541167E188; Tue, 21 May 2019 06:55:38 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by mail.openembedded.org (Postfix) with ESMTP id 96A1B7E182 for ; Tue, 21 May 2019 06:55:36 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id a5so7927427pls.12 for ; Mon, 20 May 2019 23:55:38 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=hwOxC25EsZgo6nW9+xLtFdFxgrzukAzedtbHXFHyj+A=; b=cyF5BGcwXBwNB+hkz977OXZGvV2J60+7SZAk3ycw4hJ039wLtpY4+old9Of7Uv8MSD pdB72qftb5Mscikx27PDQqbM0EMr+Rt3b/duunD3HpDm7a7Zj1O0Sii4bJ7ks/Arfl2i o5nBZGTJICR86xCpZQt/o75rqlnADnb1hYqfuMQh0ZtLEWXOZy+a1jFlhf+wmkyH+3I2 J1cxhm0pKp454utT8womg17B/TrXzZUInwywMayC2Hloo/Ewif/BAizdQaqKzx0agLqi xVxbqReeNBJHLe/B0sGc+97hH2nLHwDjYssLYn4egGPx2uDltWcfvxiDXPbpNjFnu1FC fZxA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=hwOxC25EsZgo6nW9+xLtFdFxgrzukAzedtbHXFHyj+A=; b=D8wsAQmOawZ9uCBAQSMNU9Fn5EkH4LHbw31SEFuCJvUVXqg7idagKXXTZ3iVLczjwK wbPjHDvigcYN3UfcV3xPDbbEjGyC4e9u3mRrqL9vrTJxvXlD9ezk6ACWd9Sf5LIPYmCW n01VF99liAZJUH0x6GPYvbsCbKNQYclf8l9/v+Jb07KrTXGqXvuxSOwKmwMBA9lLxi4x hh91wbJRTAmvOFXWFtQ/LNu6oOK7pSVm9gj41KATm1jw7JBr69IkNFzn9R1BDdOadnlR /vvAprOl4w+ead393EHBigzmwkA+3ozmL4Fmq+MaQK0+qcfaHAWctzG7orqGijZfcVho KNlg== X-Gm-Message-State: APjAAAU74CZfk2U4tmiivsag8O40z77xVlfnwBalj0gjZXFxmgSmhyRo bsf+pdQYKtRfs3pwhrDUBBJwGM4ptpA= X-Received: by 2002:a17:902:442:: with SMTP id 60mr42399378ple.325.1558421737603; Mon, 20 May 2019 23:55:37 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::3506]) by smtp.gmail.com with ESMTPSA id l21sm28100673pff.40.2019.05.20.23.55.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 May 2019 23:55:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 20 May 2019 23:55:29 -0700 Message-Id: <20190521065529.41647-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190521065529.41647-1-raj.khem@gmail.com> References: <20190521065529.41647-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/2] 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 --- ...fine-PAGE_SIZE-if-its-not-already-de.patch | 37 +++++++++++++++++++ .../recipes-devtools/openocd/openocd_git.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.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-Define-PAGE_SIZE-if-its-not-already-de.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.patch new file mode 100644 index 0000000000..6fe5b27891 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.patch @@ -0,0 +1,37 @@ +From 531c96b4fd99ea046750591af36c5b3f92479fa6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2019 23:24:26 -0700 +Subject: [PATCH] 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 +Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/] +--- + src/flash/nor/esirisc_flash.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c +index 4e33b9429..90661b77b 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 +-- +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..9054e69b6c 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-Define-PAGE_SIZE-if-its-not-already-de.patch \ " SRCREV_FORMAT = "openocd"