October 2021 - flashrom-gerrit

Change in flashrom[master]: endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem
by Felix Singer (Code Review) 12 Oct '21

12 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58273 ) Change subject: endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem ...................................................................... Patch Set 2: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58273/comment/39cb43e6_6bffdc02 PS2, Line 7: endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem > I would rewrite that. How about this? […] I just noticed that the `ENDIAN` variable is set at line 268. So it's not a built-in function. I would replace `built-in` with `existing`. -- To view, visit https://review.coreboot.org/c/flashrom/+/58273 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I37093528ae55e712cc30a0267a8ceac332750e7d Gerrit-Change-Number: 58273 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 12 Oct 2021 19:22:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem
by Felix Singer (Code Review) 12 Oct '21

12 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58273 ) Change subject: endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58273/comment/43255df7_1685a6b5 PS2, Line 7: endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem I would rewrite that. How about this? Let the buildsystem detect the endianness Both, the Meson and the Makefile buildsytem, know about the endianness of the system. Thus, use their built-in functions to decide that and get rid of unnecessary C code. -- To view, visit https://review.coreboot.org/c/flashrom/+/58273 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I37093528ae55e712cc30a0267a8ceac332750e7d Gerrit-Change-Number: 58273 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 12 Oct 2021 19:12:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: reorder ARCH and ENDIAN test
by Felix Singer (Code Review) 12 Oct '21

12 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58248 ) Change subject: Makefile: reorder ARCH and ENDIAN test ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58248/comment/ac6c9294_d2455df1 PS1, Line 7: reorder ARCH and ENDIAN test This sounds like you are changing the execution order of the tests. How about this? Move system-specific tests at one place -- To view, visit https://review.coreboot.org/c/flashrom/+/58248 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia1b3f0257aaeebb355700b65c51a2ba70b80d5ae Gerrit-Change-Number: 58248 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 12 Oct 2021 18:49:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: use STRIP_ARGS = -s on all platforms
by Angel Pons (Code Review) 12 Oct '21

12 Oct '21

Attention is currently required from: Felix Singer, Nico Huber, Thomas Heijligen. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58246 ) Change subject: Makefile: use STRIP_ARGS = -s on all platforms ...................................................................... Patch Set 1: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58246/comment/4da0ff4a_23b90fb7 PS1, Line 9: Strip-all should be the default behavior of strip, but not all systems : support this. Use -s (--strip-all) on all systems to not depend on default behavior. > This is confusing. […] I guess it means that the default behavior is inconsistent? -- To view, visit https://review.coreboot.org/c/flashrom/+/58246 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2c80d553fb54d94bc65f07e700c90dd1bae4854e Gerrit-Change-Number: 58246 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Tue, 12 Oct 2021 18:44:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: summarize systems with the same CPPFLAGS and LDFLAGS
by Felix Singer (Code Review) 12 Oct '21

12 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58247 ) Change subject: Makefile: summarize systems with the same CPPFLAGS and LDFLAGS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/58247 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I067430e52eb41bf0af4f08246bbe59117bc09bdb Gerrit-Change-Number: 58247 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 12 Oct 2021 18:42:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: use STRIP_ARGS = -s on all platforms
by Felix Singer (Code Review) 12 Oct '21

12 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58246 ) Change subject: Makefile: use STRIP_ARGS = -s on all platforms ...................................................................... Patch Set 1: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58246/comment/6d810a1c_ac2abdbe PS1, Line 9: Strip-all should be the default behavior of strip, but not all systems : support this. Use -s (--strip-all) on all systems to not depend on default behavior. This is confusing. Please explain why you are making it the default even if it's not supported on all systems. -- To view, visit https://review.coreboot.org/c/flashrom/+/58246 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2c80d553fb54d94bc65f07e700c90dd1bae4854e Gerrit-Change-Number: 58246 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 12 Oct 2021 18:41:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: platform.h: remove architicture dependend macros
by Thomas Heijligen (Code Review) 12 Oct '21

