aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vadim Kochan <vadim4j@gmail.com>2019-03-04 01:23:40 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-03-25 13:22:15 +0100
commit119abfcdddd8be716d0736d0ed39993fc0405007 (patch)
treef0afaed26d96ded4ad6f3101748aa2fb73af42c0
parentebe2c9accde81e168ecab0e2935ff9baf4e2b916 (diff)
downloadbuildroot-119abfcdddd8be716d0736d0ed39993fc0405007.tar.gz
buildroot-119abfcdddd8be716d0736d0ed39993fc0405007.tar.bz2
package/sunxi-tools: fix build meminfo with musl
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 <vadim4j@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit d12d3969d1d7501a1ebd8e642aa0f0a1098715de) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch59
1 files changed, 59 insertions, 0 deletions
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 <vadim4j@gmail.com>
+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 <vadim4j@gmail.com>
+---
+ 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 <sys/mman.h>
+ #include <stdint.h>
+ #include <errno.h>
+-#include <sys/io.h>
+ #include <stdbool.h>
+
+ #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
+