From patchwork Sun Mar 3 23:23:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1050951 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cDTofl6Q"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44CJrt1LKkz9sBr for ; Mon, 4 Mar 2019 10:14:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC07885625; Sun, 3 Mar 2019 23:14:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p9oTA2hT3K3f; Sun, 3 Mar 2019 23:14:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E423D855B1; Sun, 3 Mar 2019 23:14:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C60F51BF2F1 for ; Sun, 3 Mar 2019 23:14:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BF2B08601B for ; Sun, 3 Mar 2019 23:14:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tCM3teCchQzp for ; Sun, 3 Mar 2019 23:14:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5894B81F2C for ; Sun, 3 Mar 2019 23:14:26 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id p1so2157656lfk.9 for ; Sun, 03 Mar 2019 15:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6/6kcW3+LKEkMs6ilqrAWTWthU3kD+/aYdOICZJQ1kA=; b=cDTofl6QNFiSScpU92rWeGhsqchSi4zzYo5/SkE6Om2HdAmPbauxuUubNWMH/c9kMC NLo9X1eK48gt9d41cXjmY0vzfu6ptPKOJfgvubvxy6sOKSmOrs14Gysx12Zx6+ABAOMu yixrb4WHzJLB7eS8HEuMKMMk72xMaofZQUFc2bNaZt9YdlS6mX3NIvyH5B17mPxtUTPZ 5NsRrytQsR26uhMM6E5u/vabouVywomH5Of3FbfixpLwXQli4e2Qky97yNahyb8M9bd1 cQHz+RKkPpSnzOIlOMjWfPZ4vKWw/5D+GZ4kvur1FJFQ79+24imRhBL1yd14DJHFqLUe Y48A== 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; bh=6/6kcW3+LKEkMs6ilqrAWTWthU3kD+/aYdOICZJQ1kA=; b=aRtzqqzAG1IqKkNbBa0p2gp4/293XigR8D5mQqjE6w1IeQX04TwQBg3VDJffTJUaPH fYkB2eWp1qwZE0NscDryQa0w8kuQcolLEuyC0NLdKsdJHp26+hROaF1h/GsgoiHCrUxI N5Z39pb7b/898uvQLoBdwbBsYe9TTZZVo0XpKf06FwJgejBm1DvX245or8rIKzXNbuzI EoVQuRJ3MOSLteFn5LLGxtkVSPjtkv7UBJRQ8Ug3eFdIkqMs7Gh8vM9+7I0U3wmHY2zY mvarca9oiFlEKBBDM7MvdQCX2Szfg0gZc3Ss01gsKCeBBJ4UapXJQ+r180Yd1UX5bK4i b9QQ== X-Gm-Message-State: APjAAAWVJwz6UnMS+jpNlNKctNeoaidriR2vVAMIzGfSzBvI2LyJBjA4 dFaqBUeU4nO3Juyac9IHoTxWATzrEF4= X-Google-Smtp-Source: APXvYqwEylrMm4Xt/2EV8AmFwEsCmIqsMm0dFV96ri1C5X7Eh4VqkpJ/8BSXjyotYmsMxF13XQCQbA== X-Received: by 2002:ac2:5230:: with SMTP id i16mr8694578lfl.119.1551654864025; Sun, 03 Mar 2019 15:14:24 -0800 (PST) Received: from vkochan-ThinkPad-T470p.lan ([93.75.250.209]) by smtp.gmail.com with ESMTPSA id v7sm1194506ljk.7.2019.03.03.15.14.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Mar 2019 15:14:23 -0800 (PST) From: Vadim Kochan To: buildroot@buildroot.org Date: Mon, 4 Mar 2019 01:23:40 +0200 Message-Id: <20190303232340.23904-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH] package/sunxi-tools: Fix build meminfo with musl X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vadim Kochan MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" musl does not provide inx/outx API for ARM arch, so use io memory access via pointers which is actually done this way in glibc/ulibc. Fixes: http://autobuild.buildroot.net/results/bf10cbe40c0f672c34db72e4eea4c168d5932bd4/ Signed-off-by: Vadim Kochan --- PATCH v1: 1) Tested on board with A13 SoC RFT v2: 1) Fixed mistaken copy-paste-n-replace of outl by sunxi_io_write in sunxi_io_mask(...) ...-meminfo-Access-to-io-memory-via-pointers.patch | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch diff --git a/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch b/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch new file mode 100644 index 0000000000..997c413f23 --- /dev/null +++ b/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch @@ -0,0 +1,59 @@ +From 5c0a443ba336f10a8db6a99c769aa84ad37ed4d2 Mon Sep 17 00:00:00 2001 +From: Vadim Kochan +Date: Wed, 20 Feb 2019 02:48:43 +0200 +Subject: [PATCH] meminfo: Access to io memory via pointers + +The main reason for this is to be able compile with musl library, +because there is no support of inx/outx functions for ARM platform. + +Signed-off-by: Vadim Kochan +--- + meminfo.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/meminfo.c b/meminfo.c +index 0b0ff23..7d9f10f 100644 +--- a/meminfo.c ++++ b/meminfo.c +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include + + #include "common.h" +@@ -74,24 +73,26 @@ static enum sunxi_soc_version soc_version; + unsigned int + sunxi_io_read(void *base, int offset) + { +- return inl((unsigned long) (base + offset)); ++ unsigned long port = (unsigned long) (base + offset); ++ return *((volatile unsigned long *) port); + } + + void + sunxi_io_write(void *base, int offset, unsigned int value) + { +- outl(value, (unsigned long) (base + offset)); ++ unsigned long port = (unsigned long) (base + offset); ++ *((volatile unsigned long *) port) = value; + } + + void + sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask) + { +- unsigned int tmp = inl((unsigned long) (base + offset)); ++ unsigned int tmp = sunxi_io_read(base, offset); + + tmp &= ~mask; + tmp |= value & mask; + +- outl(tmp, (unsigned long) (base + offset)); ++ sunxi_io_write(base, offset, tmp); + } + + +-- +2.14.1 +