imports: Keep up with flashrom
Update all the files under import/ from CHROMIUM flashrom.
All the files in import/ comes from commit 242b6ca6cfe72f2be329c87165d4220685f06d34
BUG=b:376929528
BUG=b:362686439
Cq-Depend: chromium:6275755
Change-Id: I93f7b31d783d54724afe4ec68d88cb92fb421bdf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/ap_wpsr/+/6276476
Reviewed-by: Jian-Jia Su <[email protected]>
Tested-by: Hsuan Ting Chen <[email protected]>
Commit-Queue: Jian-Jia Su <[email protected]>
Auto-Submit: Hsuan Ting Chen <[email protected]>
Commit-Queue: Hsuan Ting Chen <[email protected]>
diff --git a/imports/flashchips.c b/imports/flashchips.c
index 0e83200..ff2d834 100644
--- a/imports/flashchips.c
+++ b/imports/flashchips.c
@@ -20336,8 +20336,9 @@
.page_size = 256,
/* supports SFDP */
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
- .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA,
- .tested = TEST_OK_PREW,
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA | FEATURE_WRSR2
+ | FEATURE_WRSR3,
+ .tested = TEST_OK_PREWB,
.probe = PROBE_SPI_RDID,
.probe_timing = TIMING_ZERO,
.block_erasers =
@@ -20370,6 +20371,16 @@
.write = SPI_CHIP_WRITE256,
.read = SPI_CHIP_READ,
.voltage = {1650, 1950},
+ .reg_bits =
+ {
+ .srp = {STATUS1, 7, RW},
+ .srl = {STATUS2, 0, RW},
+ .bp = {{STATUS1, 2, RW}, {STATUS1, 3, RW}, {STATUS1, 4, RW}, {STATUS1, 5, RW}},
+ .tb = {STATUS1, 6, RW},
+ .cmp = {STATUS2, 6, RW},
+ .wps = {STATUS3, 2, RW},
+ },
+ .decode_range = DECODE_RANGE_SPI25,
},
{
diff --git a/imports/include/programmer.h b/imports/include/programmer.h
index bedf0e2..5422a57 100644
--- a/imports/include/programmer.h
+++ b/imports/include/programmer.h
@@ -550,13 +550,4 @@
(flash->chip->feature_bits & (FEATURE_4BA_ENTER | FEATURE_4BA_ENTER_WREN | FEATURE_4BA_ENTER_EAR7));
}
-/* usbdev.c */
-struct libusb_device_handle;
-struct libusb_context;
-struct libusb_device_handle *usb_dev_get_by_vid_pid_serial(
- struct libusb_context *usb_ctx, uint16_t vid, uint16_t pid, const char *serialno);
-struct libusb_device_handle *usb_dev_get_by_vid_pid_number(
- struct libusb_context *usb_ctx, uint16_t vid, uint16_t pid, unsigned int num);
-
-
#endif /* !__PROGRAMMER_H__ */
