October 2021 - flashrom-gerrit

Change in flashrom[master]: buildsystem: evaluate the USE_IOPL, USE_DEV_IO, USE_IOPERM macros
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58278 ) Change subject: buildsystem: evaluate the USE_IOPL, USE_DEV_IO, USE_IOPERM macros ...................................................................... buildsystem: evaluate the USE_IOPL, USE_DEV_IO, USE_IOPERM macros Determine which macro has to be set for the target system. Do this in the buildsystem instead of using preprocessor macros. Change-Id: Ic41ea025e35feb93f07ce7a94c0d15e6e84f38b9 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58278 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M Makefile M hwaccess.c M meson.build 3 files changed, 37 insertions(+), 20 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 31d4025..18651bc 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 a971a6a..86657ce 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') config_atapromise = get_option('config_atapromise') 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 8 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: buildsystem: handle the IS_WINDOWS macro
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58277 ) Change subject: buildsystem: handle the IS_WINDOWS macro ...................................................................... buildsystem: handle the IS_WINDOWS macro On Windows target systems set the IS_WINDOWS=1 macro by the buildsystem. Change-Id: I334708f2dec08ec9ca6ad4161fbd7fe22ac023a6 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58277 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M meson.build M platform.h 3 files changed, 12 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 6de8f55..31d4025 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..a971a6a 100644 --- a/meson.build +++ b/meson.build @@ -36,6 +36,12 @@ 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 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 7 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: platform.h: remove IS_LINUX and IS_MACOSX macros
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58276 ) Change subject: platform.h: remove IS_LINUX and IS_MACOSX macros ...................................................................... platform.h: remove IS_LINUX and IS_MACOSX macros Replace the remaining uses by the plain macros. Windows, Linux and MacOS are the only systems with explicit macros. Only the Windows macro is used in several places. The others can easily be handled like all other systems. Change-Id: I23ec8fdcff8202d10ddf5a7520432e5b26b01cd4 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58276 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M hwaccess.c M platform.h 2 files changed, 2 insertions(+), 12 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved 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 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 7 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: buildsystem: Determine the endianness only in the buildsystem
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58273 ) Change subject: buildsystem: Determine the endianness only in the buildsystem ...................................................................... buildsystem: Determine the endianness only in the buildsystem Let the buildsystem (make / meson) handle the endianness determination and set the __FLASHROM_LITTLE_ENDIAN__ or __FLASHROM_BIG_ENDIAN__ macro as cflag. Change-Id: I37093528ae55e712cc30a0267a8ceac332750e7d Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58273 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M Makefile M meson.build M platform.h 3 files changed, 14 insertions(+), 89 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Felix Singer: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index cea5c69..6de8f55 100644 --- a/Makefile +++ b/Makefile @@ -248,6 +248,13 @@ $(call mark_unsupported,CONFIG_INTERNAL) endif +ifeq ($(ENDIAN), little) +FEATURE_CFLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' +endif +ifeq ($(ENDIAN), big) +FEATURE_CFLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' +endif + # PCI port I/O support is unimplemented on PPC/MIPS/SPARC and unavailable on ARM. # Right now this means the drivers below only work on x86. ifneq ($(ARCH), x86) diff --git a/meson.build b/meson.build index 1a36df8..02dedfc 100644 --- a/meson.build +++ b/meson.build @@ -29,6 +29,13 @@ add_project_arguments('-D_BSD_SOURCE', language : 'c') # required for glibc < v2.19 add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', language : 'c') +if host_machine.endian() == 'little' + add_project_arguments('-D__FLASHROM_LITTLE_ENDIAN__=1', language : 'c') +endif +if host_machine.endian() == 'big' + add_project_arguments('-D__FLASHROM_BIG_ENDIAN__=1', 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 cd8e54b..9bbde54 100644 --- a/platform.h +++ b/platform.h @@ -71,93 +71,4 @@ #error Unknown architecture #endif -/* The next big hunk tries to guess endianness from various preprocessor macros */ -/* First some error checking in case some weird header has defined both. - * NB: OpenBSD always defines _BIG_ENDIAN and _LITTLE_ENDIAN. */ -#if defined (__LITTLE_ENDIAN__) && defined (__BIG_ENDIAN__) -#error Conflicting endianness #define -#endif - -#if IS_X86 - -/* All x86 is little-endian. */ -#define __FLASHROM_LITTLE_ENDIAN__ 1 - -#elif IS_MIPS - -/* MIPS can be either endian. */ -#if defined (__MIPSEL) || defined (__MIPSEL__) || defined (_MIPSEL) || defined (MIPSEL) -#define __FLASHROM_LITTLE_ENDIAN__ 1 -#elif defined (__MIPSEB) || defined (__MIPSEB__) || defined (_MIPSEB) || defined (MIPSEB) -#define __FLASHROM_BIG_ENDIAN__ 1 -#endif - -#elif IS_PPC - -/* PowerPC can be either endian. */ -#if defined (_BIG_ENDIAN) || defined (__BIG_ENDIAN__) -#define __FLASHROM_BIG_ENDIAN__ 1 -#elif defined (_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) -#define __FLASHROM_LITTLE_ENDIAN__ 1 -#endif - -#elif IS_ARM - -/* ARM can be either endian. */ -#if defined (__ARMEB__) || defined (__BIG_ENDIAN__) -#define __FLASHROM_BIG_ENDIAN__ 1 -#elif defined (__ARMEL__) || defined (__LITTLE_ENDIAN__) -#define __FLASHROM_LITTLE_ENDIAN__ 1 -#endif - -#elif IS_SPARC -/* SPARC is big endian in general (but allows to access data in little endian too). */ -#define __FLASHROM_BIG_ENDIAN__ 1 - -#elif IS_ARC -#if defined(__BIG_ENDIAN__) -#define __FLASHROM_BIG_ENDIAN__ 1 -#else -#define __FLASHROM_LITTLE_ENDIAN__ 1 -#endif - -#endif /* IS_? */ - -#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) - -/* If architecture-specific approaches fail try generic variants. First: BSD (works about everywhere). */ -#if !IS_WINDOWS -#include <sys/param.h> - -#if defined (__BYTE_ORDER) -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define __FLASHROM_LITTLE_ENDIAN__ -#elif __BYTE_ORDER == __BIG_ENDIAN -#define __FLASHROM_BIG_ENDIAN__ -#else -#error Unknown byte order! -#endif -#endif /* defined __BYTE_ORDER */ -#endif /* !IS_WINDOWS */ - -#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) - -/* Nonstandard libc-specific macros for determining endianness. */ -/* musl provides an endian.h as well... but it can not be detected from within C. */ -#if defined(__GLIBC__) -#include <endian.h> -#if BYTE_ORDER == LITTLE_ENDIAN -#define __FLASHROM_LITTLE_ENDIAN__ 1 -#elif BYTE_ORDER == BIG_ENDIAN -#define __FLASHROM_BIG_ENDIAN__ 1 -#endif -#endif -#endif - -#endif - -#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) -#error Unable to determine endianness. -#endif - #endif /* !__PLATFORM_H__ */ 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 8 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: copy determination test for the endian to Makefile.d
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58270 ) Change subject: Makefile: copy determination test for the endian to Makefile.d ...................................................................... Makefile: copy determination test for the endian to Makefile.d Copy the test code for endian detection in an extra directory to split it from the main flashrom code. Change-Id: I0c2420fd60d7d6a23c94c9962b06bfd7f3c86ad8 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58270 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M Makefile A Makefile.d/endian_test.h D endiantest.c 3 files changed, 92 insertions(+), 8 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 1e96e8a..cea5c69 100644 --- a/Makefile +++ b/Makefile @@ -164,8 +164,7 @@ # the lines below use CC itself. override TARGET_OS := $(call c_macro_test, Makefile.d/os_test.h) override ARCH := $(call c_macro_test, Makefile.d/arch_test.h) -override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ - | tail -1)) +override ENDIAN := $(call c_macro_test, Makefile.d/endian_test.h) ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) override CPPFLAGS += -I/usr/local/include @@ -869,6 +868,8 @@ @if [ $(ARCH) = unknown ]; then echo Aborting.; exit 1; fi @echo Target OS is $(TARGET_OS) @if [ $(TARGET_OS) = unknown ]; then echo Aborting.; exit 1; fi + @echo Target endian is $(ENDIAN) + @if [ $(ENDIAN) = unknown ]; then echo Aborting.; exit 1; fi ifeq ($(TARGET_OS), libpayload) @$(CC) --version 2>&1 | grep -q coreboot || \ ( echo "Warning: It seems you are not using coreboot's reference compiler."; \ diff --git a/Makefile.d/endian_test.h b/Makefile.d/endian_test.h new file mode 100644 index 0000000..36658b3 --- /dev/null +++ b/Makefile.d/endian_test.h @@ -0,0 +1,89 @@ +/* + * 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. + */ + +/* + * This file determinate the target endian. It should only be used my the Makefile + */ + +#if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) +/* All x86 is little-endian. */ +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#elif defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips) +/* MIPS can be either endian. */ +#if defined (__MIPSEL) || defined (__MIPSEL__) || defined (_MIPSEL) || defined (MIPSEL) +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#elif defined (__MIPSEB) || defined (__MIPSEB__) || defined (_MIPSEB) || defined (MIPSEB) +#define __FLASHROM_BIG_ENDIAN__ 1 +#endif +#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__POWERPC__) || \ + defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ + defined(_ARCH_PPC64) || defined(__ppc) +/* PowerPC can be either endian. */ +#if defined (_BIG_ENDIAN) || defined (__BIG_ENDIAN__) +#define __FLASHROM_BIG_ENDIAN__ 1 +#elif defined (_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#endif +#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || defined(_M_ARM) || defined(__arm) || \ + defined(__aarch64__) +/* ARM can be either endian. */ +#if defined (__ARMEB__) || defined (__BIG_ENDIAN__) +#define __FLASHROM_BIG_ENDIAN__ 1 +#elif defined (__ARMEL__) || defined (__LITTLE_ENDIAN__) +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#endif +#elif defined (__sparc__) || defined (__sparc) +/* SPARC is big endian in general (but allows to access data in little endian too). */ +#define __FLASHROM_BIG_ENDIAN__ 1 +#elif defined(__arc__) +#if defined(__BIG_ENDIAN__) +#define __FLASHROM_BIG_ENDIAN__ 1 +#else +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#endif +#endif + +#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) +/* If architecture-specific approaches fail try generic variants. First: BSD (works about everywhere). */ +#if !(defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)) +#include <sys/param.h> +#if defined (__BYTE_ORDER) +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define __FLASHROM_LITTLE_ENDIAN__ +#elif __BYTE_ORDER == __BIG_ENDIAN +#define __FLASHROM_BIG_ENDIAN__ +#else +#error Unknown byte order! +#endif +#endif /* defined __BYTE_ORDER */ +#endif /* !IS_WINDOWS */ +#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) +/* Nonstandard libc-specific macros for determining endianness. */ +/* musl provides an endian.h as well... but it can not be detected from within C. */ +#if defined(__GLIBC__) +#include <endian.h> +#if BYTE_ORDER == LITTLE_ENDIAN +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#elif BYTE_ORDER == BIG_ENDIAN +#define __FLASHROM_BIG_ENDIAN__ 1 +#endif +#endif +#endif +#endif +#if defined(__FLASHROM_LITTLE_ENDIAN__) +"little" +#else +"big" +#endif diff --git a/endiantest.c b/endiantest.c deleted file mode 100644 index a73b908..0000000 --- a/endiantest.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "platform.h" -#if defined(__FLASHROM_LITTLE_ENDIAN__) -little -#else -big -#endif -- To view, visit https://review.coreboot.org/c/flashrom/+/58270 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0c2420fd60d7d6a23c94c9962b06bfd7f3c86ad8 Gerrit-Change-Number: 58270 Gerrit-PatchSet: 7 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: move determination test for the architecture to Makefile.d
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58269 ) Change subject: Makefile: move determination test for the architecture to Makefile.d ...................................................................... Makefile: move determination test for the architecture to Makefile.d Move the test code for architecture detection in a extra directory to split it from the main flashrom code. Change-Id: I29ce73be9c5cbe259a2471f8eea2f8745b68cdfa Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58269 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile A Makefile.d/arch_test.h D archtest.c M platform.h 4 files changed, 54 insertions(+), 21 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index f8ff097..1e96e8a 100644 --- a/Makefile +++ b/Makefile @@ -163,8 +163,7 @@ # is ever used (of course), but should come after any lines setting CC because # the lines below use CC itself. override TARGET_OS := $(call c_macro_test, Makefile.d/os_test.h) -override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ - | tail -1 | cut -f 2 -d'"')) +override ARCH := $(call c_macro_test, Makefile.d/arch_test.h) override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ | tail -1)) @@ -866,11 +865,8 @@ echo "found." || { echo "not found."; \ rm -f .test.c .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @rm -f .test.c .test$(EXEC_SUFFIX) - @printf "Target arch is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ - ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1) - @printf "%s\n" '$(ARCH)' + @echo Target arch is $(ARCH) + @if [ $(ARCH) = unknown ]; then echo Aborting.; exit 1; fi @echo Target OS is $(TARGET_OS) @if [ $(TARGET_OS) = unknown ]; then echo Aborting.; exit 1; fi ifeq ($(TARGET_OS), libpayload) diff --git a/Makefile.d/arch_test.h b/Makefile.d/arch_test.h new file mode 100644 index 0000000..077aaba --- /dev/null +++ b/Makefile.d/arch_test.h @@ -0,0 +1,51 @@ +/* + * 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. + */ + +/* + * This file determinate the target architecture. It should only be used + * by the Makefile + */ + +#if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) + #define __FLASHROM_ARCH__ "x86" +#elif defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips) + #define __FLASHROM_ARCH__ "mips" +#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 __FLASHROM_ARCH__ "ppc" +#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || defined(_M_ARM) || defined(__arm) || \ + defined(__aarch64__) + #define __FLASHROM_ARCH__ "arm" +#elif defined (__sparc__) || defined (__sparc) + #define __FLASHROM_ARCH__ "sparc" +#elif defined (__alpha__) + #define __FLASHROM_ARCH__ "alpha" +#elif defined (__hppa__) || defined (__hppa) + #define __FLASHROM_ARCH__ "hppa" +#elif defined (__m68k__) + #define __FLASHROM_ARCH__ "m68k" +#elif defined (__riscv) + #define __FLASHROM_ARCH__ "riscv" +#elif defined (__sh__) + #define __FLASHROM_ARCH__ "sh" +#elif defined(__s390__) || defined(__s390x__) || defined(__zarch__) + #define __FLASHROM_ARCH__ "s390" +#elif defined(__arc__) + #define __FLASHROM_ARCH__ "arc" +#else + #define __FLASHROM_ARCH__ "unknown" +#endif +__FLASHROM_ARCH__ diff --git a/archtest.c b/archtest.c deleted file mode 100644 index 791f1a3..0000000 --- a/archtest.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "platform.h" -__FLASHROM_ARCH__ diff --git a/platform.h b/platform.h index 04f1ab1..cd8e54b 100644 --- a/platform.h +++ b/platform.h @@ -39,43 +39,31 @@ // Likewise for target architectures #if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) - #define __FLASHROM_ARCH__ "x86" #define IS_X86 1 #elif defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips) - #define __FLASHROM_ARCH__ "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 __FLASHROM_ARCH__ "ppc" #define IS_PPC 1 #elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || defined(_M_ARM) || defined(__arm) || \ defined(__aarch64__) - #define __FLASHROM_ARCH__ "arm" #define IS_ARM 1 #elif defined (__sparc__) || defined (__sparc) - #define __FLASHROM_ARCH__ "sparc" #define IS_SPARC 1 #elif defined (__alpha__) - #define __FLASHROM_ARCH__ "alpha" #define IS_ALPHA 1 #elif defined (__hppa__) || defined (__hppa) - #define __FLASHROM_ARCH__ "hppa" #define IS_HPPA 1 #elif defined (__m68k__) - #define __FLASHROM_ARCH__ "m68k" #define IS_M68K 1 #elif defined (__riscv) - #define __FLASHROM_ARCH__ "riscv" #define IS_RISCV 1 #elif defined (__sh__) - #define __FLASHROM_ARCH__ "sh" #define IS_SH 1 #elif defined(__s390__) || defined(__s390x__) || defined(__zarch__) - #define __FLASHROM_ARCH__ "s390" #define IS_S390 1 #elif defined(__arc__) - #define __FLASHROM_ARCH__ "arc" #define IS_ARC 1 #endif -- To view, visit https://review.coreboot.org/c/flashrom/+/58269 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I29ce73be9c5cbe259a2471f8eea2f8745b68cdfa Gerrit-Change-Number: 58269 Gerrit-PatchSet: 7 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: move determination test for OS to Makefile.d
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58015 ) Change subject: Makefile: move determination test for OS to Makefile.d ...................................................................... Makefile: move determination test for OS to Makefile.d Move the test code for OS detection in a extra directory to split it from the main flashrom code. Change-Id: Id911f17f4100f242e1fde10d23a8459ddf38b369 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58015 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M .gitignore M Makefile R Makefile.d/os_test.h M Makefile.include M util/ich_descriptors_tool/Makefile 5 files changed, 15 insertions(+), 12 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 2d621dc..7c45aba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.d +!Makefile.d/ *.o /.features /.dependencies diff --git a/Makefile b/Makefile index a94f9f6..f8ff097 100644 --- a/Makefile +++ b/Makefile @@ -162,14 +162,12 @@ # IMPORTANT: The following lines must be placed before TARGET_OS, ARCH or ENDIAN # is ever used (of course), but should come after any lines setting CC because # the lines below use CC itself. -override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ - | tail -1 | cut -f 2 -d'"')) +override TARGET_OS := $(call c_macro_test, Makefile.d/os_test.h) override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ | tail -1 | cut -f 2 -d'"')) override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ | tail -1)) - ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) override CPPFLAGS += -I/usr/local/include override LDFLAGS += -L/usr/local/lib @@ -848,7 +846,7 @@ # This includes all frontends and libflashrom. # We don't use EXEC_SUFFIX here because we want to clean everything. clean: - rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) + rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o)) $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) @+$(MAKE) -C util/ich_descriptors_tool/ clean distclean: clean @@ -873,11 +871,8 @@ @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1) @printf "%s\n" '$(ARCH)' - @printf "Target OS is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ - ( echo "unknown (\"$(TARGET_OS)\"). Aborting."; exit 1) - @printf "%s\n" '$(TARGET_OS)' + @echo Target OS is $(TARGET_OS) + @if [ $(TARGET_OS) = unknown ]; then echo Aborting.; exit 1; fi ifeq ($(TARGET_OS), libpayload) @$(CC) --version 2>&1 | grep -q coreboot || \ ( echo "Warning: It seems you are not using coreboot's reference compiler."; \ diff --git a/os.h b/Makefile.d/os_test.h similarity index 93% rename from os.h rename to Makefile.d/os_test.h index d6fbfe0..17045b2 100644 --- a/os.h +++ b/Makefile.d/os_test.h @@ -14,7 +14,7 @@ */ /* - * Header file for OS checking. + * This file determinate the target os. It should only be used my the Makefile */ // Solaris @@ -61,5 +61,7 @@ #else #define __FLASHROM_OS__ "Linux" #endif +#else +#define __FLASHROM_OS__ "unknown" #endif __FLASHROM_OS__ diff --git a/Makefile.include b/Makefile.include index 36746c8..ca70d05 100644 --- a/Makefile.include +++ b/Makefile.include @@ -31,6 +31,10 @@ $(eval override $(p) := no)) endef +# Run the C Preprocessor with file $1 and return the last line, removing quotes. +define c_macro_test +$(strip $(shell $(CC) -E $1 2>/dev/null | tail -1 | tr -d '"')) +endef define COMPILER_TEST int main(int argc, char **argv) diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile index 8962431..168220c 100644 --- a/util/ich_descriptors_tool/Makefile +++ b/util/ich_descriptors_tool/Makefile @@ -4,6 +4,8 @@ # This Makefile works standalone, but it is usually called from the main # Makefile in the flashrom directory. +include ../../Makefile.include + PROGRAM=ich_descriptors_tool EXTRAINCDIRS = ../../ . DEPPATH = .dep @@ -32,8 +34,7 @@ FLASHROM_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 endif -override TARGET_OS := $(shell $(CC) $(CPPFLAGS) -E $(SHAREDSRCDIR)/os.h | grep -v '^\#' | grep '"' | \ - cut -f 2 -d'"') +override TARGET_OS := $(call c_macro_test, ../../Makefile.d/os_test.h) ifeq ($(TARGET_OS), DOS) EXEC_SUFFIX := .exe -- To view, visit https://review.coreboot.org/c/flashrom/+/58015 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id911f17f4100f242e1fde10d23a8459ddf38b369 Gerrit-Change-Number: 58015 Gerrit-PatchSet: 8 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: move determination tests for target systems to one place
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58248 ) Change subject: Makefile: move determination tests for target systems to one place ...................................................................... Makefile: move determination tests for target systems to one place Change-Id: Ia1b3f0257aaeebb355700b65c51a2ba70b80d5ae Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58248 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 9 insertions(+), 17 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index bc0047f..a94f9f6 100644 --- a/Makefile +++ b/Makefile @@ -158,12 +158,17 @@ CC = gcc endif -# Determine the destination OS. -# IMPORTANT: The following line must be placed before TARGET_OS is ever used -# (of course), but should come after any lines setting CC because the line -# below uses CC itself. +# Determine the destination OS, architecture and endian +# IMPORTANT: The following lines must be placed before TARGET_OS, ARCH or ENDIAN +# is ever used (of course), but should come after any lines setting CC because +# the lines below use CC itself. override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ | tail -1 | cut -f 2 -d'"')) +override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ + | tail -1 | cut -f 2 -d'"')) +override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ + | tail -1)) + ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) override CPPFLAGS += -I/usr/local/include @@ -242,19 +247,6 @@ CONFIG_LINUX_I2C_HELPER = yes endif -############################################################################### -# General architecture-specific settings. -# Like above for the OS, below we verify user-supplied options depending on the target architecture. - -# Determine the destination processor architecture. -# IMPORTANT: The following line must be placed before ARCH is ever used -# (of course), but should come after any lines setting CC because the line -# below uses CC itself. -override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ - | tail -1 | cut -f 2 -d'"')) -override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ - | tail -1)) - # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) $(call mark_unsupported,CONFIG_INTERNAL) 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 5 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: serprog: Move content of programmer specific header to C file
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58300 ) Change subject: serprog: Move content of programmer specific header to C file ...................................................................... serprog: Move content of programmer specific header to C file Move the programmer specific code into serprog.c and remove its related header file. Change-Id: I5c65f43db200129489d487ff948daa08bd0e92fa Signed-off-by: Felix Singer <felix.singer(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58300 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M serprog.c D serprog.h 2 files changed, 26 insertions(+), 26 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Thomas Heijligen: Looks good to me, approved diff --git a/serprog.c b/serprog.c index b207fd2..f142b49 100644 --- a/serprog.c +++ b/serprog.c @@ -38,7 +38,32 @@ #include "flash.h" #include "programmer.h" #include "chipdrivers.h" -#include "serprog.h" + +/* According to Serial Flasher Protocol Specification - version 1 */ +#define S_ACK 0x06 +#define S_NAK 0x15 +#define S_CMD_NOP 0x00 /* No operation */ +#define S_CMD_Q_IFACE 0x01 /* Query interface version */ +#define S_CMD_Q_CMDMAP 0x02 /* Query supported commands bitmap */ +#define S_CMD_Q_PGMNAME 0x03 /* Query programmer name */ +#define S_CMD_Q_SERBUF 0x04 /* Query Serial Buffer Size */ +#define S_CMD_Q_BUSTYPE 0x05 /* Query supported bustypes */ +#define S_CMD_Q_CHIPSIZE 0x06 /* Query supported chipsize (2^n format) */ +#define S_CMD_Q_OPBUF 0x07 /* Query operation buffer size */ +#define S_CMD_Q_WRNMAXLEN 0x08 /* Query Write to opbuf: Write-N maximum length */ +#define S_CMD_R_BYTE 0x09 /* Read a single byte */ +#define S_CMD_R_NBYTES 0x0A /* Read n bytes */ +#define S_CMD_O_INIT 0x0B /* Initialize operation buffer */ +#define S_CMD_O_WRITEB 0x0C /* Write opbuf: Write byte with address */ +#define S_CMD_O_WRITEN 0x0D /* Write to opbuf: Write-N */ +#define S_CMD_O_DELAY 0x0E /* Write opbuf: udelay */ +#define S_CMD_O_EXEC 0x0F /* Execute operation buffer */ +#define S_CMD_SYNCNOP 0x10 /* Special no-operation that returns NAK+ACK */ +#define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */ +#define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */ +#define S_CMD_O_SPIOP 0x13 /* Perform SPI operation. */ +#define S_CMD_S_SPI_FREQ 0x14 /* Set SPI clock frequency */ +#define S_CMD_S_PIN_STATE 0x15 /* Enable/disable output drivers */ #define MSGHEADER "serprog: " diff --git a/serprog.h b/serprog.h deleted file mode 100644 index b54aaea..0000000 --- a/serprog.h +++ /dev/null @@ -1,25 +0,0 @@ -/* According to Serial Flasher Protocol Specification - version 1 */ -#define S_ACK 0x06 -#define S_NAK 0x15 -#define S_CMD_NOP 0x00 /* No operation */ -#define S_CMD_Q_IFACE 0x01 /* Query interface version */ -#define S_CMD_Q_CMDMAP 0x02 /* Query supported commands bitmap */ -#define S_CMD_Q_PGMNAME 0x03 /* Query programmer name */ -#define S_CMD_Q_SERBUF 0x04 /* Query Serial Buffer Size */ -#define S_CMD_Q_BUSTYPE 0x05 /* Query supported bustypes */ -#define S_CMD_Q_CHIPSIZE 0x06 /* Query supported chipsize (2^n format) */ -#define S_CMD_Q_OPBUF 0x07 /* Query operation buffer size */ -#define S_CMD_Q_WRNMAXLEN 0x08 /* Query Write to opbuf: Write-N maximum length */ -#define S_CMD_R_BYTE 0x09 /* Read a single byte */ -#define S_CMD_R_NBYTES 0x0A /* Read n bytes */ -#define S_CMD_O_INIT 0x0B /* Initialize operation buffer */ -#define S_CMD_O_WRITEB 0x0C /* Write opbuf: Write byte with address */ -#define S_CMD_O_WRITEN 0x0D /* Write to opbuf: Write-N */ -#define S_CMD_O_DELAY 0x0E /* Write opbuf: udelay */ -#define S_CMD_O_EXEC 0x0F /* Execute operation buffer */ -#define S_CMD_SYNCNOP 0x10 /* Special no-operation that returns NAK+ACK */ -#define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */ -#define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */ -#define S_CMD_O_SPIOP 0x13 /* Perform SPI operation. */ -#define S_CMD_S_SPI_FREQ 0x14 /* Set SPI clock frequency */ -#define S_CMD_S_PIN_STATE 0x15 /* Enable/disable output drivers */ -- To view, visit https://review.coreboot.org/c/flashrom/+/58300 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5c65f43db200129489d487ff948daa08bd0e92fa Gerrit-Change-Number: 58300 Gerrit-PatchSet: 7 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: gfxnvidia: Fix indents
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58301 ) Change subject: gfxnvidia: Fix indents ...................................................................... gfxnvidia: Fix indents Change-Id: I18f916923d3574dd8c68019e4db3985444dd7bee Signed-off-by: Felix Singer <felix.singer(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58301 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M gfxnvidia.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved diff --git a/gfxnvidia.c b/gfxnvidia.c index 760b76b..048471d 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -71,14 +71,14 @@ } static const struct par_master par_master_gfxnvidia = { - .chip_readb = gfxnvidia_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = gfxnvidia_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = gfxnvidia_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = gfxnvidia_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int gfxnvidia_init(void) 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/58301 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I18f916923d3574dd8c68019e4db3985444dd7bee Gerrit-Change-Number: 58301 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2021