12 Oct '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58280 ) Change subject: platform.h: remove architicture dependend macros ...................................................................... platform.h: remove architicture dependend macros Change-Id: Ia0f022d12390722816066d292e1878824adc613c Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M dediprog.c M developerbox_spi.c M dmi.c M flash.h M hwaccess.c M hwaccess.h M internal.c M pickit2_spi.c D platform.h M serial.c M serprog.c 11 files changed, 20 insertions(+), 113 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/80/58280/1 diff --git a/dediprog.c b/dediprog.c index 85b78c8..939673c 100644 --- a/dediprog.c +++ b/dediprog.c @@ -15,8 +15,6 @@ * GNU General Public License for more details. */ -#include "platform.h" - #include <sys/types.h> #include <stdlib.h> #include <stdio.h> diff --git a/developerbox_spi.c b/developerbox_spi.c index 5573d6f..8c4a8df 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -31,8 +31,6 @@ * should be turned on). */ -#include "platform.h" - #include <stdlib.h> #include <libusb.h> #include "programmer.h" diff --git a/dmi.c b/dmi.c index e449cd9..5d709f1 100644 --- a/dmi.c +++ b/dmi.c @@ -30,7 +30,6 @@ #include <stdio.h> #include <stdlib.h> -#include "platform.h" #include "flash.h" #include "programmer.h" diff --git a/flash.h b/flash.h index 3baa076..391a2d4 100644 --- a/flash.h +++ b/flash.h @@ -20,8 +20,6 @@ #ifndef __FLASH_H__ #define __FLASH_H__ 1 -#include "platform.h" - #include <inttypes.h> #include <stdio.h> #include <stdint.h> diff --git a/hwaccess.c b/hwaccess.c index 13bacd7..9bfd8ea 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#include "platform.h" - #include <stdint.h> #include <string.h> #include <stdlib.h> @@ -34,7 +32,7 @@ #include <sys/io.h> #endif -#if IS_X86 && USE_DEV_IO +#if (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) && USE_DEV_IO int io_fd; #endif @@ -50,9 +48,12 @@ * * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Docume… */ -#if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h +// cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h +#if defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__POWERPC__) || \ + defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ + defined(_ARCH_PPC64) || defined(__ppc) asm("eieio" : : : "memory"); -#elif IS_SPARC +#elif (__sparc__) || defined (__sparc) #if defined(__sparc_v9__) || defined(__sparcv9) /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like * RMO. The modes can be switched at runtime thus to make sure we maintain the right order of access we @@ -69,7 +70,7 @@ #endif } -#if IS_X86 && !(defined(__DJGPP__) || defined(__LIBPAYLOAD__)) +#if (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) && !(defined(__DJGPP__) || defined(__LIBPAYLOAD__)) static int release_io_perms(void *p) { #if defined (__sun) @@ -83,13 +84,11 @@ #endif return 0; } -#endif /* Get I/O permissions with automatic permission release on shutdown. */ int rget_io_perms(void) { -#if IS_X86 && !(defined(__DJGPP__) || defined(__LIBPAYLOAD__)) -#if defined (__sun) + #if defined (__sun) if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { #elif USE_DEV_IO if ((io_fd = open("/dev/io", O_RDWR)) < 0) { @@ -111,13 +110,19 @@ } else { register_shutdown(release_io_perms, NULL); } -#else - /* DJGPP and libpayload environments have full PCI port I/O permissions by default. */ - /* PCI port I/O support is unimplemented on PPC/MIPS and unavailable on ARM. */ -#endif return 0; } +#else + +/* DJGPP and libpayload environments have full PCI port I/O permissions by default. */ +/* PCI port I/O support is unimplemented on PPC/MIPS and unavailable on ARM. */ +int rget_io_perms(void) +{ + return 0; +} +#endif + void mmio_writeb(uint8_t val, void *addr) { *(volatile uint8_t *) addr = val; diff --git a/hwaccess.h b/hwaccess.h index 5097ac9..56c2d1e 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -20,8 +20,6 @@ #ifndef __HWACCESS_H__ #define __HWACCESS_H__ 1 -#include "platform.h" - #if NEED_PCI == 1 /* * libpci headers use the variable name "index" which triggers shadowing @@ -109,8 +107,7 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_RAW_ACCESS == 1 -#if IS_X86 +#if NEED_RAW_ACCESS == 1 && (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) #include "hwaccess_x86_io.h" @@ -140,31 +137,7 @@ #define wrmsr libpayload_wrmsr #endif -#elif IS_PPC -/* PCI port I/O is not yet implemented on PowerPC. */ - -#elif IS_MIPS - -/* PCI port I/O is not yet implemented on MIPS. */ - -#elif IS_SPARC - -/* PCI port I/O is not yet implemented on SPARC. */ - -#elif IS_ARM - -/* Non memory mapped I/O is not supported on ARM. */ - -#elif IS_ARC - -/* Non memory mapped I/O is not supported on ARC. */ - -#else - -#error Unknown architecture, please check if it supports PCI port IO. - -#endif /* IS_* */ -#endif /* NEED_RAW_ACCESS == 1 */ +#endif #endif /* !__HWACCESS_H__ */ diff --git a/internal.c b/internal.c index b9d17b4..43bed9e 100644 --- a/internal.c +++ b/internal.c @@ -18,7 +18,6 @@ #include <string.h> #include <stdlib.h> #include "flash.h" -#include "platform.h" #include "programmer.h" #include "hwaccess.h" diff --git a/pickit2_spi.c b/pickit2_spi.c index 17da1d9..c090efe 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -32,8 +32,6 @@ * PICkit2 code: https://github.com/steve-m/avrdude/blob/master/pickit2.c */ -#include "platform.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/platform.h b/platform.h deleted file mode 100644 index e0f8a73..0000000 --- a/platform.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the flashrom project. - * - * Copyright (C) 2011 Carl-Daniel Hailfinger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* - * Header file to determine target OS and CPU architecture. - */ - -#ifndef __PLATFORM_H__ -#define __PLATFORM_H__ 1 - -// Likewise for target architectures -#if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) - #define IS_X86 1 -#elif defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips) - #define IS_MIPS 1 -#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__POWERPC__) || \ - defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ - defined(_ARCH_PPC64) || defined(__ppc) - #define IS_PPC 1 -#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || defined(_M_ARM) || defined(__arm) || \ - defined(__aarch64__) - #define IS_ARM 1 -#elif defined (__sparc__) || defined (__sparc) - #define IS_SPARC 1 -#elif defined (__alpha__) - #define IS_ALPHA 1 -#elif defined (__hppa__) || defined (__hppa) - #define IS_HPPA 1 -#elif defined (__m68k__) - #define IS_M68K 1 -#elif defined (__riscv) - #define IS_RISCV 1 -#elif defined (__sh__) - #define IS_SH 1 -#elif defined(__s390__) || defined(__s390x__) || defined(__zarch__) - #define IS_S390 1 -#elif defined(__arc__) - #define IS_ARC 1 -#endif - -#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390 || IS_ARC) -#error Unknown architecture -#endif - -#endif /* !__PLATFORM_H__ */ diff --git a/serial.c b/serial.c index 76d34a2..72f9ef6 100644 --- a/serial.c +++ b/serial.c @@ -15,8 +15,6 @@ * GNU General Public License for more details. */ -#include "platform.h" - #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/serprog.c b/serprog.c index b207fd2..8c73e70 100644 --- a/serprog.c +++ b/serprog.c @@ -15,8 +15,6 @@ * GNU General Public License for more details. */ -#include "platform.h" - #include <stdio.h> #if ! IS_WINDOWS /* stuff (presumably) needed for sockets only */ #include <stdlib.h> -- To view, visit https://review.coreboot.org/c/flashrom/+/58280 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia0f022d12390722816066d292e1878824adc613c Gerrit-Change-Number: 58280 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: USE_IOPL, USE_DEV_IO, USE_IOPERM: move evaluation into the build system
by Thomas Heijligen (Code Review) 12 Oct '21

12 Oct '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58278 ) Change subject: USE_IOPL, USE_DEV_IO, USE_IOPERM: move evaluation into the build system ...................................................................... USE_IOPL, USE_DEV_IO, USE_IOPERM: move evaluation into the build system Change-Id: Ic41ea025e35feb93f07ce7a94c0d15e6e84f38b9 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M hwaccess.c M meson.build 3 files changed, 37 insertions(+), 20 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/78/58278/1 diff --git a/Makefile b/Makefile index 984c845..f48fdfa 100644 --- a/Makefile +++ b/Makefile @@ -278,6 +278,25 @@ $(call mark_unsupported,CONFIG_NICINTEL_EEPROM CONFIG_OGP_SPI CONFIG_IT8212) endif +ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Linux Darwin NetBSD OpenBSD)) +FEATURE_CFLAGS += -D'USE_IOPL=1' +else +FEATURE_CFLAGS += -D'USE_IOPL=0' +endif + +ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD FreeBSD-glibc DragonFlyBSD)) +FEATURE_CFLAGS += -D'USE_DEV_IO=1' +else +FEATURE_CFLAGS += -D'USE_DEV_IO=0' +endif + +ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Hurd)) +FEATURE_CFLAGS += -D'USE_IOPERM=1' +else +FEATURE_CFLAGS += -D'USE_IOPERM=0' +endif + + ############################################################################### # Flash chip drivers and bus support infrastructure. diff --git a/hwaccess.c b/hwaccess.c index aa35f4b..13bacd7 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -30,26 +30,6 @@ #include "programmer.h" #include "hwaccess.h" -#if !(defined(__gnu_linux__) || defined(__linux__) || defined(__APPLE__) && defined(__MACH__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun) || defined(__gnu_hurd__)) -#error "Unknown operating system" -#endif - -#if defined(__gnu_linux__) || defined(__linux__) || defined(__APPLE__) && defined(__MACH__) || defined(__NetBSD__) || defined(__OpenBSD__) -#define USE_IOPL 1 -#else -#define USE_IOPL 0 -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#define USE_DEV_IO 1 -#else -#define USE_DEV_IO 0 -#endif -#if defined(__gnu_hurd__) -#define USE_IOPERM 1 -#else -#define USE_IOPERM 0 -#endif - #if USE_IOPERM #include <sys/io.h> #endif diff --git a/meson.build b/meson.build index 5ae16da..72a1a0a 100644 --- a/meson.build +++ b/meson.build @@ -42,6 +42,24 @@ add_project_arguments('-DIS_WINDOWS=0', language : 'c') endif +if host_machine.system() in ['linux', 'darwin', 'netbsd', 'openbsd'] + add_project_arguments('-DUSE_IOPL=1', language : 'c') +else + add_project_arguments('-DUSE_IOPL=0', language : 'c') +endif + +if host_machine.system() in ['freebsd', 'dragonfly'] + add_project_arguments('-DUSE_DEV_IO=1', language : 'c') +else + add_project_arguments('-DUSE_DEV_IO=0', language : 'c') +endif + +if host_machine.system() in ['gnu'] + add_project_arguments('-DUSE_IOPERM=1', language : 'c') +else + add_project_arguments('-DUSE_IOPERM=0', language : 'c') +endif + # get defaults from configure config_atahpt = get_option('config_atahpt') -- To view, visit https://review.coreboot.org/c/flashrom/+/58278 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic41ea025e35feb93f07ce7a94c0d15e6e84f38b9 Gerrit-Change-Number: 58278 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: IS_WINDOWS: move logic to buildsystem
by Thomas Heijligen (Code Review) 12 Oct '21

