April 2007 - U-Boot

Re: [U-Boot-Users] [PATCH] Fix use of "void *" for block dev read/write buffer pointers
by Grant Likely 12 Apr '07

12 Apr '07

On 4/12/07, Ben Warren <bwarren(a)qstreams.com> wrote: > > I'm by no means a git expert, but a lot of the git commands have a > '--signoff' switch that fills this stuff in for you. Very helpful for > pople like me that leve a leter out here and ther. heeheehee g.

1 0

[U-Boot-Users] Added a custodian status page to denx.de/UBoot
by Jerry Van Baren 12 Apr '07

12 Apr '07

Dear Fellow Custodians: With Wolfgang's blessing, I created a page on the UBoot TWiki so I could post status and ToDo information for u-boot-fdt. It is linked off the "Custodians" page (table). <http://www.denx.de/wiki/UBoot/Custodians> My thought is the custodian treas are a work-in-progress, so it would be good to show what the current state of progress is. I have turned the "Area/Subsystem" column entry for "u-boot-fdt" into a link to a "more info" page. I invite the other custodians to do the same, assuming that it is useful for the given custodian repository. Best regards, gvb

6 15

[U-Boot-Users] Seeking help in booting linux on a virtual platform
by Chinmay Upadhyaya 12 Apr '07

12 Apr '07

Hello Everyone, I m trying to boot linux on a virtual platform . I was hoping to get a little help from this forum . The Platform is basic comprising of : (everything is in a simulated form) 1. Reset Generator 2. Clock Generator 3. ARM-Processor Core - 926EJ-S 4. TCM stubs (Tightly Coupled Memory) for processor 5. Interrupt-Controller 6. BUS (OCP-PSP) for interface 7. Memory (SSRAM, SDRAM, FLASH) 8. UART The Boot-Loader i m using is DAS U-BOOT 1.1.6 Linux version is 2.6.20.3 The problem i m facing is the configuration of u-boot image as well as the kernel image . The configuration is done according to a board which i m not using i.e Versatile, mine is a virtual platform and while configuring i had to specify a board (which i gave as Versatile), now the problem is that the image produced is according to Versatile and thus it's looking for hardware which is not present on my platform (i.e memory address fault occurs) . Thus what i would like to know is, how to configure the u-boot if i m not using a known board, i.e if i m using a custom made board, what should be done ? I would really be grateful . Thanks a lot in advance . Best Regards, Chinmay Upadhyaya

1 0

[U-Boot-Users] How to get u-boot source code for ARM1176
by Vaibhav Hiremath 12 Apr '07

12 Apr '07

Hi All, I am new to u-boot, I am working on ARM 1176. I tried to get the source code from repository, but I am not able to get that. from mailing chain I found that the source code for ARM 1176 is present under branch 20070326_ene. Can anyone help me out to get the source code for ARM1176? Thanks in advance. Thanks, Vaibhav

1 0

[U-Boot-Users] Command "dcache on" for MPC850 isn't valid
by gshan 12 Apr '07

12 Apr '07

Hi All, I got a problem recently and have to send this mail for resolution. The configuration I'm using: CPU: MPC8xx U-boot: 1.1.4 Linux : 2.6.15 ELDK : 4.0 As everyone knew, uboot for MPC850 didn't turn on data cache, but instruction cache is on. In order to test data cache, I added CFG_CMD_CACHE for CONFIG_COMMANDS. However, the CPU is spinning once I issue command "dcache on". Any ideas on this? Thanks, Gavin

2 3

[U-Boot-Users] Atmel ATNGW100 config file anyone?
by Robin Gilks 12 Apr '07

12 Apr '07

Greetings The subject says it all really!! I've applied the u-boot-1.1.6-hs1.patch from avrforums to git head (no errors, just a couple of offset & fuzzy matches) so I'm hoping to be able to build a u-boot image with networking for the new avr32 demo board. The board is on order but I don't know what to expect by way of pre-loaded firmware - especially what capabilities it will have. Any pointers gratefully received:-) -- Robin ======================================================================= This email, including any attachments, is only for the intended addressee. It is subject to copyright, is confidential and may be the subject of legal or other privilege, none of which is waived or lost by reason of this transmission. If the receiver is not the intended addressee, please accept our apologies, notify us by return, delete all copies and perform no other act on the email. Unfortunately, we cannot warrant that the email has not been altered or corrupted during transmission. =======================================================================

2 1

[U-Boot-Users] make uboot working with at49bv322d atmel flash
by Lucas Cyrulski 12 Apr '07

12 Apr '07

Hello, I designed my own board based on AT91RM9200DK but used different flash - AT49BV322D atmel flash. I've downloaded uboot-1.1.5 with atmel patch already apllied and have there something in flash.c concernig this flash memory. I chose target board and compilled uboot properly, it works fine but still doesn't detect my flash and I'm unable to do anything with it. Maybe there is something missing in the flash.c source code. If someone is experienced in this will apreciate any help. best regards Cyrul here's where flash.c source code, which i got varies from default at91rm9200dk_config in uboot 1.1.5 source code: /* Flash Organization Structure */ typedef struct OrgDef { unsigned int sector_number; unsigned int sector_size; } OrgDef; /* Flash Organizations */ OrgDef OrgAT49BV16x4[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 2, 32*1024 }, /* 2 * 32 kBytes sectors */ { 30, 64*1024 }, /* 30 * 64 kBytes sectors */ }; OrgDef OrgAT49BV16x4A[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 31, 64*1024 }, /* 31 * 64 kBytes sectors */ }; OrgDef OrgAT49BV322D[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 63, 64*1024 }, /* 127 * 64 kBytes sectors */ }; OrgDef OrgAT49BV6416[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 127, 64*1024 }, /* 127 * 64 kBytes sectors */ }; flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* AT49BV1614A Codes */ #define FLASH_CODE1 0xAA #define FLASH_CODE2 0x55 #define ID_IN_CODE 0x90 #define ID_OUT_CODE 0xF0 #define CMD_READ_ARRAY 0x00F0 #define CMD_UNLOCK1 0x00AA #define CMD_UNLOCK2 0x0055 #define CMD_ERASE_SETUP 0x0080 #define CMD_ERASE_CONFIRM 0x0030 #define CMD_PROGRAM 0x00A0 #define CMD_UNLOCK_BYPASS 0x0020 #define CMD_SECTOR_UNLOCK 0x0070 #define MEM_FLASH_ADDR1 (*(volatile u16 *)(CFG_FLASH_BASE + (0x00005555<<1))) #define MEM_FLASH_ADDR2 (*(volatile u16 *)(CFG_FLASH_BASE + (0x00002AAA<<1))) #define BIT_ERASE_DONE 0x0080 #define BIT_RDY_MASK 0x0080 #define BIT_PROGRAM_ERROR 0x0020 #define BIT_TIMEOUT 0x80000000 /* our flag */ #define READY 1 #define ERR 2 #define TMO 4 /*----------------------------------------------------------------------- */ void flash_identification (flash_info_t * info) { volatile u16 manuf_code, device_code, add_device_code; MEM_FLASH_ADDR1 = FLASH_CODE1; MEM_FLASH_ADDR2 = FLASH_CODE2; MEM_FLASH_ADDR1 = ID_IN_CODE; manuf_code = *(volatile u16 *) CFG_FLASH_BASE; device_code = *(volatile u16 *) (CFG_FLASH_BASE + 2); add_device_code = *(volatile u16 *) (CFG_FLASH_BASE + (3 << 1)); MEM_FLASH_ADDR1 = FLASH_CODE1; MEM_FLASH_ADDR2 = FLASH_CODE2; MEM_FLASH_ADDR1 = ID_OUT_CODE; #ifdef CFG_IGNORE_PARFLASH info->flash_id = FLASH_UNKNOWN; printf ("Parallel flash ignored\n"); #else if(manuf_code == (ATM_MANUFACT & FLASH_VENDMASK)) { /* Vendor type */ info->flash_id = ATM_MANUFACT & FLASH_VENDMASK; printf ("Atmel: "); } else { /* Make illegal device doe*/ printf ("Unknown Vendor: "); device_code = 0; } /* 16 Mbit Devices (Not recommended for new design) */ if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV1614 & FLASH_TYPEMASK)) { if ((add_device_code & FLASH_TYPEMASK) == (ATM_ID_BV1614A & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV1614A & FLASH_TYPEMASK; printf ("AT49BV1614A (16Mbit)\n"); } else { /* AT49BV1614 Flash */ info->flash_id |= ATM_ID_BV1614 & FLASH_TYPEMASK; printf ("AT49BV1614 (16Mbit)\n"); } /* 16 Mbit Devices (Recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV160D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV160D & FLASH_TYPEMASK; printf ("AT49BV160D (16Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV160DT & FLASH_TYPEMASK)) { info->flash_id = FLASH_UNKNOWN; // info->flash_id |= ATM_ID_BV160DT & FLASH_TYPEMASK; printf ("AT49BV160DT (16Mbit) - Not Yet Supported \n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV163D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV163D & FLASH_TYPEMASK; printf ("AT49BV163D (16Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV163DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV163DT & FLASH_TYPEMASK; printf ("AT49BV163DT (16Mbit) - Not Yet Supported\n"); /* 32 Mbit Devices (Not recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV322A & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV322A & FLASH_TYPEMASK; printf ("AT49BV322A (64Mbit)\n"); /* 32 Mbit Devices (Recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV320D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV320D & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV320D (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV320DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV320DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV320DT (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV322D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV322D & FLASH_TYPEMASK; printf ("AT49BV322D (64Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV322DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV322DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV322DT (64Mbit) - Not Yet Supported\n"); /* 64 Mbit Devices (Not recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416 & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416 & FLASH_TYPEMASK; printf ("AT49BV6416 (64Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416T & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416T & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6416 (64Mbit) - Top Boot Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416C & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416C & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6416C (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416CT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416CT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6416CT (64Mbit) - Top Boot Not Yet Supported\n"); /* 64 Mbit Devices (Recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV640D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV640D & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV640D (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV640DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV640DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV640DT (64Mbit) - Top Boot Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV642D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV642D & FLASH_TYPEMASK; printf ("AT49BV642D (64Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV642DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV642DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV642DT (64Mbit) - Top Boot Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6404 & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6404 & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6404 (64Mbit - Not Yet Supported)\n"); } else { info->flash_id = FLASH_UNKNOWN; printf ("UNKNOWN device or not present\n"); } #endif } ushort flash_number_sector(OrgDef *pOrgDef, unsigned int nb_blocks) { int i, nb_sectors = 0; for (i=0; i<nb_blocks; i++){ nb_sectors += pOrgDef[i].sector_number; } return nb_sectors; } void flash_unlock_sector(flash_info_t * info, unsigned int sector) { volatile u16 *addr = (volatile u16 *) (info->start[sector]); MEM_FLASH_ADDR1 = CMD_UNLOCK1; *addr = CMD_SECTOR_UNLOCK; } ulong flash_init (void) { int i, j, k; unsigned int flash_nb_blocks, sector; unsigned int start_address; unsigned int unlock; OrgDef *pOrgDef; ulong size = 0; for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) { ulong flashbase = 0; unlock = 0; flash_identification (&flash_info[i]); if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV1614 & FLASH_TYPEMASK)) { /* AT49BV1614 Flash */ pOrgDef = OrgAT49BV16x4; flash_nb_blocks = sizeof (OrgAT49BV16x4) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV1614A & FLASH_TYPEMASK)){ /* AT49BV1614A Flash */ pOrgDef = OrgAT49BV16x4A; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV163D & FLASH_TYPEMASK)){ /* AT49BV163D Flash */ pOrgDef = OrgAT49BV16x4A; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV322A & FLASH_TYPEMASK)){ /* AT49BV322D Flash */ pOrgDef = OrgAT49BV322D; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV322D & FLASH_TYPEMASK)){ /* AT49BV322D Flash */ unlock = 1; pOrgDef = OrgAT49BV322D; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV6416 & FLASH_TYPEMASK)){ /* AT49BV6416 Flash */ unlock = 1; pOrgDef = OrgAT49BV6416; flash_nb_blocks = sizeof (OrgAT49BV6416) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV642D & FLASH_TYPEMASK)){ /* AT49BV642D Flash */ unlock = 1; pOrgDef = OrgAT49BV6416; flash_nb_blocks = sizeof (OrgAT49BV6416) / sizeof (OrgDef); } else { flash_nb_blocks = 0; pOrgDef = OrgAT49BV16x4; } flash_info[i].sector_count = flash_number_sector(pOrgDef, flash_nb_blocks); memset (flash_info[i].protect, 0, flash_info[i].sector_count); if (i == 0) flashbase = PHYS_FLASH_1; else panic ("configured too many flash banks!\n"); sector = 0; start_address = flashbase; flash_info[i].size = 0; for (j = 0; j < flash_nb_blocks; j++) { for (k = 0; k < pOrgDef[j].sector_number; k++) { flash_info[i].start[sector++] = start_address; start_address += pOrgDef[j].sector_size; flash_info[i].size += pOrgDef[j].sector_size; } } size += flash_info[i].size; if (unlock){ /* Unlock all sectors at reset */ for (j=0; j<flash_info[i].sector_count; j++){ flash_unlock_sector(&flash_info[i], j); } } } /* Protect binary boot image */ flash_protect (FLAG_PROTECT_SET, CFG_FLASH_BASE, CFG_FLASH_BASE + CFG_BOOT_SIZE - 1, &flash_info[0]); /* Protect environment variables */ flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); /* Protect U-Boot gzipped image */ flash_protect (FLAG_PROTECT_SET, CFG_U_BOOT_BASE, CFG_U_BOOT_BASE + CFG_U_BOOT_SIZE - 1, &flash_info[0]); return size; } /*----------------------------------------------------------------------- */ void flash_print_info (flash_info_t * info) { int i; switch (info->flash_id & FLASH_VENDMASK) { case (ATM_MANUFACT & FLASH_VENDMASK): printf ("Atmel: "); break; default: printf ("Unknown Vendor "); break; } switch (info->flash_id & FLASH_TYPEMASK) { case (ATM_ID_BV1614 & FLASH_TYPEMASK): printf ("AT49BV1614 (16Mbit)\n"); break; case (ATM_ID_BV1614A & FLASH_TYPEMASK): printf ("AT49BV1614A (16Mbit)\n"); break; case (ATM_ID_BV160D & FLASH_TYPEMASK): printf ("AT49BV160D (16Mbit)\n"); break; case (ATM_ID_BV160DT & FLASH_TYPEMASK): printf ("AT49BV160DT (16Mbit)\n"); break; case (ATM_ID_BV163D & FLASH_TYPEMASK): printf ("AT49BV163D (16Mbit)\n"); break; case (ATM_ID_BV163DT & FLASH_TYPEMASK): printf ("AT49BV163DT (16Mbit)\n"); break; #if 0 /* Duplicate with ATM_ID_BV1614A */ case (ATM_ID_BV322A & FLASH_TYPEMASK): printf ("AT49BV322A (32Mbit)\n"); break; #endif case (ATM_ID_BV322AT & FLASH_TYPEMASK): printf ("AT49BV322AT (32Mbit)\n"); break; case (ATM_ID_BV320D & FLASH_TYPEMASK): printf ("AT49BV320D (32Mbit)\n"); break; case (ATM_ID_BV320DT & FLASH_TYPEMASK): printf ("AT49BV320DT (32Mbit)\n"); break; case (ATM_ID_BV322D & FLASH_TYPEMASK): printf ("AT49BV322D (32Mbit)\n"); break; case (ATM_ID_BV322DT & FLASH_TYPEMASK): printf ("AT49BV322DT (32Mbit)\n"); break; case (ATM_ID_BV6416 & FLASH_TYPEMASK): printf ("AT49BV6416 (64Mbit)\n"); break; case (ATM_ID_BV6416T & FLASH_TYPEMASK): printf ("AT49BV6416T (64Mbit)\n"); break; case (ATM_ID_BV6416C & FLASH_TYPEMASK): printf ("AT49BV6416C (64Mbit)\n"); break; case (ATM_ID_BV6416CT & FLASH_TYPEMASK): printf ("AT49BV6416CT (64Mbit)\n"); break; case (ATM_ID_BV640D & FLASH_TYPEMASK): printf ("AT49BV640D (64Mbit)\n"); break; case (ATM_ID_BV640DT & FLASH_TYPEMASK): printf ("AT49BV640DT (64Mbit)\n"); break; case (ATM_ID_BV642D & FLASH_TYPEMASK): printf ("AT49BV642C (64Mbit)\n"); break; case (ATM_ID_BV642DT & FLASH_TYPEMASK): printf ("AT49BV642DT (64Mbit)\n"); break; default: printf ("Unknown Chip Type\n"); return; } printf (" Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count); printf (" Sector Start Addresses:"); for (i = 0; i < info->sector_count; i++) { if ((i % 5) == 0) { printf ("\n "); } if(info->protect[i] != FLAG_PROTECT_INVALID) { printf (" %08lX%s", info->start[i], info->protect[i] ? " (RO)" : " "); } } printf ("\n"); }

1 0

[U-Boot-Users] make uboot working with at49bv322d atmel flash
by cyrul＠epf.pl 12 Apr '07

12 Apr '07

Hello, I designed my own board based on AT91RM9200DK but used different flash - AT49BV322D atmel flash. I've downloaded uboot-1.1.5 with atmel patch already apllied and have there something in flash.c concernig this flash memory. I chose target board and compilled uboot properly, it works fine but still doesn't detect my flash and I'm unable to do anything with it. Maybe there is something missing in the flash.c source code. If someone is experienced in this will apreciate any help. best regards Cyrul here's flash.c: #include <common.h> ulong myflush(void); typedef struct OrgDef { unsigned int sector_number; unsigned int sector_size; } OrgDef; OrgDef OrgAT49BV16x4[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 2, 32*1024 }, /* 2 * 32 kBytes sectors */ { 30, 64*1024 }, /* 30 * 64 kBytes sectors */ }; OrgDef OrgAT49BV16x4A[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 31, 64*1024 }, /* 31 * 64 kBytes sectors */ }; OrgDef OrgAT49BV322D[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 63, 64*1024 }, /* 127 * 64 kBytes sectors */ }; OrgDef OrgAT49BV6416[] = { { 8, 8*1024 }, /* 8 * 8 kBytes sectors */ { 127, 64*1024 }, /* 127 * 64 kBytes sectors */ }; flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* AT49BV1614A Codes */ #define FLASH_CODE1 0xAA #define FLASH_CODE2 0x55 #define ID_IN_CODE 0x90 #define ID_OUT_CODE 0xF0 #define CMD_READ_ARRAY 0x00F0 #define CMD_UNLOCK1 0x00AA #define CMD_UNLOCK2 0x0055 #define CMD_ERASE_SETUP 0x0080 #define CMD_ERASE_CONFIRM 0x0030 #define CMD_PROGRAM 0x00A0 #define CMD_UNLOCK_BYPASS 0x0020 #define CMD_SECTOR_UNLOCK 0x0070 #define MEM_FLASH_ADDR1 (*(volatile u16 *)(CFG_FLASH_BASE + (0x00005555<<1))) #define MEM_FLASH_ADDR2 (*(volatile u16 *)(CFG_FLASH_BASE + (0x00002AAA<<1))) #define BIT_ERASE_DONE 0x0080 #define BIT_RDY_MASK 0x0080 #define BIT_PROGRAM_ERROR 0x0020 #define BIT_TIMEOUT 0x80000000 /* our flag */ #define READY 1 #define ERR 2 #define TMO 4 void flash_identification (flash_info_t * info) { volatile u16 manuf_code, device_code, add_device_code; MEM_FLASH_ADDR1 = FLASH_CODE1; MEM_FLASH_ADDR2 = FLASH_CODE2; MEM_FLASH_ADDR1 = ID_IN_CODE; manuf_code = *(volatile u16 *) CFG_FLASH_BASE; device_code = *(volatile u16 *) (CFG_FLASH_BASE + 2); add_device_code = *(volatile u16 *) (CFG_FLASH_BASE + (3 << 1)); MEM_FLASH_ADDR1 = FLASH_CODE1; MEM_FLASH_ADDR2 = FLASH_CODE2; MEM_FLASH_ADDR1 = ID_OUT_CODE; #ifdef CFG_IGNORE_PARFLASH info->flash_id = FLASH_UNKNOWN; printf ("Parallel flash ignored\n"); #else if(manuf_code == (ATM_MANUFACT & FLASH_VENDMASK)) { /* Vendor type */ info->flash_id = ATM_MANUFACT & FLASH_VENDMASK; printf ("Atmel: "); } else { /* Make illegal device doe*/ printf ("Unknown Vendor: "); device_code = 0; } /* 16 Mbit Devices (Not recommended for new design) */ if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV1614 & FLASH_TYPEMASK)) { if ((add_device_code & FLASH_TYPEMASK) == (ATM_ID_BV1614A & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV1614A & FLASH_TYPEMASK; printf ("AT49BV1614A (16Mbit)\n"); } else { /* AT49BV1614 Flash */ info->flash_id |= ATM_ID_BV1614 & FLASH_TYPEMASK; printf ("AT49BV1614 (16Mbit)\n"); } /* 16 Mbit Devices (Recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV160D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV160D & FLASH_TYPEMASK; printf ("AT49BV160D (16Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV160DT & FLASH_TYPEMASK)) { info->flash_id = FLASH_UNKNOWN; // info->flash_id |= ATM_ID_BV160DT & FLASH_TYPEMASK; printf ("AT49BV160DT (16Mbit) - Not Yet Supported \n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV163D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV163D & FLASH_TYPEMASK; printf ("AT49BV163D (16Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV163DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV163DT & FLASH_TYPEMASK; printf ("AT49BV163DT (16Mbit) - Not Yet Supported\n"); /* 32 Mbit Devices (Not recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV322A & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV322A & FLASH_TYPEMASK; printf ("AT49BV322A (64Mbit)\n"); /* 32 Mbit Devices (Recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV320D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV320D & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV320D (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV320DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV320DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV320DT (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV322D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV322D & FLASH_TYPEMASK; printf ("AT49BV322D (64Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV322DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV322DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV322DT (64Mbit) - Not Yet Supported\n"); /* 64 Mbit Devices (Not recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416 & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416 & FLASH_TYPEMASK; printf ("AT49BV6416 (64Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416T & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416T & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6416 (64Mbit) - Top Boot Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416C & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416C & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6416C (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416CT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6416CT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6416CT (64Mbit) - Top Boot Not Yet Supported\n"); /* 64 Mbit Devices (Recommended for new design) */ } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV640D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV640D & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV640D (64Mbit) - Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV640DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV640DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV640DT (64Mbit) - Top Boot Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV642D & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV642D & FLASH_TYPEMASK; printf ("AT49BV642D (64Mbit)\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV642DT & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV642DT & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV642DT (64Mbit) - Top Boot Not Yet Supported\n"); } else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6404 & FLASH_TYPEMASK)) { info->flash_id |= ATM_ID_BV6404 & FLASH_TYPEMASK; info->flash_id = FLASH_UNKNOWN; printf ("AT49BV6404 (64Mbit - Not Yet Supported)\n"); } else { info->flash_id = FLASH_UNKNOWN; printf ("UNKNOWN device or not present\n"); } #endif } ushort flash_number_sector(OrgDef *pOrgDef, unsigned int nb_blocks) { int i, nb_sectors = 0; for (i=0; i<nb_blocks; i++){ nb_sectors += pOrgDef[i].sector_number; } return nb_sectors; } void flash_unlock_sector(flash_info_t * info, unsigned int sector) { volatile u16 *addr = (volatile u16 *) (info->start[sector]); MEM_FLASH_ADDR1 = CMD_UNLOCK1; *addr = CMD_SECTOR_UNLOCK; } ulong flash_init (void) { int i, j, k; unsigned int flash_nb_blocks, sector; unsigned int start_address; unsigned int unlock; OrgDef *pOrgDef; ulong size = 0; for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) { ulong flashbase = 0; unlock = 0; flash_identification (&flash_info[i]); if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV1614 & FLASH_TYPEMASK)) { /* AT49BV1614 Flash */ pOrgDef = OrgAT49BV16x4; flash_nb_blocks = sizeof (OrgAT49BV16x4) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV1614A & FLASH_TYPEMASK)){ /* AT49BV1614A Flash */ pOrgDef = OrgAT49BV16x4A; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV163D & FLASH_TYPEMASK)){ /* AT49BV163D Flash */ pOrgDef = OrgAT49BV16x4A; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV322A & FLASH_TYPEMASK)){ /* AT49BV322D Flash */ pOrgDef = OrgAT49BV322D; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV322D & FLASH_TYPEMASK)){ /* AT49BV322D Flash */ unlock = 1; pOrgDef = OrgAT49BV322D; flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV6416 & FLASH_TYPEMASK)){ /* AT49BV6416 Flash */ unlock = 1; pOrgDef = OrgAT49BV6416; flash_nb_blocks = sizeof (OrgAT49BV6416) / sizeof (OrgDef); } else if ((flash_info[i].flash_id & FLASH_TYPEMASK) == (ATM_ID_BV642D & FLASH_TYPEMASK)){ /* AT49BV642D Flash */ unlock = 1; pOrgDef = OrgAT49BV6416; flash_nb_blocks = sizeof (OrgAT49BV6416) / sizeof (OrgDef); } else { flash_nb_blocks = 0; pOrgDef = OrgAT49BV16x4; } flash_info[i].sector_count = flash_number_sector(pOrgDef, flash_nb_blocks); memset (flash_info[i].protect, 0, flash_info[i].sector_count); if (i == 0) flashbase = PHYS_FLASH_1; else panic ("configured too many flash banks!\n"); sector = 0; start_address = flashbase; flash_info[i].size = 0; for (j = 0; j < flash_nb_blocks; j++) { for (k = 0; k < pOrgDef[j].sector_number; k++) { flash_info[i].start[sector++] = start_address; start_address += pOrgDef[j].sector_size; flash_info[i].size += pOrgDef[j].sector_size; } } size += flash_info[i].size; if (unlock){ /* Unlock all sectors at reset */ for (j=0; j<flash_info[i].sector_count; j++){ flash_unlock_sector(&flash_info[i], j); } } } /* Protect binary boot image */ flash_protect (FLAG_PROTECT_SET, CFG_FLASH_BASE, CFG_FLASH_BASE + CFG_BOOT_SIZE - 1, &flash_info[0]); /* Protect environment variables */ flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); /* Protect U-Boot gzipped image */ flash_protect (FLAG_PROTECT_SET, CFG_U_BOOT_BASE, CFG_U_BOOT_BASE + CFG_U_BOOT_SIZE - 1, &flash_info[0]); return size; } void flash_print_info (flash_info_t * info) { int i; switch (info->flash_id & FLASH_VENDMASK) { case (ATM_MANUFACT & FLASH_VENDMASK): printf ("Atmel: "); break; default: printf ("Unknown Vendor "); break; } switch (info->flash_id & FLASH_TYPEMASK) { case (ATM_ID_BV1614 & FLASH_TYPEMASK): printf ("AT49BV1614 (16Mbit)\n"); break; case (ATM_ID_BV1614A & FLASH_TYPEMASK): printf ("AT49BV1614A (16Mbit)\n"); break; case (ATM_ID_BV160D & FLASH_TYPEMASK): printf ("AT49BV160D (16Mbit)\n"); break; case (ATM_ID_BV160DT & FLASH_TYPEMASK): printf ("AT49BV160DT (16Mbit)\n"); break; case (ATM_ID_BV163D & FLASH_TYPEMASK): printf ("AT49BV163D (16Mbit)\n"); break; case (ATM_ID_BV163DT & FLASH_TYPEMASK): printf ("AT49BV163DT (16Mbit)\n"); break; #if 0 /* Duplicate with ATM_ID_BV1614A */ case (ATM_ID_BV322A & FLASH_TYPEMASK): printf ("AT49BV322A (32Mbit)\n"); break; #endif case (ATM_ID_BV322AT & FLASH_TYPEMASK): printf ("AT49BV322AT (32Mbit)\n"); break; case (ATM_ID_BV320D & FLASH_TYPEMASK): printf ("AT49BV320D (32Mbit)\n"); break; case (ATM_ID_BV320DT & FLASH_TYPEMASK): printf ("AT49BV320DT (32Mbit)\n"); break; case (ATM_ID_BV322D & FLASH_TYPEMASK): printf ("AT49BV322D (32Mbit)\n"); break; case (ATM_ID_BV322DT & FLASH_TYPEMASK): printf ("AT49BV322DT (32Mbit)\n"); break; case (ATM_ID_BV6416 & FLASH_TYPEMASK): printf ("AT49BV6416 (64Mbit)\n"); break; case (ATM_ID_BV6416T & FLASH_TYPEMASK): printf ("AT49BV6416T (64Mbit)\n"); break; case (ATM_ID_BV6416C & FLASH_TYPEMASK): printf ("AT49BV6416C (64Mbit)\n"); break; case (ATM_ID_BV6416CT & FLASH_TYPEMASK): printf ("AT49BV6416CT (64Mbit)\n"); break; case (ATM_ID_BV640D & FLASH_TYPEMASK): printf ("AT49BV640D (64Mbit)\n"); break; case (ATM_ID_BV640DT & FLASH_TYPEMASK): printf ("AT49BV640DT (64Mbit)\n"); break; case (ATM_ID_BV642D & FLASH_TYPEMASK): printf ("AT49BV642C (64Mbit)\n"); break; case (ATM_ID_BV642DT & FLASH_TYPEMASK): printf ("AT49BV642DT (64Mbit)\n"); break; default: printf ("Unknown Chip Type\n"); return; } printf (" Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count); printf (" Sector Start Addresses:"); for (i = 0; i < info->sector_count; i++) { if ((i % 5) == 0) { printf ("\n "); } if(info->protect[i] != FLAG_PROTECT_INVALID) { printf (" %08lX%s", info->start[i], info->protect[i] ? " (RO)" : " "); } } printf ("\n"); } erase, write_buff, write_word functions are the same - like in other uboot versions without atmel patch applied --------------------- Panorama Internetu - prognoza pogody, poczta e-mail z największym załącznikiem, SMS, wyszukiwarki: Gooru, Anonser, serwisy: randki, ogłoszenia, wakacje, program TV, Kina, muzyka, DVD, newsy, inne. http://www.panoramainternetu.pl/ (http://www.epf.pl/)

2 1

[U-Boot-Users] TI Davinci patches
by ksi＠koi8.net 12 Apr '07

12 Apr '07

Gentlemen, As I can see nobody is interested in Davinci support and nobody's gonna at least review the patches I sent last week, right? Please let me know what else should I do to get them into the main U-Boot tree. I want to share this with the rest of community and I do also want to avoid the hassle of reaplying my own set of patches every time new version is released... I do really hope somebody IS interested. I won't bother you guys any more if nobody is. Best regards, Sergey Kubushyn --- ****************************************************************** * KSI@home KOI8 Net < > The impossible we do immediately. * * Las Vegas NV, USA < > Miracles require 24-hour notice. * ******************************************************************

5 6

[U-Boot-Users] [PATCH 4/4] Add MPC8544DS build, include and README files.
by Jon Loeliger 11 Apr '07

11 Apr '07

Also adds new TSEC setup SGMII mode bits. Signed-off-by: Ed Swarthout <Ed.Swarthout(a)freescale.com> Signed-off-by: Jon Loeliger <jdl(a)freescale.com> --- MAKEALL | 8 ++-- Makefile | 3 + doc/README.mpc8544ds | 122 +++++++++++++++++++++++++++++++++++++++++++ drivers/tsec.c | 6 ++- drivers/tsec.h | 3 +- include/asm-ppc/mmu.h | 4 +- include/asm-ppc/processor.h | 11 +++- 7 files changed, 147 insertions(+), 10 deletions(-) create mode 100644 doc/README.mpc8544ds diff --git a/MAKEALL b/MAKEALL index a02d8c1..ed78359 100755 --- a/MAKEALL +++ b/MAKEALL @@ -142,10 +142,10 @@ LIST_83xx=" \ ######################################################################### LIST_85xx=" \ - MPC8540ADS MPC8540EVAL MPC8541CDS MPC8548CDS \ - MPC8555CDS MPC8560ADS PM854 PM856 \ - sbc8540 sbc8560 stxgp3 TQM8540 \ - TQM8541 TQM8555 TQM8560 \ + MPC8540ADS MPC8540EVAL MPC8541CDS MPC8544DS \ + MPC8548CDS MPC8555CDS MPC8560ADS PM854 \ + PM856 sbc8540 sbc8560 stxgp3 \ + TQM8540 TQM8541 TQM8555 TQM8560 \ " ######################################################################### diff --git a/Makefile b/Makefile index 3f5a70d..a0f0fe7 100644 --- a/Makefile +++ b/Makefile @@ -1736,6 +1736,9 @@ MPC8560ADS_config: unconfig MPC8541CDS_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8541cds cds +MPC8544DS_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale + MPC8548CDS_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8548cds cds diff --git a/doc/README.mpc8544ds b/doc/README.mpc8544ds new file mode 100644 index 0000000..14c7f76 --- /dev/null +++ b/doc/README.mpc8544ds @@ -0,0 +1,122 @@ +Overview +-------- +The MPC8544DS system is similar to the 85xx CDS systems such +as the MPC8548CDS due to the similar E500 core. However, it +is placed on the same board as the 8641 HPCN system. + + +Flash Banks +----------- +Like the 85xx CDS systems, the 8544 DS board has two flash banks. +They are both present on boot, but there locations can be swapped +using the dip-switch SW10, bit 2. + +However, unlike the CDS systems, but similar to the 8641 HPCN +board, a runtime reset through the FPGA can also affect a swap +on the flash bank mappings for the next reset cycle. + +Irrespective of the switch SW10[2], booting is always from the +boot bank at 0xfff8_0000. + + +Memory Map +---------- + +0xff80_0000 - 0xffbf_ffff Alernate bank 4MB +0xffc0_0000 - 0xffff_ffff Boot bank 4MB + +0xffb8_0000 Alternate image start 512KB +0xfff8_0000 Boot image start 512KB + + +Flashing Images +--------------- + +For example, to place a new image in the alternate flash bank +and then reset with that new image temporarily, use this: + + tftp 1000000 u-boot.bin.8544ds + erase ffb80000 ffbfffff + cp.b 1000000 ffb80000 80000 + pixis_reset altbank + + +To overwrite the image in the boot flash bank: + + tftp 1000000 u-boot.bin.8544ds + protect off all + erase fff80000 ffffffff + cp.b 1000000 fff80000 80000 + +Other example U-Boot image and flash manipulations examples +can be found in the README.mpc85xxcds file as well. + + +The pixis_reset command +----------------------- +A new command, "pixis_reset", is introduced to reset mpc8641hpcn board +using the FPGA sequencer. When the board restarts, it has the option +of using either the current or alternate flash bank as the boot +image, with or without the watchdog timer enabled, and finally with +or without frequency changes. + +Usage is; + + pixis_reset + pixis_reset altbank + pixis_reset altbank wd + pixis_reset altbank cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio> + pixis_reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio> + +Examples; + + /* reset to current bank, like "reset" command */ + pixis_reset + + /* reset board but use the to alternate flash bank */ + pixis_reset altbank + + /* reset board, use alternate flash bank with watchdog timer enabled*/ + pixis_reset altbank wd + + /* reset board to alternate bank with frequency changed. + * 40 is SYSCLK, 2.5 is COREPLL ratio, 10 is MPXPLL ratio + */ + pixis-reset altbank cf 40 2.5 10 + +Valid clock choices are in the 8641 Reference Manuals. + + +Using the Device Tree Source File +--------------------------------- +To create the DTB (Device Tree Binary) image file, +use a command similar to this: + + dtc -b 0 -f -I dts -O dtb mpc8544ds.dts > mpc8544ds.dtb + +Likely, that .dts file will come from here; + + linux-2.6/arch/powerpc/boot/dts/mpc8544ds.dts + +After placing the DTB file in your TFTP disk area, +you can download that dtb file using a command like: + + tftp 900000 mpc8544ds.dtb + +Burn it to flash if you want. + + +Booting Linux +------------- + +Place a linux uImage in the TFTP disk area too. + + tftp 1000000 uImage.8544 + tftp 900000 mpc8544ds.dtb + bootm 1000000 - 900000 + +Watch your ethact, netdev and bootargs U-Boot environment variables. +You may want to do something like this too: + + setenv ethact eTSEC3 + setenv netdev eth1 diff --git a/drivers/tsec.c b/drivers/tsec.c index 3f11eb0..ed35f22 100644 --- a/drivers/tsec.c +++ b/drivers/tsec.c @@ -5,7 +5,7 @@ * terms of the GNU Public License, Version 2, incorporated * herein by reference. * - * Copyright 2004 Freescale Semiconductor. + * Copyright 2004, 2007 Freescale Semiconductor, Inc. * (C) Copyright 2003, Motorola, Inc. * author Andy Fleming * @@ -66,7 +66,11 @@ struct tsec_info_struct { */ static struct tsec_info_struct tsec_info[] = { #if defined(CONFIG_MPC85XX_TSEC1) || defined(CONFIG_MPC83XX_TSEC1) +#if defined(CONFIG_MPC8544DS) + {TSEC1_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC1_PHYIDX}, +#else {TSEC1_PHY_ADDR, TSEC_GIGABIT, TSEC1_PHYIDX}, +#endif #elif defined(CONFIG_MPC86XX_TSEC1) {TSEC1_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC1_PHYIDX}, #else diff --git a/drivers/tsec.h b/drivers/tsec.h index 422bc66..7bf3dee 100644 --- a/drivers/tsec.h +++ b/drivers/tsec.h @@ -7,7 +7,7 @@ * terms of the GNU Public License, Version 2, incorporated * herein by reference. * - * Copyright 2004 Freescale Semiconductor. + * Copyright 2004, 2007 Freescale Semiconductor, Inc. * (C) Copyright 2003, Motorola, Inc. * maintained by Xianghua Xiao (x.xiao(a)motorola.com) * author Andy Fleming @@ -65,6 +65,7 @@ #define ECNTRL_INIT_SETTINGS 0x00001000 #define ECNTRL_TBI_MODE 0x00000020 #define ECNTRL_R100 0x00000008 +#define ECNTRL_SGMII_MODE 0x00000002 #define miim_end -2 #define miim_read -1 diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index b226825..fab2715 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h @@ -396,8 +396,8 @@ extern int write_bat(ppc_bat_t bat, unsigned long upper, unsigned long lower); #define BOOKE_PAGESZ_16M 7 #define BOOKE_PAGESZ_64M 8 #define BOOKE_PAGESZ_256M 9 -#define BOOKE_PAGESZ_1GB 10 -#define BOOKE_PAGESZ_4GB 11 +#define BOOKE_PAGESZ_1G 10 +#define BOOKE_PAGESZ_4G 11 #if defined(CONFIG_MPC86xx) #define LAWBAR_BASE_ADDR 0x00FFFFFF diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 0585962..944cbe9 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -232,6 +232,9 @@ #define HID0_BHTE (1<<2) /* Branch History Table Enable */ #define HID0_BTCD (1<<1) /* Branch target cache disable */ #define SPRN_HID1 0x3F1 /* Hardware Implementation Register 1 */ +#define HID1_RFXE (1<<17) /* Read Fault Exception Enable */ +#define HID1_ASTME (1<<13) /* Address bus streaming mode */ +#define HID1_ABE (1<<12) /* Address broadcast enable */ #define SPRN_IABR 0x3F2 /* Instruction Address Breakpoint Register */ #ifndef CONFIG_BOOKE #define SPRN_IAC1 0x3F4 /* Instruction Address Compare 1 */ @@ -415,10 +418,12 @@ #define SPRN_IVOR15 0x19f /* Interrupt Vector Offset Register 15 */ /* e500 definitions */ -#define SPRN_L1CSR0 0x3f2 /* L1 Cache Control and Status Register 0 */ +#define SPRN_L1CSR0 0x3f2 /* L1 Data Cache Control and Status Register 0 */ +#define L1CSR0_CPE 0x00010000 /* Data Cache Parity Enable */ #define L1CSR0_DCFI 0x00000002 /* Data Cache Flash Invalidate */ #define L1CSR0_DCE 0x00000001 /* Data Cache Enable */ -#define SPRN_L1CSR1 0x3f3 /* L1 Cache Control and Status Register 1 */ +#define SPRN_L1CSR1 0x3f3 /* L1 Instruction Cache Control and Status Register 1 */ +#define L1CSR1_CPE 0x00010000 /* Instruction Cache Parity Enable */ #define L1CSR1_ICFI 0x00000002 /* Instruction Cache Flash Invalidate */ #define L1CSR1_ICE 0x00000001 /* Instruction Cache Enable */ @@ -840,6 +845,8 @@ #define SVR_8560 0x8070 #define SVR_8555 0x8079 #define SVR_8541 0x807A +#define SVR_8544 0x8034 +#define SVR_8544_E 0x803C #define SVR_8548 0x8031 #define SVR_8548_E 0x8039 #define SVR_8641 0x8090 -- 1.5.0.3

1 0