October 2021 - flashrom-gerrit

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

12 Oct '21

Attention is currently required from: Thomas Heijligen. Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/58273 to look at the new patch set (#2). Change subject: endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem ...................................................................... endian: Decide __FLASHROM_XXX_ENDIAN__ in the buildsystem Change-Id: I37093528ae55e712cc30a0267a8ceac332750e7d Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M meson.build M platform.h 3 files changed, 14 insertions(+), 89 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/73/58273/2 -- 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: endian: Decide __FLASHROM_XXX_ENDIAN__ in the Makefile
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/+/58273 ) Change subject: endian: Decide __FLASHROM_XXX_ENDIAN__ in the Makefile ...................................................................... endian: Decide __FLASHROM_XXX_ENDIAN__ in the Makefile Change-Id: I37093528ae55e712cc30a0267a8ceac332750e7d Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M platform.h 2 files changed, 7 insertions(+), 89 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/73/58273/1 diff --git a/Makefile b/Makefile index 993cfc0..7c52e9b 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/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__ */ -- 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: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: Makefile: move OS test into the Makefile
by Thomas Heijligen (Code Review) 12 Oct '21

12 Oct '21

Attention is currently required from: Felix Singer, Nico Huber, Angel Pons. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58015 ) Change subject: Makefile: move OS test into the Makefile ...................................................................... Set Ready For Review -- 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: 3 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 12 Oct 2021 14:02:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: move endian test into the Makefile
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/+/58270 ) Change subject: Makefile: move endian test into the Makefile ...................................................................... Makefile: move endian test into the Makefile Change-Id: I0c2420fd60d7d6a23c94c9962b06bfd7f3c86ad8 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M Makefile.include D endiantest.c 3 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/70/58270/1 diff --git a/Makefile b/Makefile index 3acef60..993cfc0 100644 --- a/Makefile +++ b/Makefile @@ -164,8 +164,7 @@ # the line below uses CC itself. override TARGET_OS := $(call c_macro_test, $(TARGET_OS_TEST)) override ARCH := $(call c_macro_test, $(ARCH_TEST)) -override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ - | tail -1)) +override ENDIAN := $(call c_macro_test, $(ENDIAN_TEST)) 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 os $(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.include b/Makefile.include index eb54acf..212e9be 100644 --- a/Makefile.include +++ b/Makefile.include @@ -109,6 +109,20 @@ #endif \n endef +# This works since gcc 4.6 and with clang +# https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html +define ENDIAN_TEST +#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \ + __BYTE_ORDER__ ==__ORDER_BIG_ENDIAN__ \n + 'big' \n +#elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ + __BYTE_ORDER__ ==__ORDER_LITTLE_ENDIAN__ \n + 'little' \n +#else \n + 'unknown' \n +#endif n +endef + define COMPILER_TEST int main(int argc, char **argv) { 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: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: Makefile: move architecture test into the Makefile
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/+/58269 ) Change subject: Makefile: move architecture test into the Makefile ...................................................................... Makefile: move architecture test into the Makefile Change-Id: I29ce73be9c5cbe259a2471f8eea2f8745b68cdfa Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M Makefile.include D archtest.c M platform.h 4 files changed, 38 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/69/58269/1 diff --git a/Makefile b/Makefile index 50fd56c..3acef60 100644 --- a/Makefile +++ b/Makefile @@ -163,8 +163,7 @@ # is ever used (of course), but should come after any lines setting CC because # the line below uses CC itself. override TARGET_OS := $(call c_macro_test, $(TARGET_OS_TEST)) -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, $(ARCH_TEST)) 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 os $(TARGET_OS) @if [ $(TARGET_OS) = unknown ]; then echo Aborting.; exit 1; fi ifeq ($(TARGET_OS), libpayload) diff --git a/Makefile.include b/Makefile.include index a6e19be..eb54acf 100644 --- a/Makefile.include +++ b/Makefile.include @@ -74,6 +74,41 @@ #endif \n endef +define ARCH_TEST +#if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) \n + 'x86' \n +#elif defined (__mips) || defined (__mips__) || defined (__MIPS__) || \ + defined (mips) \n + 'mips' \n +#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || \ + defined(__POWERPC__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__ppc) \n + 'ppc' \n +#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || \ + defined(_M_ARM) || defined(__arm) || defined(__aarch64__) \n + 'arm' \n +#elif defined (__sparc__) || defined (__sparc) \n + 'sparc' \n +#elif defined (__alpha__) \n + 'alpha' \n +#elif defined (__hppa__) || defined (__hppa) \n + 'hppa' \n +#elif defined (__m68k__) \n + 'm68k' \n +#elif defined (__riscv) \n + 'riscv' \n +#elif defined (__sh__) \n + 'sh' \n +#elif defined(__s390__) || defined(__s390x__) || defined(__zarch__) \n + 's390' \n +#elif defined(__arc__) \n + 'arc' \n +#else \n + 'unknown' \n +#endif \n +endef + define COMPILER_TEST int main(int argc, char **argv) { 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: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: Makefile: reorder ARCH and ENDIAN test
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/+/58248 ) Change subject: Makefile: reorder ARCH and ENDIAN test ...................................................................... Makefile: reorder ARCH and ENDIAN test Change-Id: Ia1b3f0257aaeebb355700b65c51a2ba70b80d5ae Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile 1 file changed, 9 insertions(+), 17 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/48/58248/1 diff --git a/Makefile b/Makefile index bc0047f..8b8611b 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 line must be placed before TARGET_OS, ARCH or ENDIAN +# is ever used (of course), but should come after any lines setting CC because +# the line below uses 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) -- 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-MessageType: newchange

1 0