12 Oct '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58277 ) Change subject: IS_WINDOWS: move logic to buildsystem ...................................................................... IS_WINDOWS: move logic to buildsystem Change-Id: I334708f2dec08ec9ca6ad4161fbd7fe22ac023a6 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M meson.build M platform.h 3 files changed, 13 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/77/58277/1 diff --git a/Makefile b/Makefile index 7c52e9b..984c845 100644 --- a/Makefile +++ b/Makefile @@ -192,6 +192,12 @@ $(call mark_unsupported,$(DEPENDS_ON_LIBUSB1) $(DEPENDS_ON_LIBFTDI) $(DEPENDS_ON_LIBJAYLINK)) endif +ifeq ($(TARGET_OS), $(filter $(TARGET_OS), MinGW Cygwin)) +FEATURE_CFLAGS += -D'IS_WINDOWS=1' +else +FEATURE_CFLAGS += -D'IS_WINDOWS=0' +endif + # FIXME: Should we check for Cygwin/MSVC as well? ifeq ($(TARGET_OS), MinGW) EXEC_SUFFIX := .exe diff --git a/meson.build b/meson.build index 02dedfc..5ae16da 100644 --- a/meson.build +++ b/meson.build @@ -36,6 +36,13 @@ add_project_arguments('-D__FLASHROM_BIG_ENDIAN__=1', language : 'c') endif +if host_machine.system() in ['cygwin', 'windows'] + add_project_arguments('-DIS_WINDOWS=1', language : 'c') +else + add_project_arguments('-DIS_WINDOWS=0', language : 'c') +endif + + # get defaults from configure config_atahpt = get_option('config_atahpt') config_atapromise = get_option('config_atapromise') diff --git a/platform.h b/platform.h index 34a56ab..e0f8a73 100644 --- a/platform.h +++ b/platform.h @@ -20,13 +20,6 @@ #ifndef __PLATFORM_H__ #define __PLATFORM_H__ 1 -// Helper defines for operating systems -#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__) -#define IS_WINDOWS 1 -#else -#define IS_WINDOWS 0 -#endif - // Likewise for target architectures #if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) #define IS_X86 1 -- To view, visit https://review.coreboot.org/c/flashrom/+/58277 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I334708f2dec08ec9ca6ad4161fbd7fe22ac023a6 Gerrit-Change-Number: 58277 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: IS_LINUX IS_MACOS: remove
by Thomas Heijligen (Code Review) 12 Oct '21

