[flashrom] Two-branch development