minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

sf: eon/stmicro: inline useless ID defines

Browse Source 
These defines are used in only one place, so just inline them.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-04-23 23:05:58 +00:00 committed by Wolfgang Denk
parent b06afa75fa
commit fba2c44e46
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/spi/eon.c
View File

@ -23,8 +23,6 @@
#define CMD_EN25Q128_DP 0xb9 /* Deep Power-down */ #define CMD_EN25Q128_DP 0xb9 /* Deep Power-down */
#define CMD_EN25Q128_RES 0xab /* Release from DP, and Read Signature */ #define CMD_EN25Q128_RES 0xab /* Release from DP, and Read Signature */
#define EON_ID_EN25Q128 0x18
struct eon_spi_flash_params { struct eon_spi_flash_params {
u8 idcode1; u8 idcode1;
u16 page_size; u16 page_size;
@ -36,7 +34,7 @@ struct eon_spi_flash_params {
static const struct eon_spi_flash_params eon_spi_flash_table[] = { static const struct eon_spi_flash_params eon_spi_flash_table[] = {
{ {
.idcode1 = EON_ID_EN25Q128, .idcode1 = 0x18,
.page_size = 256, .page_size = 256,
.pages_per_sector = 16, .pages_per_sector = 16,
.sectors_per_block = 16, .sectors_per_block = 16,

25
drivers/mtd/spi/stmicro.c
View File

@ -46,15 +46,6 @@
#define CMD_M25PXX_DP 0xb9 /* Deep Power-down */ #define CMD_M25PXX_DP 0xb9 /* Deep Power-down */
#define CMD_M25PXX_RES 0xab /* Release from DP, and Read Signature */ #define CMD_M25PXX_RES 0xab /* Release from DP, and Read Signature */
#define STM_ID_M25P10 0x11
#define STM_ID_M25P16 0x15
#define STM_ID_M25P20 0x12
#define STM_ID_M25P32 0x16
#define STM_ID_M25P40 0x13
#define STM_ID_M25P64 0x17
#define STM_ID_M25P80 0x14
#define STM_ID_M25P128 0x18
struct stmicro_spi_flash_params { struct stmicro_spi_flash_params {
u8 idcode1; u8 idcode1;
u16 page_size; u16 page_size;
@ -65,56 +56,56 @@ struct stmicro_spi_flash_params {
static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = { static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
{ {
.idcode1 = STM_ID_M25P10, .idcode1 = 0x11,
.page_size = 256, .page_size = 256,
.pages_per_sector = 128, .pages_per_sector = 128,
.nr_sectors = 4, .nr_sectors = 4,
.name = "M25P10", .name = "M25P10",
}, },
{ {
.idcode1 = STM_ID_M25P16, .idcode1 = 0x15,
.page_size = 256, .page_size = 256,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 32, .nr_sectors = 32,
.name = "M25P16", .name = "M25P16",
}, },
{ {
.idcode1 = STM_ID_M25P20, .idcode1 = 0x12,
.page_size = 256, .page_size = 256,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 4, .nr_sectors = 4,
.name = "M25P20", .name = "M25P20",
}, },
{ {
.idcode1 = STM_ID_M25P32, .idcode1 = 0x16,
.page_size = 256, .page_size = 256,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 64, .nr_sectors = 64,
.name = "M25P32", .name = "M25P32",
}, },
{ {
.idcode1 = STM_ID_M25P40, .idcode1 = 0x13,
.page_size = 256, .page_size = 256,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 8, .nr_sectors = 8,
.name = "M25P40", .name = "M25P40",
}, },
{ {
.idcode1 = STM_ID_M25P64, .idcode1 = 0x17,
.page_size = 256, .page_size = 256,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 128, .nr_sectors = 128,
.name = "M25P64", .name = "M25P64",
}, },
{ {
.idcode1 = STM_ID_M25P80, .idcode1 = 0x14,
.page_size = 256, .page_size = 256,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 16, .nr_sectors = 16,
.name = "M25P80", .name = "M25P80",
}, },
{ {
.idcode1 = STM_ID_M25P128, .idcode1 = 0x18,
.page_size = 256, .page_size = 256,
.pages_per_sector = 1024, .pages_per_sector = 1024,
.nr_sectors = 64, .nr_sectors = 64,