[flashrom-gerrit] Change in flashrom[master]: spi25: Merge remainder of spi4ba in