GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-28 09:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

Browse source
This commit is contained in:
Wolfgang Denk 2008-09-10 11:07:35 +02:00
commit f6808c48a5
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/image.c
View file

@ -1563,7 +1563,7 @@ int boot_get_fdt (int flag, int argc, char *argv[], bootm_headers_t *images,
*of_flat_tree = fdt_blob; *of_flat_tree = fdt_blob;
*of_size = be32_to_cpu (fdt_totalsize (fdt_blob)); *of_size = be32_to_cpu (fdt_totalsize (fdt_blob));
debug (" of_flat_tree at 0x%08lx size 0x%08lx\n", debug (" of_flat_tree at 0x%08lx size 0x%08lx\n",
*of_flat_tree, *of_size); (ulong)*of_flat_tree, *of_size);
return 0; return 0;

14
cpu/mpc85xx/interrupts.c
View file

@ -48,29 +48,29 @@ int interrupt_init_cpu(unsigned long *decrementer_count)
#ifdef CONFIG_INTERRUPTS #ifdef CONFIG_INTERRUPTS
pic->iivpr1 = 0x810001; /* 50220 enable ecm interrupts */ pic->iivpr1 = 0x810001; /* 50220 enable ecm interrupts */
debug("iivpr1@%x = %x\n",&pic->iivpr1, pic->iivpr1); debug("iivpr1@%x = %x\n", (uint)&pic->iivpr1, pic->iivpr1);
pic->iivpr2 = 0x810002; /* 50240 enable ddr interrupts */ pic->iivpr2 = 0x810002; /* 50240 enable ddr interrupts */
debug("iivpr2@%x = %x\n",&pic->iivpr2, pic->iivpr2); debug("iivpr2@%x = %x\n", (uint)&pic->iivpr2, pic->iivpr2);
pic->iivpr3 = 0x810003; /* 50260 enable lbc interrupts */ pic->iivpr3 = 0x810003; /* 50260 enable lbc interrupts */
debug("iivpr3@%x = %x\n",&pic->iivpr3, pic->iivpr3); debug("iivpr3@%x = %x\n", (uint)&pic->iivpr3, pic->iivpr3);
#ifdef CONFIG_PCI1 #ifdef CONFIG_PCI1
pic->iivpr8 = 0x810008; /* enable pci1 interrupts */ pic->iivpr8 = 0x810008; /* enable pci1 interrupts */
debug("iivpr8@%x = %x\n",&pic->iivpr8, pic->iivpr8); debug("iivpr8@%x = %x\n", (uint)&pic->iivpr8, pic->iivpr8);
#endif #endif
#if defined(CONFIG_PCI2) || defined(CONFIG_PCIE2) #if defined(CONFIG_PCI2) || defined(CONFIG_PCIE2)
pic->iivpr9 = 0x810009; /* enable pci1 interrupts */ pic->iivpr9 = 0x810009; /* enable pci1 interrupts */
debug("iivpr9@%x = %x\n",&pic->iivpr9, pic->iivpr9); debug("iivpr9@%x = %x\n", (uint)&pic->iivpr9, pic->iivpr9);
#endif #endif
#ifdef CONFIG_PCIE1 #ifdef CONFIG_PCIE1
pic->iivpr10 = 0x81000a; /* enable pcie1 interrupts */ pic->iivpr10 = 0x81000a; /* enable pcie1 interrupts */
debug("iivpr10@%x = %x\n",&pic->iivpr10, pic->iivpr10); debug("iivpr10@%x = %x\n", (uint)&pic->iivpr10, pic->iivpr10);
#endif #endif
#ifdef CONFIG_PCIE3 #ifdef CONFIG_PCIE3
pic->iivpr11 = 0x81000b; /* enable pcie3 interrupts */ pic->iivpr11 = 0x81000b; /* enable pcie3 interrupts */
debug("iivpr11@%x = %x\n",&pic->iivpr11, pic->iivpr11); debug("iivpr11@%x = %x\n", (uint)&pic->iivpr11, pic->iivpr11);
#endif #endif
pic->ctpr=0; /* 40080 clear current task priority register */ pic->ctpr=0; /* 40080 clear current task priority register */

5
cpu/mpc85xx/release.S
View file

@ -37,6 +37,11 @@ __secondary_start_page:
li r3,0x201 li r3,0x201
mtspr SPRN_BUCSR,r3 mtspr SPRN_BUCSR,r3
/* Ensure TB is 0 */
li r3,0
mttbl r3
mttbu r3
/* Enable/invalidate the I-Cache */ /* Enable/invalidate the I-Cache */
mfspr r0,SPRN_L1CSR1 mfspr r0,SPRN_L1CSR1
ori r0,r0,(L1CSR1_ICFI|L1CSR1_ICE) ori r0,r0,(L1CSR1_ICFI|L1CSR1_ICE)

2
drivers/mtd/cfi_flash.c
View file

@ -516,7 +516,7 @@ static int flash_isequal (flash_info_t * info, flash_sect_t sect,
retval = (flash_read16(addr) == cword.w); retval = (flash_read16(addr) == cword.w);
break; break;
case FLASH_CFI_32BIT: case FLASH_CFI_32BIT:
debug ("is= %8.8lx %8.8lx\n", flash_read32(addr), cword.l); debug ("is= %8.8x %8.8lx\n", flash_read32(addr), cword.l);
retval = (flash_read32(addr) == cword.l); retval = (flash_read32(addr) == cword.l);
break; break;
case FLASH_CFI_64BIT: case FLASH_CFI_64BIT: