Felix Singer submitted this change.

View Change


Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, but someone else must approve Paul Menzel: Looks good to me, but someone else must approve Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved
libpayload: Fix compiling bugs

hwaccess_physmap.c: make `void *sys_physmap(()` static

hwaccess_x86_io.c: Add missing include

Change-Id: I5062c5a62b90f7a189488f3f569dc357bd2cb85f
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/69831
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
---
M hwaccess_physmap.c
M hwaccess_x86_io.c
2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/hwaccess_physmap.c b/hwaccess_physmap.c
index 81adf18..f95b5f6 100644
--- a/hwaccess_physmap.c
+++ b/hwaccess_physmap.c
@@ -121,7 +121,7 @@

#define MEM_DEV ""

-void *sys_physmap(uintptr_t phys_addr, size_t len)
+static void *sys_physmap(uintptr_t phys_addr, size_t len)
{
return (void *)phys_to_virt(phys_addr);
}
diff --git a/hwaccess_x86_io.c b/hwaccess_x86_io.c
index c3ad313..a883ed4 100644
--- a/hwaccess_x86_io.c
+++ b/hwaccess_x86_io.c
@@ -134,6 +134,8 @@
#endif

#if defined(__LIBPAYLOAD__)
+#include <arch/io.h>
+
#define IO_PORT_PERMISSION USE_DUMMY
#define IO_PORT_FUNCTION USE_LIBC_TARGET_LAST
#endif

To view, visit change 69831. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I5062c5a62b90f7a189488f3f569dc357bd2cb85f
Gerrit-Change-Number: 69831
Gerrit-PatchSet: 3
Gerrit-Owner: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Felix Singer <felixsinger@posteo.net>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter@mailbox.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged