diff options
Diffstat (limited to 'app-admin/coreboot-utils/files')
| -rw-r--r-- | app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch | 35 | ||||
| -rw-r--r-- | app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch | 72 |
2 files changed, 107 insertions, 0 deletions
diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch new file mode 100644 index 000000000000..e42e6b2921da --- /dev/null +++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch @@ -0,0 +1,35 @@ +- ifdtool: respect LDFLAGS +- nvramtool: respect CFLAGS +- pmh7tool: respect CC, CFLAGS + +--- a/util/ifdtool/Makefile.inc 2022-10-16 20:14:31.000000000 +0000 ++++ b/util/ifdtool/Makefile.inc 2022-12-25 11:38:47.572534621 +0000 +@@ -16,4 +16,4 @@ + + $(objutil)/ifdtool/ifdtool: $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj)) + printf " IFDTOOL\n" +- $(HOSTCC) $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj)) -o $@ ++ $(HOSTCC) $(LDFLAGS) $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj)) -o $@ +--- a/util/nvramtool/Makefile 2022-10-16 20:14:31.000000000 +0000 ++++ b/util/nvramtool/Makefile 2022-12-25 11:39:15.924345609 +0000 +@@ -11,7 +11,7 @@ + CC ?= gcc + INSTALL = /usr/bin/env install + PREFIX = /usr/local +-CFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes -I. -DCMOS_HAL=1 ++CFLAGS += -O2 -g -Wall -Wextra -Wmissing-prototypes -I. -DCMOS_HAL=1 + #CFLAGS = -Os -Wall + + CLI_OBJS = cli/nvramtool.o cli/opts.o +--- a/util/pmh7tool/Makefile 2022-10-16 20:14:31.000000000 +0000 ++++ b/util/pmh7tool/Makefile 2022-12-25 11:39:38.491195945 +0000 +@@ -1,7 +1,7 @@ + ## SPDX-License-Identifier: GPL-2.0-only + +-CC = gcc +-CFLAGS = -O2 -Wall -Wextra -Werror ++CC ?= gcc ++CFLAGS ?= -O2 -Wall -Wextra -Werror + PROGRAM = pmh7tool + INSTALL = /usr/bin/env install + PREFIX = /usr/local diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch new file mode 100644 index 000000000000..b94094dbbbbb --- /dev/null +++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch @@ -0,0 +1,72 @@ +Author: Fabian Groffen <grobian@gentoo.org> +Date: Wed Dec 14 17:28:13 2022 +0100 + + musl: clumpsy buildfixes + + https://review.coreboot.org/c/coreboot/+/73358 + +diff --git a/src/arch/x86/include/arch/mmio.h b/src/arch/x86/include/arch/mmio.h +index c2aa0fb910..b2a37a03dd 100644 +--- a/src/arch/x86/include/arch/mmio.h ++++ b/src/arch/x86/include/arch/mmio.h +@@ -5,6 +5,10 @@ + + #include <stdint.h> + ++#ifndef __always_inline ++#define __always_inline inline ++#endif ++ + static __always_inline uint8_t read8(const volatile void *addr) + { + return *((volatile uint8_t *)(addr)); +diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h +index 5b40721262..2d0da33d72 100644 +--- a/util/inteltool/inteltool.h ++++ b/util/inteltool/inteltool.h +@@ -12,6 +12,7 @@ + #if defined(__GLIBC__) + #include <sys/io.h> + #endif ++#include <sys/io.h> + #if (defined(__MACH__) && defined(__APPLE__)) + /* DirectHW is available here: https://www.coreboot.org/DirectHW */ + #define __DARWIN__ +diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c +index ed18c13e62..fa2c6ce35d 100644 +--- a/util/superiotool/superiotool.c ++++ b/util/superiotool/superiotool.c +@@ -324,8 +324,8 @@ + if ((io_fd = open("/dev/io", O_RDWR)) < 0) { + perror("/dev/io"); + #else +- if (iopl(3) < 0) { +- perror("iopl"); ++ if (ioperm(0, 6000, 1) < 0) { ++ perror("ioperm"); + #endif + printf("Superiotool must be run as root.\n"); + exit(1); +diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h +index a621ae5274..d5f44fece4 100644 +--- a/util/superiotool/superiotool.h ++++ b/util/superiotool/superiotool.h +@@ -24,6 +24,10 @@ + # endif + #endif + ++#include <sys/types.h> ++#include <stdint.h> ++#include <sys/io.h> ++ + #if defined(__FreeBSD__) + #include <sys/types.h> + #include <machine/cpufunc.h> +@@ -89,6 +93,7 @@ static __inline__ uint32_t inl(uint16_t port) + __asm__ __volatile__ ("inl %1,%0":"=a" (value):"Nd" (port)); + return value; + } ++ + #endif + + #define USAGE "Usage: superiotool [-d] [-e] [-a] [-l] [-V] [-v] [-h]\n\n\ |