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

Code cleanup

Browse Source
This commit is contained in:
Wolfgang Denk 2006-08-27 18:10:01 +02:00
parent 3b0ff842bf
commit 16850919ff
9 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Code cleanup
* Update for MCC200 / PRS200 boards: * Update for MCC200 / PRS200 boards:
- auto-adjust console device for Linux. - auto-adjust console device for Linux.
- fix typos. - fix typos.

60
board/amcc/common/flash.c
View File

@ -35,7 +35,7 @@
#include <ppc4xx.h> #include <ppc4xx.h>
#include <asm/processor.h> #include <asm/processor.h>
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Functions * Functions
@ -76,7 +76,7 @@ void flash_print_info(flash_info_t * info)
case FLASH_MAN_SST: case FLASH_MAN_SST:
printf("SST "); printf("SST ");
break; break;
case FLASH_MAN_MX: case FLASH_MAN_MX:
printf ("MACRONIX "); printf ("MACRONIX ");
break; break;
default: default:
@ -223,75 +223,75 @@ static ulong flash_get_size(vu_long * addr, flash_info_t * info)
return (0); /* no or unknown flash */ return (0); /* no or unknown flash */
} }
value = addr2[1]; /* device ID */ value = addr2[1]; /* device ID */
DEBUGF("\nFLASH DEVICEID: %x\n", value); DEBUGF("\nFLASH DEVICEID: %x\n", value);
switch (value) { switch (value) {
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV040B: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV040B:
info->flash_id += FLASH_AM040; info->flash_id += FLASH_AM040;
info->sector_count = 8; info->sector_count = 8;
info->size = 0x0080000; /* => 512 ko */ info->size = 0x0080000; /* => 512 KiB */
break; break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_F040B: case (CFG_FLASH_WORD_SIZE) AMD_ID_F040B:
info->flash_id += FLASH_AM040; info->flash_id += FLASH_AM040;
info->sector_count = 8; info->sector_count = 8;
info->size = 0x0080000; /* => 512 ko */ info->size = 0x0080000; /* => 512 KiB */
break; break;
case (CFG_FLASH_WORD_SIZE) STM_ID_M29W040B: case (CFG_FLASH_WORD_SIZE) STM_ID_M29W040B:
info->flash_id += FLASH_AM040; info->flash_id += FLASH_AM040;
info->sector_count = 8; info->sector_count = 8;
info->size = 0x0080000; /* => 512 ko */ info->size = 0x0080000; /* => 512 KiB */
break; break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_F016D: case (CFG_FLASH_WORD_SIZE) AMD_ID_F016D:
info->flash_id += FLASH_AMD016; info->flash_id += FLASH_AMD016;
info->sector_count = 32; info->sector_count = 32;
info->size = 0x00200000; info->size = 0x00200000; /* => 2 MiB */
break; /* => 2 MB */ break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV033C: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV033C:
info->flash_id += FLASH_AMDLV033C; info->flash_id += FLASH_AMDLV033C;
info->sector_count = 64; info->sector_count = 64;
info->size = 0x00400000; info->size = 0x00400000; /* => 4 MiB */
break; /* => 4 MB */ break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV400T: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV400T:
info->flash_id += FLASH_AM400T; info->flash_id += FLASH_AM400T;
info->sector_count = 11; info->sector_count = 11;
info->size = 0x00080000; info->size = 0x00080000; /* => 512 KiB */
break; /* => 0.5 MB */ break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV400B: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV400B:
info->flash_id += FLASH_AM400B; info->flash_id += FLASH_AM400B;
info->sector_count = 11; info->sector_count = 11;
info->size = 0x00080000; info->size = 0x00080000; /* => 512 KiB */
break; /* => 0.5 MB */ break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV800T: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV800T:
info->flash_id += FLASH_AM800T; info->flash_id += FLASH_AM800T;
info->sector_count = 19; info->sector_count = 19;
info->size = 0x00100000; info->size = 0x00100000; /* => 1 MiB */
break; /* => 1 MB */ break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV800B: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV800B:
info->flash_id += FLASH_AM800B; info->flash_id += FLASH_AM800B;
info->sector_count = 19; info->sector_count = 19;
info->size = 0x00100000; info->size = 0x00100000; /* => 1 MiB */
break; /* => 1 MB */ break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV160T: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV160T:
info->flash_id += FLASH_AM160T; info->flash_id += FLASH_AM160T;
info->sector_count = 35; info->sector_count = 35;
info->size = 0x00200000; info->size = 0x00200000; /* => 2 MiB */
break; /* => 2 MB */ break;
case (CFG_FLASH_WORD_SIZE) AMD_ID_LV160B: case (CFG_FLASH_WORD_SIZE) AMD_ID_LV160B:
info->flash_id += FLASH_AM160B; info->flash_id += FLASH_AM160B;
info->sector_count = 35; info->sector_count = 35;
info->size = 0x00200000; info->size = 0x00200000; /* => 2 MiB */
break; /* => 2 MB */ break;
default: default:
info->flash_id = FLASH_UNKNOWN; info->flash_id = FLASH_UNKNOWN;
@ -306,7 +306,7 @@ static ulong flash_get_size(vu_long * addr, flash_info_t * info)
info->start[i] = base + (i * 0x00010000); info->start[i] = base + (i * 0x00010000);
} else { } else {
if (info->flash_id & FLASH_BTYPE) { if (info->flash_id & FLASH_BTYPE) {
/* set sector offsets for bottom boot block type */ /* set sector offsets for bottom boot block type */
info->start[0] = base + 0x00000000; info->start[0] = base + 0x00000000;
info->start[1] = base + 0x00004000; info->start[1] = base + 0x00004000;
info->start[2] = base + 0x00006000; info->start[2] = base + 0x00006000;
@ -316,7 +316,7 @@ static ulong flash_get_size(vu_long * addr, flash_info_t * info)
base + (i * 0x00010000) - 0x00030000; base + (i * 0x00010000) - 0x00030000;
} }
} else { } else {
/* set sector offsets for top boot block type */ /* set sector offsets for top boot block type */
i = info->sector_count - 1; i = info->sector_count - 1;
info->start[i--] = base + info->size - 0x00004000; info->start[i--] = base + info->size - 0x00004000;
info->start[i--] = base + info->size - 0x00006000; info->start[i--] = base + info->size - 0x00006000;
@ -666,7 +666,7 @@ static ulong flash_get_size_2(vu_long * addr, flash_info_t * info)
return (0); /* no or unknown flash */ return (0); /* no or unknown flash */
} }
value = addr2[1]; /* device ID */ value = addr2[1]; /* device ID */
DEBUGF("\nFLASH DEVICEID: %x\n", value); DEBUGF("\nFLASH DEVICEID: %x\n", value);
@ -675,17 +675,17 @@ static ulong flash_get_size_2(vu_long * addr, flash_info_t * info)
case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320T: case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320T:
info->flash_id += FLASH_AM320T; info->flash_id += FLASH_AM320T;
info->sector_count = 71; info->sector_count = 71;
info->size = 0x00400000; break; /* => 4 MB */ info->size = 0x00400000; break; /* => 4 MiB */
case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320B: case (CFG_FLASH_WORD_SIZE)AMD_ID_LV320B:
info->flash_id += FLASH_AM320B; info->flash_id += FLASH_AM320B;
info->sector_count = 71; info->sector_count = 71;
info->size = 0x00400000; break; /* => 4 MB */ info->size = 0x00400000; break; /* => 4 MiB */
case (CFG_FLASH_WORD_SIZE)STM_ID_29W320DT: case (CFG_FLASH_WORD_SIZE)STM_ID_29W320DT:
info->flash_id += FLASH_STMW320DT; info->flash_id += FLASH_STMW320DT;
info->sector_count = 67; info->sector_count = 67;
info->size = 0x00400000; break; /* => 4 MB */ info->size = 0x00400000; break; /* => 4 MiB */
case (CFG_FLASH_WORD_SIZE)MX_ID_LV320T: case (CFG_FLASH_WORD_SIZE)MX_ID_LV320T:
info->flash_id += FLASH_MXLV320T; info->flash_id += FLASH_MXLV320T;
@ -743,7 +743,7 @@ static ulong flash_get_size_2(vu_long * addr, flash_info_t * info)
info->start[i] = base + i * 0x00010000; info->start[i] = base + i * 0x00010000;
} else { } else {
if (info->flash_id & FLASH_BTYPE) { if (info->flash_id & FLASH_BTYPE) {
/* set sector offsets for bottom boot block type */ /* set sector offsets for bottom boot block type */
info->start[0] = base + 0x00000000; info->start[0] = base + 0x00000000;
info->start[1] = base + 0x00004000; info->start[1] = base + 0x00004000;
info->start[2] = base + 0x00006000; info->start[2] = base + 0x00006000;
@ -753,7 +753,7 @@ static ulong flash_get_size_2(vu_long * addr, flash_info_t * info)
base + (i * 0x00010000) - 0x00030000; base + (i * 0x00010000) - 0x00030000;
} }
} else { } else {
/* set sector offsets for top boot block type */ /* set sector offsets for top boot block type */
i = info->sector_count - 1; i = info->sector_count - 1;
info->start[i--] = base + info->size - 0x00004000; info->start[i--] = base + info->size - 0x00004000;
info->start[i--] = base + info->size - 0x00006000; info->start[i--] = base + info->size - 0x00006000;

4
board/tqm5200/tqm5200.c
View File

@ -757,5 +757,5 @@ int board_early_init_f (void)
return 0; return 0;
} }
#endif #endif /* CONFIG_FO300 */
#endif #endif /* CONFIG_BOARD_EARLY_INIT_F */