flashrom

flashrom@flashrom.org

5 participants
9161 discussions

[PATCH] Add support for GigaDevice GD25Q128C
by Hatim Kanchwala 21 Feb '16

21 Feb '16

Signed-off-by: Hatim Kanchwala <hatim(a)hatimak.me> --- flashchips.c | 41 +++++++++++++++++++++++++++++++++++++++++ flashchips.h | 3 ++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/flashchips.c b/flashchips.c index 26a8d89..12c5c62 100644 --- a/flashchips.c +++ b/flashchips.c @@ -6206,26 +6206,67 @@ const struct flashchip flashchips[] = { .eraseblocks = { {16 * 1024 * 1024, 1} }, .block_erase = spi_block_erase_c7, } }, .printlock = spi_prettyprint_status_register_bp4_srwd, .unlock = spi_disable_blockprotect_bp4_srwd, /* TODO: 2nd status reg (read with 0x35) */ .write = spi_chip_write_256, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, { .vendor = "GigaDevice", + .name = "GD25Q128C", + .bustype = BUS_SPI, + .manufacture_id = GIGADEVICE_ID, + .model_id = GIGADEVICE_GD25Q128, + .total_size = 16384, + .page_size = 256, + /* OTP: 3 * 512B total; read 0x48; write 0x42, erase 0x44 */ + /* QPI: enable 0x38, disable 0xFF */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 4096} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {32 * 1024, 512} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 256} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + /* TODO: 2nd status reg (read 0x35, write 0x31) and 3rd status reg (read 0x15, write 0x11) */ + .printlock = spi_prettyprint_status_register_bp4_srwd, + .unlock = spi_disable_blockprotect_bp4_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .voltage = {2700, 3600}, + }, + + { + .vendor = "GigaDevice", .name = "GD25T80", .bustype = BUS_SPI, .manufacture_id = GIGADEVICE_ID, .model_id = GIGADEVICE_GD25T80, .total_size = 1024, .page_size = 256, /* OTP: 256B total; enter 0x3A */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = { { diff --git a/flashchips.h b/flashchips.h index e469363..3ab1e07 100644 --- a/flashchips.h +++ b/flashchips.h @@ -361,27 +361,28 @@ #define FUJITSU_MBM29LV160BE 0x49 /* 16 b mode 0x2249 */ #define FUJITSU_MBM29LV160TE 0xC4 /* 16 b mode 0x22C4 */ #define GIGADEVICE_ID 0xC8 /* GigaDevice */ #define GIGADEVICE_GD25T80 0x3114 #define GIGADEVICE_GD25Q512 0x4010 #define GIGADEVICE_GD25Q10 0x4011 #define GIGADEVICE_GD25Q20 0x4012 /* Same as GD25QB */ #define GIGADEVICE_GD25Q40 0x4013 /* Same as GD25QB */ #define GIGADEVICE_GD25Q80 0x4014 /* Same as GD25Q80B (which has OTP) */ #define GIGADEVICE_GD25Q16 0x4015 /* Same as GD25Q16B (which has OTP) */ #define GIGADEVICE_GD25Q32 0x4016 /* Same as GD25Q32B */ #define GIGADEVICE_GD25Q64 0x4017 /* Same as GD25Q64B */ -#define GIGADEVICE_GD25Q128 0x4018 /* GD25Q128B only? */ +#define GIGADEVICE_GD25Q128 0x4018 /* Same as GD25Q128B and GD25Q128C (distinguish by RES/REMS) */ +#define GIGADEVICE_GD25Q128C 0x17 #define GIGADEVICE_GD25LQ40 0x6013 #define GIGADEVICE_GD25LQ80 0x6014 #define GIGADEVICE_GD25LQ16 0x6015 #define GIGADEVICE_GD25LQ32 0x6016 #define GIGADEVICE_GD25LQ64 0x6017 /* Same as GD25LQ64B (which is faster) */ #define GIGADEVICE_GD25LQ128 0x6018 #define GIGADEVICE_GD25VQ41B 0x4213 #define GIGADEVICE_GD29GL064CAB 0x7E0601 #define HYUNDAI_ID 0xAD /* Hyundai */ #define HYUNDAI_HY29F400T 0x23 /* Same as HY29F400AT */ #define HYUNDAI_HY29F800B 0x58 /* Same as HY29F800AB */ #define HYUNDAI_HY29LV800B 0x5B -- Regards, Hatim Kanchwala http://hatimak.me B. Tech. Electrical Engineering Indian Institute of Technology Patna

2 4

[commit] r1937 - trunk
by repository service 21 Feb '16

21 Feb '16

Author: stefanct Date: Sun Feb 21 01:21:11 2016 New Revision: 1937 URL: http://flashrom.org/trac/flashrom/changeset/1937 Log: Add support for GigaDevice GD25VQ41B and GD25Q128C. Signed-off-by: Hatim Kanchwala <hatim(a)hatimak.me> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/flashchips.c trunk/flashchips.h Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sat Feb 20 23:28:16 2016 (r1936) +++ trunk/flashchips.c Sun Feb 21 01:21:11 2016 (r1937) @@ -6216,6 +6216,47 @@ { .vendor = "GigaDevice", + .name = "GD25Q128C", + .bustype = BUS_SPI, + .manufacture_id = GIGADEVICE_ID, + .model_id = GIGADEVICE_GD25Q128, + .total_size = 16384, + .page_size = 256, + /* OTP: 1536B total; read 0x48; write 0x42, erase 0x44 */ + /* QPI: enable 0x38, disable 0xFF */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 4096} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {32 * 1024, 512} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 256} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + /* TODO: 2nd status reg (read 0x35, write 0x31) and 3rd status reg (read 0x15, write 0x11) */ + .printlock = spi_prettyprint_status_register_bp4_srwd, + .unlock = spi_disable_blockprotect_bp4_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .voltage = {2700, 3600}, + }, + + { + .vendor = "GigaDevice", .name = "GD25T80", .bustype = BUS_SPI, .manufacture_id = GIGADEVICE_ID, @@ -6253,6 +6294,46 @@ }, { + .vendor = "GigaDevice", + .name = "GD25VQ41B", + .bustype = BUS_SPI, + .manufacture_id = GIGADEVICE_ID, + .model_id = GIGADEVICE_GD25VQ41B, + .total_size = 512, + .page_size = 256, + /* OTP: 1536B total; read 0x48, write 0x42, erase 0x44 */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { { 4 * 1024, 128} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { { 32 * 1024, 16} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { { 64 * 1024, 8} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + /* TODO: 2nd Status Register; read 0x35 */ + .printlock = spi_prettyprint_status_register_bp4_srwd, + .unlock = spi_disable_blockprotect_bp4_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .voltage = {2300, 3600}, + }, + + { .vendor = "Hyundai", .name = "HY29F002T", .bustype = BUS_PARALLEL, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Sat Feb 20 23:28:16 2016 (r1936) +++ trunk/flashchips.h Sun Feb 21 01:21:11 2016 (r1937) @@ -371,13 +371,14 @@ #define GIGADEVICE_GD25Q16 0x4015 /* Same as GD25Q16B (which has OTP) */ #define GIGADEVICE_GD25Q32 0x4016 /* Same as GD25Q32B */ #define GIGADEVICE_GD25Q64 0x4017 /* Same as GD25Q64B */ -#define GIGADEVICE_GD25Q128 0x4018 /* GD25Q128B only? */ +#define GIGADEVICE_GD25Q128 0x4018 /* GD25Q128B and GD25Q128C only, can be distinguished by SFDP */ #define GIGADEVICE_GD25LQ40 0x6013 #define GIGADEVICE_GD25LQ80 0x6014 #define GIGADEVICE_GD25LQ16 0x6015 #define GIGADEVICE_GD25LQ32 0x6016 #define GIGADEVICE_GD25LQ64 0x6017 /* Same as GD25LQ64B (which is faster) */ #define GIGADEVICE_GD25LQ128 0x6018 +#define GIGADEVICE_GD25VQ41B 0x4213 #define GIGADEVICE_GD29GL064CAB 0x7E0601 #define HYUNDAI_ID 0xAD /* Hyundai */

1 0

Fwd: unlocked optiplex 3010 flash with me_clr jumper
by Jason Salopek 21 Feb '16

21 Feb '16

Hi, I am trying to unbrick a optiplex 3010 for a customer and I made a interesting discovery while trying to dump the bios from a working unit. If you change the me_clr jumper from the normal 2_3 position, to 1_2 and boot the system up, you get a "warning service mode enabled press f1" and then you can continue to bootup. With this set, I was able to use flashrom to read out the entire flash chip (this may or may not be 100% true but will still help me) I am attaching 2 files that show the difference between the 2 jumper settings. After this weekend crisis with this customer pc, I am willing to try this jumper trick on other optiplexes I have if you wish, 360, 755? I think You guys helped me get a little further on this rescue and I appreciate the help and info over the yrs Sincerely Jason J Salopek aka "flyback" --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus

1 0

[PATCH] Allow global disable of all drivers requiring libusb* or libpci
by Carl-Daniel Hailfinger 20 Feb '16

20 Feb '16

Usage: CONFIG_DISABLE_LIBUSB0_PROGRAMMERS=yes CONFIG_DISABLE_LIBUSB1_PROGRAMMERS=yes CONFIG_DISABLE_LIBPCI_PROGRAMMERS=yes Side note: This patch includes the patch to separate out raw access requirements from libpci requirements. If acked, I will commit separately. See [PATCH] Do not require PCI code for RayeR SPI driver for a changelog of that feature. Caveat: The following command line explodes based on moon phase and I have no idea why: make -j CONFIG_EVERYTHING=yes CONFIG_DISABLE_LIBUSB0_PROGRAMMERS=yes CONFIG_DISABLE_LIBUSB1_PROGRAMMERS=yes CONFIG_DISABLE_LIBPCI_PROGRAMMERS=yes Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-libpci_libusb_global_disable/Makefile =================================================================== --- flashrom-libpci_libusb_global_disable/Makefile (Revision 1926) +++ flashrom-libpci_libusb_global_disable/Makefile (Arbeitskopie) @@ -528,6 +528,34 @@ $(eval $(var)=yes))) endif +# Disable feature groups +ifeq ($(CONFIG_DISABLE_LIBUSB0_PROGRAMMERS), yes) +override CONFIG_PICKIT2_SPI = no +override CONFIG_DEDIPROG = no +endif +ifeq ($(CONFIG_DISABLE_LIBUSB1_PROGRAMMERS), yes) +override CONFIG_CH341A_SPI = no +override CONFIG_DEDIPROG = no +endif +ifeq ($(CONFIG_DISABLE_LIBPCI_PROGRAMMERS), yes) +override CONFIG_INTERNAL = no +override CONFIG_NIC3COM = no +override CONFIG_GFXNVIDIA = no +override CONFIG_SATASII = no +override CONFIG_ATAHPT = no +override CONFIG_ATAVIA = no +override CONFIG_ATAPROMISE = no +override CONFIG_IT8212 = no +override CONFIG_DRKAISER = no +override CONFIG_NICREALTEK = no +override CONFIG_NICNATSEMI = no +override CONFIG_NICINTEL = no +override CONFIG_NICINTEL_SPI = no +override CONFIG_NICINTEL_EEPROM = no +override CONFIG_OGP_SPI = no +override CONFIG_SATAMV = no +endif + # Bitbanging SPI infrastructure, default off unless needed. ifeq ($(CONFIG_RAYER_SPI), yes) override CONFIG_BITBANG_SPI = yes @@ -599,8 +627,7 @@ ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -# Actually, NEED_LIBPCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_LIBPCI += CONFIG_RAYER_SPI +NEED_RAW_ACCESS += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) @@ -782,10 +809,14 @@ ifneq ($(NEED_LIBPCI), ) CHECK_LIBPCI = yes +# This is a dirty hack, but it saves us from checking all PCI drivers and all platforms manually. +# libpci may need raw memory, MSR or PCI port I/O on some platforms. +# Individual drivers might have the same needs as well. +NEED_RAW_ACCESS += $(NEED_LIBPCI) FEATURE_CFLAGS += -D'NEED_PCI=1' FEATURE_CFLAGS += $(call debug_shell,grep -q "OLD_PCI_GET_DEV := yes" .libdeps && printf "%s" "-D'OLD_PCI_GET_DEV=1'") -PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o +PROGRAMMER_OBJS += pcidev.o ifeq ($(TARGET_OS), NetBSD) # The libpci we want is called libpciutils on NetBSD and needs NetBSD libpci. PCILIBS += -lpciutils -lpci @@ -807,6 +838,11 @@ endif endif +ifneq ($(NEED_RAW_ACCESS), ) +FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' +PROGRAMMER_OBJS += physmap.o hwaccess.o +endif + ifneq ($(NEED_LIBUSB0), ) CHECK_LIBUSB0 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB0=1' @@ -992,7 +1028,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libpci: $(NEED_LIBPCI)."; \ - echo "Please install libpci headers."; \ + echo "Please install libpci headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBPCI_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @printf "Checking version of pci_get_dev... " | tee -a $(BUILD_DETAILS_FILE) @@ -1010,7 +1047,8 @@ $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >&2 && \ echo "yes." && echo "NEEDLIBZ := yes" > .libdeps } || { echo "no."; echo; \ echo "The following features require libpci: $(NEED_LIBPCI)."; \ - echo "Please install libpci (package pciutils) and/or libz."; \ + echo "Please install libpci (package pciutils) and/or libz or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBPCI_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .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.o .test$(EXEC_SUFFIX) @@ -1022,7 +1060,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 headers or libusb-compat headers."; \ + echo "Please install libusb-0.1 headers or libusb-compat headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB0_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @printf "Checking if libusb-0.1 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1030,7 +1069,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 or libusb-compat."; \ + echo "Please install libusb-0.1 or libusb-compat or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB0_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .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.o .test$(EXEC_SUFFIX) @@ -1042,7 +1082,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0 headers."; \ + echo "Please install libusb-1.0 headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB1_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @printf "Checking if libusb-1.0 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1050,7 +1091,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0."; \ + echo "Please install libusb-1.0 or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB1_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .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.o .test$(EXEC_SUFFIX) Index: flashrom-libpci_libusb_global_disable/hwaccess.h =================================================================== --- flashrom-libpci_libusb_global_disable/hwaccess.h (Revision 1926) +++ flashrom-libpci_libusb_global_disable/hwaccess.h (Arbeitskopie) @@ -196,7 +196,7 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_PCI == 1 +#if NEED_RAW_ACCESS == 1 #if IS_X86 /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). @@ -376,6 +376,6 @@ #error Unknown architecture, please check if it supports PCI port IO. #endif /* IS_* */ -#endif /* NEED_PCI == 1 */ +#endif /* NEED_RAW_ACCESS == 1 */ #endif /* !__HWACCESS_H__ */

2 5

[commit] r1936 - trunk
by repository service 20 Feb '16

20 Feb '16

Author: hailfinger Date: Sat Feb 20 23:28:16 2016 New Revision: 1936 URL: http://flashrom.org/trac/flashrom/changeset/1936 Log: Allow global disable of all drivers requiring libusb* or libpci This is especially helpful for compile tests with CONFIG_EVERYTHING=yes, but can also be used without CONFIG_EVERYTHING. Usage: make CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Feb 20 23:04:39 2016 (r1935) +++ trunk/Makefile Sat Feb 20 23:28:16 2016 (r1936) @@ -542,6 +542,33 @@ $(eval $(var)=yes))) endif +# Disable feature groups +ifeq ($(CONFIG_ENABLE_LIBUSB0_PROGRAMMERS), no) +override CONFIG_PICKIT2_SPI = no +endif +ifeq ($(CONFIG_ENABLE_LIBUSB1_PROGRAMMERS), no) +override CONFIG_CH341A_SPI = no +override CONFIG_DEDIPROG = no +endif +ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no) +override CONFIG_INTERNAL = no +override CONFIG_NIC3COM = no +override CONFIG_GFXNVIDIA = no +override CONFIG_SATASII = no +override CONFIG_ATAHPT = no +override CONFIG_ATAVIA = no +override CONFIG_ATAPROMISE = no +override CONFIG_IT8212 = no +override CONFIG_DRKAISER = no +override CONFIG_NICREALTEK = no +override CONFIG_NICNATSEMI = no +override CONFIG_NICINTEL = no +override CONFIG_NICINTEL_SPI = no +override CONFIG_NICINTEL_EEPROM = no +override CONFIG_OGP_SPI = no +override CONFIG_SATAMV = no +endif + # Bitbanging SPI infrastructure, default off unless needed. ifeq ($(CONFIG_RAYER_SPI), yes) override CONFIG_BITBANG_SPI = yes @@ -1018,7 +1045,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libpci: $(NEED_LIBPCI)."; \ - echo "Please install libpci headers."; \ + echo "Please install libpci headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @printf "Checking version of pci_get_dev... " | tee -a $(BUILD_DETAILS_FILE) @@ -1036,7 +1064,8 @@ $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >&2 && \ echo "yes." && echo "NEEDLIBZ := yes" > .libdeps } || { echo "no."; echo; \ echo "The following features require libpci: $(NEED_LIBPCI)."; \ - echo "Please install libpci (package pciutils) and/or libz."; \ + echo "Please install libpci (package pciutils) and/or libz or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .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.o .test$(EXEC_SUFFIX) @@ -1048,7 +1077,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 headers or libusb-compat headers."; \ + echo "Please install libusb-0.1 headers or libusb-compat headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @printf "Checking if libusb-0.1 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1056,7 +1086,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 or libusb-compat."; \ + echo "Please install libusb-0.1 or libusb-compat or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .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.o .test$(EXEC_SUFFIX) @@ -1068,7 +1099,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0 headers."; \ + echo "Please install libusb-1.0 headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @printf "Checking if libusb-1.0 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1076,7 +1108,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0."; \ + echo "Please install libusb-1.0 or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no"; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .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.o .test$(EXEC_SUFFIX)

1 0

[PATCH] Automatically disable atapromise on non-x86
by Carl-Daniel Hailfinger 20 Feb '16

20 Feb '16

We do not support PCI port I/O on non-x86 (yet). Atapromise needs PCI port I/O. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-atapromise_x86_only/Makefile =================================================================== --- flashrom-atapromise_x86_only/Makefile (Revision 1933) +++ flashrom-atapromise_x86_only/Makefile (Arbeitskopie) @@ -387,6 +387,11 @@ else override CONFIG_ATAHPT = no endif +ifeq ($(CONFIG_ATAPROMISE), yes) +UNSUPPORTED_FEATURES += CONFIG_ATAPROMISE=yes +else +override CONFIG_ATAPROMISE = no +endif ifeq ($(CONFIG_SATAMV), yes) UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes else

2 2

[commit] r1935 - trunk
by repository service 20 Feb '16

20 Feb '16

Author: hailfinger Date: Sat Feb 20 23:04:39 2016 New Revision: 1935 URL: http://flashrom.org/trac/flashrom/changeset/1935 Log: Automatically disable atapromise on non-x86 We do not support PCI port I/O on non-x86 (yet). Atapromise needs PCI port I/O. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Feb 20 22:43:56 2016 (r1934) +++ trunk/Makefile Sat Feb 20 23:04:39 2016 (r1935) @@ -396,6 +396,11 @@ else override CONFIG_ATAHPT = no endif +ifeq ($(CONFIG_ATAPROMISE), yes) +UNSUPPORTED_FEATURES += CONFIG_ATAPROMISE=yes +else +override CONFIG_ATAPROMISE = no +endif ifeq ($(CONFIG_SATAMV), yes) UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes else

1 0

[PATCH] Do not require PCI code for RayeR SPI driver
by Carl-Daniel Hailfinger 20 Feb '16

20 Feb '16

This patch depends on Re: [flashrom] [PATCH] List affected features for missing libraries CONFIG_RAYER_SPI only needs raw hardware access, but not libpci. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> diff -ur flashrom-libpci_libusb_report_requirements/hwaccess.h flashrom-rayer_do_not_require_libpci/hwaccess.h --- flashrom-libpci_libusb_report_requirements/hwaccess.h 2016-02-17 00:26:07.221475948 +0100 +++ flashrom-rayer_do_not_require_libpci/hwaccess.h 2016-02-17 01:09:53.270497512 +0100 @@ -196,7 +196,7 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_PCI == 1 +#if NEED_RAW_ACCESS == 1 #if IS_X86 /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). @@ -376,6 +376,6 @@ #error Unknown architecture, please check if it supports PCI port IO. #endif /* IS_* */ -#endif /* NEED_PCI == 1 */ +#endif /* NEED_RAW_ACCESS == 1 */ #endif /* !__HWACCESS_H__ */ diff -ur flashrom-libpci_libusb_report_requirements/Makefile flashrom-rayer_do_not_require_libpci/Makefile --- flashrom-libpci_libusb_report_requirements/Makefile 2016-02-17 00:26:37.497626067 +0100 +++ flashrom-rayer_do_not_require_libpci/Makefile 2016-02-17 00:52:46.457405821 +0100 @@ -599,8 +599,7 @@ ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -# Actually, NEED_LIBPCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_LIBPCI += CONFIG_RAYER_SPI +NEED_RAW_ACCESS += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) @@ -782,10 +781,14 @@ ifneq ($(NEED_LIBPCI), ) CHECK_LIBPCI = yes +# This is a dirty hack, but it saves us from checking all PCI drivers and all platforms manually. +# libpci may need raw memory, MSR or PCI port I/O on some platforms. +# Individual drivers might have the same needs as well. +NEED_RAW_ACCESS += $(NEED_LIBPCI) FEATURE_CFLAGS += -D'NEED_PCI=1' FEATURE_CFLAGS += $(call debug_shell,grep -q "OLD_PCI_GET_DEV := yes" .libdeps && printf "%s" "-D'OLD_PCI_GET_DEV=1'") -PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o +PROGRAMMER_OBJS += pcidev.o ifeq ($(TARGET_OS), NetBSD) # The libpci we want is called libpciutils on NetBSD and needs NetBSD libpci. PCILIBS += -lpciutils -lpci @@ -807,6 +810,11 @@ endif endif +ifneq ($(NEED_RAW_ACCESS), ) +FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' +PROGRAMMER_OBJS += physmap.o hwaccess.o +endif + ifneq ($(NEED_LIBUSB0), ) CHECK_LIBUSB0 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB0=1'

2 7

[commit] r1934 - trunk
by repository service 20 Feb '16

20 Feb '16

Author: hailfinger Date: Sat Feb 20 22:43:56 2016 New Revision: 1934 URL: http://flashrom.org/trac/flashrom/changeset/1934 Log: Do not require PCI code for RayeR SPI driver CONFIG_RAYER_SPI only needs raw hardware access, but not libpci. Disable CONFIG_RAYER_SPI on Android because of missing inb/outb. Introduce NEED_RAW_ACCESS for raw memory access, PCI port I/O and MSR access. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/Makefile trunk/hwaccess.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Feb 20 21:53:46 2016 (r1933) +++ trunk/Makefile Sat Feb 20 22:43:56 2016 (r1934) @@ -349,6 +349,15 @@ endif endif +ifeq ($(TARGET_OS), Android) +# Android on x86 (currently) does not provide raw PCI port I/O operations +ifeq ($(CONFIG_RAYER_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes +else +override CONFIG_RAYER_SPI = no +endif +endif + ############################################################################### # General architecture-specific settings. # Like above for the OS, below we verify user-supplied options depending on the target architecture. @@ -599,8 +608,7 @@ ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -# Actually, NEED_LIBPCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_LIBPCI += CONFIG_RAYER_SPI +NEED_RAW_ACCESS += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) @@ -782,19 +790,31 @@ ifneq ($(NEED_LIBPCI), ) CHECK_LIBPCI = yes +# This is a dirty hack, but it saves us from checking all PCI drivers and all platforms manually. +# libpci may need raw memory, MSR or PCI port I/O on some platforms. +# Individual drivers might have the same needs as well. +NEED_RAW_ACCESS += $(NEED_LIBPCI) FEATURE_CFLAGS += -D'NEED_PCI=1' FEATURE_CFLAGS += $(call debug_shell,grep -q "OLD_PCI_GET_DEV := yes" .libdeps && printf "%s" "-D'OLD_PCI_GET_DEV=1'") -PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o +PROGRAMMER_OBJS += pcidev.o ifeq ($(TARGET_OS), NetBSD) # The libpci we want is called libpciutils on NetBSD and needs NetBSD libpci. PCILIBS += -lpciutils -lpci -# For (i386|x86_64)_iopl(2). -PCILIBS += -l$(shell uname -p) else - PCILIBS += -lpci +endif +endif +ifneq ($(NEED_RAW_ACCESS), ) +# Raw memory, MSR or PCI port I/O access. +FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' +PROGRAMMER_OBJS += physmap.o hwaccess.o + +ifeq ($(TARGET_OS), NetBSD) +# For (i386|x86_64)_iopl(2). +PCILIBS += -l$(shell uname -p) +else ifeq ($(TARGET_OS), OpenBSD) # For (i386|amd64)_iopl(2). PCILIBS += -l$(shell uname -m) @@ -805,6 +825,7 @@ endif endif endif + endif ifneq ($(NEED_LIBUSB0), ) Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Sat Feb 20 21:53:46 2016 (r1933) +++ trunk/hwaccess.h Sat Feb 20 22:43:56 2016 (r1934) @@ -196,7 +196,7 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_PCI == 1 +#if NEED_RAW_ACCESS == 1 #if IS_X86 /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). @@ -230,6 +230,7 @@ * out[bwl] definitions in machine/cpufunc.h and sys/io.h at least in some * versions. Use machine/cpufunc.h only for plain FreeBSD/DragonFlyBSD. */ + #include <sys/types.h> #include <machine/cpufunc.h> #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0) #define OUTW(x, y) do { u_int outw_tmp = (y); outw(outw_tmp, (x)); } while (0) @@ -382,6 +383,6 @@ #error Unknown architecture, please check if it supports PCI port IO. #endif /* IS_* */ -#endif /* NEED_PCI == 1 */ +#endif /* NEED_RAW_ACCESS == 1 */ #endif /* !__HWACCESS_H__ */

1 0

Re: [flashrom] [PATCH] dediprog: tremendously improve performance on SF600 by ignoring the spec.
by Stefan Tauner 20 Feb '16

20 Feb '16

On Sat, 20 Feb 2016 01:02:57 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > The solution was discovered in a collaborative bug hunt with testing done by > David Hendricks. The actual culprit was found by Urja Rannikko by comparing > my patch for vanilla flashrom with David's version in chromiumos. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Essentially this was tested already yesternight by David therefore I self-acked and committed it in r1933. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom