Nico Huber submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Nico Huber: Verified; Looks good to me, approved
Fix compilation if CONFIG_INTERNAL=no

Change-Id: Id9e07332003832465a0eccf1d89e73d15abb35c0
Signed-off-by: Jonathan Liu <net147@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/35808
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Tested-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M libflashrom.c
M physmap.c
2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/libflashrom.c b/libflashrom.c
index 1d8a9ae..0dec22e 100644
--- a/libflashrom.c
+++ b/libflashrom.c
@@ -170,6 +170,7 @@
*/
struct flashrom_board_info *flashrom_supported_boards(void)
{
+#if CONFIG_INTERNAL == 1
int boards_known_size = 0;
int i = 0;
const struct board_info *binfo = boards_known;
@@ -194,6 +195,9 @@
}

return supported_boards;
+#else
+ return NULL;
+#endif
}

/**
@@ -202,6 +206,7 @@
*/
struct flashrom_chipset_info *flashrom_supported_chipsets(void)
{
+#if CONFIG_INTERNAL == 1
int chipset_enables_size = 0;
int i = 0;
const struct penable *chipset = chipset_enables;
@@ -228,6 +233,9 @@
}

return supported_chipsets;
+#else
+ return NULL;
+#endif
}

/**
diff --git a/physmap.c b/physmap.c
index ad38ad3..72d5899 100644
--- a/physmap.c
+++ b/physmap.c
@@ -363,6 +363,7 @@
return physmap_common(descr, phys_addr, len, PHYSM_RO, PHYSM_NOCLEANUP, PHYSM_EXACT);
}

+#if CONFIG_INTERNAL == 1
/* MSR abstraction implementations for Linux, OpenBSD, FreeBSD/Dragonfly, OSX, libpayload
* and a non-working default implementation on the bottom. See also hwaccess.h for some (re)declarations. */
#if defined(__i386__) || defined(__x86_64__)
@@ -687,3 +688,4 @@
#else // x86
/* Does MSR exist on non-x86 architectures? */
#endif // arch switches for MSR code
+#endif // CONFIG_INTERNAL == 1

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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Id9e07332003832465a0eccf1d89e73d15abb35c0
Gerrit-Change-Number: 35808
Gerrit-PatchSet: 6
Gerrit-Owner: Jonathan Liu <net147@gmail.com>
Gerrit-Reviewer: Jonathan Liu <net147@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Angel Pons <th3fanbus@gmail.com>
Gerrit-MessageType: merged