rm hard coded image id in 8266

Author: brianignacio5

src/esploader.ts

@@ -692,10 +692,7 @@ export class ESPLoader {
     try {
       this.info("Detecting chip type... ");
       const chipID = await this.getChipId();
-      const filteredROMList = ROM_LIST.filter(
-        (n) => n.CHIP_NAME !== "ESP8266" && n.CHIP_NAME !== "ESP32" && n.CHIP_NAME !== "ESP32-S2",
-      );
-      for (const cls of filteredROMList) {
+      for (const cls of ROM_LIST) {
         if (chipID === cls.IMAGE_CHIP_ID) {
           this.chip = cls;
           break;

src/image/esp32.ts

@@ -301,7 +301,7 @@ export class ESP32FirmwareImage extends BaseFirmwareImage {
     [this.hdDrv, this.wpDrv] = this.splitByte(hdConfig);
 
     this.chipId = view.getUint8(4);
-    if (this.chipId !== this.ROM_LOADER.IMAGE_CHIP_ID) {
+    if (this.ROM_LOADER.IMAGE_CHIP_ID !== undefined && this.chipId !== this.ROM_LOADER.IMAGE_CHIP_ID) {
       console.warn(
         `Unexpected chip id in image. Expected ${this.ROM_LOADER.IMAGE_CHIP_ID} but value was ${this.chipId}. ` +
           "Is this image for a different chip model?",
@@ -330,7 +330,7 @@ export class ESP32FirmwareImage extends BaseFirmwareImage {
     view.setUint8(2, this.joinByte(this.dDrv, this.csDrv));
     view.setUint8(3, this.joinByte(this.hdDrv, this.wpDrv));
 
-    view.setUint8(4, this.ROM_LOADER.IMAGE_CHIP_ID);
+    view.setUint8(4, this.ROM_LOADER.IMAGE_CHIP_ID ?? 0);
     view.setUint8(5, this.minRev);
     view.setUint16(6, this.minRevFull, true);
     view.setUint16(8, this.maxRevFull, true);

src/targets/esp8266.ts

@@ -50,7 +50,6 @@ export class ESP8266ROM extends ROM {
   public SPI_USR2_OFFS = 0x24;
   public SPI_MOSI_DLEN_OFFS = 0; // not in esp8266
   public SPI_MISO_DLEN_OFFS = 0; // not in esp8266
-  public IMAGE_CHIP_ID = 9999; // not in esp8266
   public SPI_W0_OFFS = 0x40;
 
   public async readEfuse(loader: ESPLoader, offset: number): Promise<number> {

src/targets/rom.ts

@@ -101,7 +101,7 @@ export abstract class ROM {
   // abstract EFUSE_RD_REG_BASE: number; //esp32
 
   abstract FLASH_WRITE_SIZE: number;
-  abstract IMAGE_CHIP_ID: number; // not in esp8266
+  IMAGE_CHIP_ID?: number; // not in esp8266, optional for other chips
   abstract SPI_MOSI_DLEN_OFFS: number; // not in esp8266
   abstract SPI_MISO_DLEN_OFFS: number; // not in esp8266
   abstract SPI_REG_BASE: number;