Change in flashrom[master]: Makefile: summarize systems with the same CPPFLAGS and LDFLAGS
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/+/58247 ) Change subject: Makefile: summarize systems with the same CPPFLAGS and LDFLAGS ...................................................................... Makefile: summarize systems with the same CPPFLAGS and LDFLAGS Change-Id: I067430e52eb41bf0af4f08246bbe59117bc09bdb Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile 1 file changed, 5 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/47/58247/1 diff --git a/Makefile b/Makefile index 29d1020..bc0047f 100644 --- a/Makefile +++ b/Makefile @@ -165,31 +165,21 @@ override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ | tail -1 | cut -f 2 -d'"')) +ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) +override CPPFLAGS += -I/usr/local/include +override LDFLAGS += -L/usr/local/lib +endif + ifeq ($(TARGET_OS), Darwin) override CPPFLAGS += -I/opt/local/include -I/usr/local/include override LDFLAGS += -L/opt/local/lib -L/usr/local/lib endif -ifeq ($(TARGET_OS), FreeBSD) -override CPPFLAGS += -I/usr/local/include -override LDFLAGS += -L/usr/local/lib -endif - -ifeq ($(TARGET_OS), OpenBSD) -override CPPFLAGS += -I/usr/local/include -override LDFLAGS += -L/usr/local/lib -endif - ifeq ($(TARGET_OS), NetBSD) override CPPFLAGS += -I/usr/pkg/include override LDFLAGS += -L/usr/pkg/lib endif -ifeq ($(TARGET_OS), DragonFlyBSD) -override CPPFLAGS += -I/usr/local/include -override LDFLAGS += -L/usr/local/lib -endif - ifeq ($(TARGET_OS), DOS) EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. -- 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-MessageType: newchange

1 0

Change in flashrom[master]: Makefile: use STRIP_ARGS = -s on all platforms
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/+/58246 ) Change subject: Makefile: use STRIP_ARGS = -s on all platforms ...................................................................... Makefile: use STRIP_ARGS = -s on all platforms 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. Change-Id: I2c80d553fb54d94bc65f07e700c90dd1bae4854e Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/46/58246/1 diff --git a/Makefile b/Makefile index 8e06dee..29d1020 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ # Note for anyone editing this Makefile: gnumake will happily ignore any # changes in this Makefile to variables set on the command line. STRIP ?= strip +STRIP_ARGS = -s INSTALL = install DIFF = diff PREFIX ?= /usr/local @@ -157,10 +158,6 @@ CC = gcc endif -ifneq ($(HOST_OS), SunOS) -STRIP_ARGS = -s -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 -- 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-MessageType: newchange

1 0

Change in flashrom[master]: [TESTONLY]flashchips: add S25FL256L
by Arthur Heymans (Code Review) 11 Oct '21

11 Oct '21

Attention is currently required from: Arthur Heymans. Hello Arthur Heymans, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/58223 to review the following change. Change subject: [TESTONLY]flashchips: add S25FL256L ...................................................................... [TESTONLY]flashchips: add S25FL256L Change-Id: Ia2e2c3b2b5e4ef510e2e39f0521318769234c278 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M flashchips.c M flashchips.h 2 files changed, 40 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/23/58223/1 diff --git a/flashchips.c b/flashchips.c index 434c46d..4151d4d 100644 --- a/flashchips.c +++ b/flashchips.c @@ -16535,6 +16535,45 @@ { .vendor = "Spansion", + .name = "S25FL256L", + .bustype = BUS_SPI, + .manufacture_id = SPANSION_ID, + .model_id = SPANSION_S25FL256, + .total_size = 33554432, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 8192} }, + .block_erase = spi_block_erase_20, + }, + { + .eraseblocks = { {32 * 1024, 1024} }, + .block_erase = spi_block_erase_52, + }, + { + .eraseblocks = { {64 * 1024, 512} }, + .block_erase = spi_block_erase_d8, + }, + { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, + }, + .printlock = spi_prettyprint_status_register_bp3_srwd, + .unlock = spi_disable_blockprotect_bp3_srwd, /* #WP pin write-protects SRWP bit. */ + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + + + { + .vendor = "Spansion", .name = "S25FL256S Large Sectors", .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, diff --git a/flashchips.h b/flashchips.h index e190dca..248c743 100644 --- a/flashchips.h +++ b/flashchips.h @@ -668,6 +668,7 @@ #define SPANSION_S25FL116K 0x4015 #define SPANSION_S25FL132K 0x4016 #define SPANSION_S25FL164K 0x4017 +#define SPANSION_S25FL256L 0x6019 #define SPANSION_S25FS128S_L 0x20180081 /* Large sectors. */ #define SPANSION_S25FS128S_S 0x20180181 /* Small sectors. */ #define SPANSION_S25FS256S_L 0x02190081 /* Large sectors. */ -- To view, visit https://review.coreboot.org/c/flashrom/+/58223 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia2e2c3b2b5e4ef510e2e39f0521318769234c278 Gerrit-Change-Number: 58223 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur.heymans(a)9elements.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests: Add wrap for libusb_init and use it in dediprog test
by Anastasia Klimchuk (Code Review) 11 Oct '21

11 Oct '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57917 ) Change subject: tests: Add wrap for libusb_init and use it in dediprog test ...................................................................... Patch Set 3: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/57917/comment/e2ffff4e_7d659534 PS3, Line 15: real libusb_init > Actually, there are two things: 1. `libusb.h`, we can either use the original or […] Thank you for explanation, it is helpful! I need to do some thinking about all this, and then I will upload new version of the chain, incorporating all the comments. -- To view, visit https://review.coreboot.org/c/flashrom/+/57917 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I51c9cb96db1afb3298f4d098df96509d3cb3c046 Gerrit-Change-Number: 57917 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 11 Oct 2021 08:09:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2021