Strip package prefix in constant names (everything before "28F").
Prefix every constant name with I_ as in "Intel". Sort intel chip constants by id. Rename the following constants to their "canonical" name: P28F400BT (0x70) -> I_28F400T (28F400BV/BX/CE/CV-T) P28F400BB (0x71) -> I_28F400B (28F400BV/BX/CE/CV-B) P28F004BT (0x78) -> I_28F004T (28F004B5/BE/BV/BX-T) P28F004BB (0x79) -> I_28F004B (28F004B5/BE/BV/BX-B) E_28F008S5 (0xA6) -> I_28F008S3 (28F008S3/S5/SC) E_28F004S5 (0xA7) -> I_28F004S3 (28F008S3/S5/SC) P28F001BXT (0x94) -> I_28F001T (28F001BN/BX-T) P28F001BXB (0x95) -> I_28F001B (28F001BN/BX-B) E_28F016S5 (0xAA) -> I_28F016S3 (28F016S3/S5/SC) Also add chip ids for the following chips: 28F320J5 28F640J5 28F320J3 28F640J3 28F128J3 28F256J3 28F200BL/BV/BX/CV-T 28F200BL/BV/BX/CV-B 28F002BC/BL/BV/BX-T 28F002BL/BV/BX-B 28F008BE/BV-T 28F008BE/BV-B 28F800B5/BV/CE/CV-T 28F800B5/BV/CE/CV-B 28F016SA/SV 28F008SA 28F008S3/S5/SC 28F008S3/S5/SC 28F016XS 28F010 28F512 28F256A 28F020 28F016B3-T 28F016B3-B 28F008B3-T 28F008B3-B 28F004B3-T 28F004B3-B Signed-off-by: Mattias Mattsson <[email protected]> Index: flashchips.c =================================================================== --- flashchips.c (revision 1092) +++ flashchips.c (working copy) @@ -2499,10 +2499,10 @@ { .vendor = "Intel", - .name = "28F001BX-B", + .name = "28F001BN/BX-B", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = INTEL_ID, - .model_id = P28F001BXB, + .model_id = I_28F001B, .total_size = 128, .page_size = 128 * 1024, /* 8k + 2x4k + 112k */ .tested = TEST_UNTESTED, @@ -2525,10 +2525,10 @@ { .vendor = "Intel", - .name = "28F001BX-T", + .name = "28F001BN/BX-T", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = INTEL_ID, - .model_id = P28F001BXT, + .model_id = I_28F001T, .total_size = 128, .page_size = 128 * 1024, /* 112k + 2x4k + 8k */ .tested = TEST_UNTESTED, @@ -2551,10 +2551,10 @@ { .vendor = "Intel", - .name = "28F004S5", + .name = "28F008S3/S5/SC", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = INTEL_ID, - .model_id = E_28F004S5, + .model_id = I_28F004S3, .total_size = 512, .page_size = 256, .tested = TEST_UNTESTED, @@ -2574,10 +2574,10 @@ { .vendor = "Intel", - .name = "28F004BV/BE-B", + .name = "28F004B5/BE/BV/BX-B", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = INTEL_ID, - .model_id = P28F004BB, + .model_id = I_28F004B, .total_size = 512, .page_size = 128 * 1024, /* maximal block size */ .tested = TEST_UNTESTED, @@ -2601,10 +2601,10 @@ { .vendor = "Intel", - .name = "28F004BV/BE-T", + .name = "28F004B5/BE/BV/BX-T", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = INTEL_ID, - .model_id = P28F004BT, + .model_id = I_28F004T, .total_size = 512, .page_size = 128 * 1024, /* maximal block size */ .tested = TEST_UNTESTED, @@ -2628,10 +2628,10 @@ { .vendor = "Intel", - .name = "28F400BV/CV/CE-B", + .name = "28F400BV/BX/CE/CV-B", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = INTEL_ID, - .model_id = P28F400BB, + .model_id = I_28F400B, .total_size = 512, .page_size = 128 * 1024, /* maximal block size */ .feature_bits = FEATURE_ADDR_SHIFTED, @@ -2656,10 +2656,10 @@ { .vendor = "Intel", - .name = "28F400BV/CV/CE-T", + .name = "28F400BV/BX/CE/CV-T", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = INTEL_ID, - .model_id = P28F400BT, + .model_id = I_28F400T, .total_size = 512, .page_size = 128 * 1024, /* maximal block size */ .feature_bits = FEATURE_ADDR_SHIFTED, Index: flashchips.h =================================================================== --- flashchips.h (revision 1092) +++ flashchips.h (working copy) @@ -256,17 +256,45 @@ #define IM_29F004T 0xAF #define INTEL_ID 0x89 /* Intel */ +#define I_28F320J5 0x14 +#define I_28F640J5 0x15 +#define I_28F320J3 0x16 +#define I_28F640J3 0x17 +#define I_28F128J3 0x18 +#define I_28F256J3 0x1D +#define I_28F400T 0x70 /* 28F400BV/BX/CE/CV-T */ +#define I_28F400B 0x71 /* 28F400BV/BX/CE/CV-B */ +#define I_28F200T 0x74 /* 28F200BL/BV/BX/CV-T */ +#define I_28F200B 0x75 /* 28F200BL/BV/BX/CV-B */ +#define I_28F004T 0x78 /* 28F004B5/BE/BV/BX-T */ +#define I_28F004B 0x79 /* 28F004B5/BE/BV/BX-B */ +#define I_28F002T 0x7C /* 28F002BC/BL/BV/BX-T */ +#define I_28F002B 0x7D /* 28F002BL/BV/BX-B */ +#define I_28F001T 0x94 /* 28F001BN/BX-T */ +#define I_28F001B 0x95 /* 28F001BN/BX-B */ +#define I_28F008T 0x98 /* 28F008BE/BV-T */ +#define I_28F008B 0x99 /* 28F008BE/BV-B */ +#define I_28F800T 0x9C /* 28F800B5/BV/CE/CV-T */ +#define I_28F800B 0x9D /* 28F800B5/BV/CE/CV-B */ +#define I_28F016SV 0xA0 /* 28F016SA/SV */ +#define I_28F008SA 0xA2 +#define I_28F008S3 0xA6 /* 28F008S3/S5/SC */ +#define I_28F004S3 0xA7 /* 28F008S3/S5/SC */ +#define I_28F016XS 0xA8 +#define I_28F016S3 0xAA /* 28F016S3/S5/SC */ +#define I_82802AC 0xAC #define I_82802AB 0xAD -#define I_82802AC 0xAC -#define E_28F004S5 0xA7 -#define E_28F008S5 0xA6 -#define E_28F016S5 0xAA -#define P28F001BXT 0x94 /* 28F001BX-T */ -#define P28F001BXB 0x95 /* 28F001BX-B */ -#define P28F004BT 0x78 /* 28F004BV/BE-T */ -#define P28F004BB 0x79 /* 28F004BV/BE-B */ -#define P28F400BT 0x70 /* 28F400BV/CV/CE-T */ -#define P28F400BB 0x71 /* 28F400BV/CV/CE-B */ +#define I_28F010 0xB4 +#define I_28F512 0xB8 +#define I_28F256A 0xB9 +#define I_28F020 0xBD +#define I_28F016B3T 0xD0 /* 28F016B3-T */ +#define I_28F016B3B 0xD1 /* 28F016B3-B */ +#define I_28F008B3T 0xD2 /* 28F008B3-T */ +#define I_28F008B3B 0xD3 /* 28F008B3-B */ +#define I_28F004B3T 0xD4 /* 28F004B3-T */ +#define I_28F004B3B 0xD5 /* 28F004B3-B */ + #define SHARP_LH28F008SA 0xA2 /* Sharp chip, Intel Vendor ID */ #define SHARP_LH28F008SC 0xA6 /* Sharp chip, Intel Vendor ID */ _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
