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

jedec_flash: Only use manufacturer defines from common flash.h

Browse Source 
This patch removes the double defined manufacturer defines from
jedec_flash.c. Since the common defines in flash.h are 32bit
we now need the (16) cast. This patch also removes the compilation
warning (e.g. seen on hcu5):

./MAKEALL hcu5
Configuring for hcu5 board...
jedec_flash.c:219: warning: large integer implicitly truncated to unsigned type

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2009-01-29 11:21:38 +01:00
parent ec21d5cfcb
commit 28745db969
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mtd/jedec_flash.c
View File

@ -37,10 +37,6 @@
#define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY #define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY
/* Manufacturers */
#define MANUFACTURER_AMD 0x0001
#define MANUFACTURER_SST 0x00BF
/* AMD */ /* AMD */
#define AM29DL800BB 0x22CB #define AM29DL800BB 0x22CB
#define AM29DL800BT 0x224A #define AM29DL800BT 0x224A
@ -172,7 +168,7 @@ struct amd_flash_info {
static const struct amd_flash_info jedec_table[] = { static const struct amd_flash_info jedec_table[] = {
#ifdef CONFIG_SYS_FLASH_LEGACY_256Kx8 #ifdef CONFIG_SYS_FLASH_LEGACY_256Kx8
{ {
.mfr_id = MANUFACTURER_SST, .mfr_id = (u16)SST_MANUFACT,
.dev_id = SST39LF020, .dev_id = SST39LF020,
.name = "SST 39LF020", .name = "SST 39LF020",
.uaddr = { .uaddr = {
@ -188,7 +184,7 @@ static const struct amd_flash_info jedec_table[] = {
#endif #endif
#ifdef CONFIG_SYS_FLASH_LEGACY_512Kx8 #ifdef CONFIG_SYS_FLASH_LEGACY_512Kx8
{ {
.mfr_id = MANUFACTURER_AMD, .mfr_id = (u16)AMD_MANUFACT,
.dev_id = AM29LV040B, .dev_id = AM29LV040B,
.name = "AMD AM29LV040B", .name = "AMD AM29LV040B",
.uaddr = { .uaddr = {
@ -202,7 +198,7 @@ static const struct amd_flash_info jedec_table[] = {
} }
}, },
{ {
.mfr_id = MANUFACTURER_SST, .mfr_id = (u16)SST_MANUFACT,
.dev_id = SST39LF040, .dev_id = SST39LF040,
.name = "SST 39LF040", .name = "SST 39LF040",
.uaddr = { .uaddr = {
@ -216,7 +212,7 @@ static const struct amd_flash_info jedec_table[] = {
} }
}, },
{ {
.mfr_id = STM_MANUFACT, .mfr_id = (u16)STM_MANUFACT,
.dev_id = STM_ID_M29W040B, .dev_id = STM_ID_M29W040B,
.name = "ST Micro M29W040B", .name = "ST Micro M29W040B",
.uaddr = { .uaddr = {
@ -232,7 +228,7 @@ static const struct amd_flash_info jedec_table[] = {
#endif #endif
#ifdef CONFIG_SYS_FLASH_LEGACY_512Kx16 #ifdef CONFIG_SYS_FLASH_LEGACY_512Kx16
{ {
.mfr_id = MANUFACTURER_AMD, .mfr_id = (u16)AMD_MANUFACT,
.dev_id = AM29LV400BB, .dev_id = AM29LV400BB,
.name = "AMD AM29LV400BB", .name = "AMD AM29LV400BB",
.uaddr = { .uaddr = {
@ -249,7 +245,7 @@ static const struct amd_flash_info jedec_table[] = {
} }
}, },
{ {
.mfr_id = MANUFACTURER_AMD, .mfr_id = (u16)AMD_MANUFACT,
.dev_id = AM29LV800BB, .dev_id = AM29LV800BB,
.name = "AMD AM29LV800BB", .name = "AMD AM29LV800BB",
.uaddr = { .uaddr = {