File gnu/local.mk changed (mode: 100644) (index 83d2d72ab1..b59b122e86) |
... |
... |
dist_patch_DATA = \ |
1420 |
1420 |
%D%/packages/patches/sdl-pango-matrix_declarations.patch \ |
%D%/packages/patches/sdl-pango-matrix_declarations.patch \ |
1421 |
1421 |
%D%/packages/patches/sdl-pango-sans-serif.patch \ |
%D%/packages/patches/sdl-pango-sans-serif.patch \ |
1422 |
1422 |
%D%/packages/patches/sqlite-hurd.patch \ |
%D%/packages/patches/sqlite-hurd.patch \ |
|
1423 |
|
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \ |
1423 |
1424 |
%D%/packages/patches/patchutils-test-perms.patch \ |
%D%/packages/patches/patchutils-test-perms.patch \ |
1424 |
1425 |
%D%/packages/patches/patch-hurd-path-max.patch \ |
%D%/packages/patches/patch-hurd-path-max.patch \ |
1425 |
1426 |
%D%/packages/patches/perl-autosplit-default-time.patch \ |
%D%/packages/patches/perl-autosplit-default-time.patch \ |
File gnu/packages/admin.scm changed (mode: 100644) (index 40db55e73c..275432cb96) |
... |
... |
Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") |
2945 |
2945 |
(commit (string-append "v" version)))) |
(commit (string-append "v" version)))) |
2946 |
2946 |
(sha256 |
(sha256 |
2947 |
2947 |
(base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd")) |
(base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd")) |
|
2948 |
|
(patches |
|
2949 |
|
(search-patches "sunxi-tools-remove-sys-io.patch")) |
2948 |
2950 |
(modules '((guix build utils))) |
(modules '((guix build utils))) |
2949 |
2951 |
(snippet |
(snippet |
2950 |
2952 |
;; Remove binaries contained in the tarball which are only for the |
;; Remove binaries contained in the tarball which are only for the |
File gnu/packages/patches/sunxi-tools-remove-sys-io.patch added (mode: 100644) (index 0000000000..fc1e5ea28d) |
|
1 |
|
From 783cbd59fcf086a9aaf603271823fb4ca71f0c55 Mon Sep 17 00:00:00 2001 |
|
2 |
|
From: Danny Milosavljevic <dannym@scratchpost.org> |
|
3 |
|
Date: Thu, 8 Oct 2020 23:01:05 +0200 |
|
4 |
|
Subject: [PATCH] meminfo: Replace sys/io.h by direct register accesses. |
|
5 |
|
See: https://github.com/linux-sunxi/sunxi-tools/pull/144 |
|
6 |
|
|
|
7 |
|
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org> |
|
8 |
|
--- |
|
9 |
|
meminfo.c | 9 ++++----- |
|
10 |
|
1 file changed, 4 insertions(+), 5 deletions(-) |
|
11 |
|
|
|
12 |
|
diff --git a/meminfo.c b/meminfo.c |
|
13 |
|
index 0b0ff23..3b3a5df 100644 |
|
14 |
|
--- a/meminfo.c |
|
15 |
|
+++ b/meminfo.c |
|
16 |
|
@@ -22,7 +22,6 @@ |
|
17 |
|
#include <sys/mman.h> |
|
18 |
|
#include <stdint.h> |
|
19 |
|
#include <errno.h> |
|
20 |
|
-#include <sys/io.h> |
|
21 |
|
#include <stdbool.h> |
|
22 |
|
|
|
23 |
|
#include "common.h" |
|
24 |
|
@@ -74,24 +73,24 @@ static enum sunxi_soc_version soc_version; |
|
25 |
|
unsigned int |
|
26 |
|
sunxi_io_read(void *base, int offset) |
|
27 |
|
{ |
|
28 |
|
- return inl((unsigned long) (base + offset)); |
|
29 |
|
+ return *(volatile unsigned int*) (base + offset); |
|
30 |
|
} |
|
31 |
|
|
|
32 |
|
void |
|
33 |
|
sunxi_io_write(void *base, int offset, unsigned int value) |
|
34 |
|
{ |
|
35 |
|
- outl(value, (unsigned long) (base + offset)); |
|
36 |
|
+ *(volatile unsigned int*) (base + offset) = value; |
|
37 |
|
} |
|
38 |
|
|
|
39 |
|
void |
|
40 |
|
sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask) |
|
41 |
|
{ |
|
42 |
|
- unsigned int tmp = inl((unsigned long) (base + offset)); |
|
43 |
|
+ unsigned int tmp = sunxi_io_read(base, offset); |
|
44 |
|
|
|
45 |
|
tmp &= ~mask; |
|
46 |
|
tmp |= value & mask; |
|
47 |
|
|
|
48 |
|
- outl(tmp, (unsigned long) (base + offset)); |
|
49 |
|
+ sunxi_io_write(base, offset, tmp); |
|
50 |
|
} |
|
51 |
|
|
|
52 |
|
|