From 7f15de164c2b6fcb82fb9634d5d43a2368338ac3 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 6 Oct 2019 16:22:04 +1100 Subject: Fix compilation if CONFIG_INTERNAL=no Change-Id: Id9e07332003832465a0eccf1d89e73d15abb35c0 Signed-off-by: Jonathan Liu Reviewed-on: https://review.coreboot.org/c/flashrom/+/35808 Tested-by: build bot (Jenkins) Tested-by: Nico Huber Reviewed-by: Nico Huber --- libflashrom.c | 8 ++++++++ physmap.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/libflashrom.c b/libflashrom.c index 1d8a9ae7e..0dec22ee5 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -170,6 +170,7 @@ struct flashrom_flashchip_info *flashrom_supported_flash_chips(void) */ 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 @@ struct flashrom_board_info *flashrom_supported_boards(void) } return supported_boards; +#else + return NULL; +#endif } /** @@ -202,6 +206,7 @@ struct flashrom_board_info *flashrom_supported_boards(void) */ 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 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) } return supported_chipsets; +#else + return NULL; +#endif } /** diff --git a/physmap.c b/physmap.c index ad38ad358..72d589911 100644 --- a/physmap.c +++ b/physmap.c @@ -363,6 +363,7 @@ void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len) 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 @@ void cleanup_cpu_msr(void) #else // x86 /* Does MSR exist on non-x86 architectures? */ #endif // arch switches for MSR code +#endif // CONFIG_INTERNAL == 1 -- cgit v1.2.3