12 Oct '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58276 ) Change subject: IS_LINUX IS_MACOS: remove ...................................................................... IS_LINUX IS_MACOS: remove Change-Id: I23ec8fdcff8202d10ddf5a7520432e5b26b01cd4 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M hwaccess.c M platform.h 2 files changed, 2 insertions(+), 12 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/76/58276/1 diff --git a/hwaccess.c b/hwaccess.c index 3a9ca57..aa35f4b 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -30,11 +30,11 @@ #include "programmer.h" #include "hwaccess.h" -#if !(IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun) || defined(__gnu_hurd__)) +#if !(defined(__gnu_linux__) || defined(__linux__) || defined(__APPLE__) && defined(__MACH__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun) || defined(__gnu_hurd__)) #error "Unknown operating system" #endif -#if IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__gnu_linux__) || defined(__linux__) || defined(__APPLE__) && defined(__MACH__) || defined(__NetBSD__) || defined(__OpenBSD__) #define USE_IOPL 1 #else #define USE_IOPL 0 diff --git a/platform.h b/platform.h index 9bbde54..34a56ab 100644 --- a/platform.h +++ b/platform.h @@ -21,16 +21,6 @@ #define __PLATFORM_H__ 1 // Helper defines for operating systems -#if defined(__gnu_linux__) || defined(__linux__) -#define IS_LINUX 1 -#else -#define IS_LINUX 0 -#endif -#if defined(__APPLE__) && defined(__MACH__) /* yes, both. */ -#define IS_MACOSX 1 -#else -#define IS_MACOSX 0 -#endif #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__) #define IS_WINDOWS 1 #else -- To view, visit https://review.coreboot.org/c/flashrom/+/58276 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I23ec8fdcff8202d10ddf5a7520432e5b26b01cd4 Gerrit-Change-Number: 58276 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2021