Sync with upstream

.github/workflows/build.yml

@@ -15,24 +15,30 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install build dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y git build-essential debhelper pkg-config libpci-dev libusb-1.0-0-dev libftdi1-dev meson
 
       - name: Build Flashrom
-        run: make
+        run: |
+          meson setup builddir
+          meson compile -C builddir
+
+      - name: Test Flashrom
+        run: |
+          meson test -C builddir
 
       - name: Save Flashrom binary as artifact
         run: |
           mkdir artifacts
-          mv flashrom artifacts/
+          mv builddir/flashrom artifacts/
         continue-on-error: true  # Allow workflow to continue even if 'flashrom' doesn't exist
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: flashrom-artifact
           path: artifacts/

.gitignore

@@ -1,6 +1,6 @@
 *.d
-!Makefile.d/
 *.o
+/.doctrees
 /.features
 /.dependencies
 /.libdeps
@@ -9,8 +9,10 @@
 /flashrom-*
 /flashrom.exe
 /flashrom.8
+/flashrom.bash
 /libflashrom.a
 /libflashrom-doc/
+/man8
 
 /util/ich_descriptors_tool/ich_descriptors_tool
 /util/ich_descriptors_tool/ich_descriptors_tool.exe

82802ab.c

@@ -45,19 +45,19 @@ int probe_82802ab(struct flashctx *flash)
 
 	/* Reset to get a clean state */
 	chip_writeb(flash, 0xFF, bios);
-	programmer_delay(10);
+	programmer_delay(flash, 10);
 
 	/* Enter ID mode */
 	chip_writeb(flash, 0x90, bios);
-	programmer_delay(10);
+	programmer_delay(flash, 10);
 
 	id1 = chip_readb(flash, bios + (0x00 << shifted));
 	id2 = chip_readb(flash, bios + (0x01 << shifted));
 
 	/* Leave ID mode */
 	chip_writeb(flash, 0xFF, bios);
 
-	programmer_delay(10);
+	programmer_delay(flash, 10);
 
 	msg_cdbg("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2);
 
@@ -114,7 +114,7 @@ int erase_block_82802ab(struct flashctx *flash, unsigned int page,
 	// now start it
 	chip_writeb(flash, 0x20, bios + page);
 	chip_writeb(flash, 0xd0, bios + page);
-	programmer_delay(10);
+	programmer_delay(flash, 10);
 
 	// now let's see what the register is
 	status = wait_82802ab(flash);
@@ -142,7 +142,7 @@ int write_82802ab(struct flashctx *flash, const uint8_t *src, unsigned int start
 	return 0;
 }
 
-int unlock_28f004s5(struct flashctx *flash)
+static int unlock_28f004s5(struct flashctx *flash)
 {
 	chipaddr bios = flash->virtual_memory;
 	uint8_t mcfg, bcfg;
@@ -195,7 +195,7 @@ int unlock_28f004s5(struct flashctx *flash)
 	return 0;
 }
 
-int unlock_lh28f008bjt(struct flashctx *flash)
+static int unlock_lh28f008bjt(struct flashctx *flash)
 {
 	chipaddr bios = flash->virtual_memory;
 	uint8_t mcfg, bcfg;
@@ -249,3 +249,12 @@ int unlock_lh28f008bjt(struct flashctx *flash)
 
 	return 0;
 }
+
+blockprotect_func_t *lookup_82802ab_blockprotect_func_ptr(const struct flashchip *const chip)
+{
+	switch (chip->unlock) {
+		case UNLOCK_28F004S5: return unlock_28f004s5;
+		case UNLOCK_LH28F008BJT: return unlock_lh28f008bjt;
+		default: return NULL; /* fallthough */
+	};
+}