linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

powerpc/mpc85xx: Remove R6 from spin table

Browse Source 
R6 was in ePAPR draft version but was dropped in official spec.
Removing it to comply.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
York Sun
2012-10-08 07:44:29 +00:00
committed by Andy Fleming
parent 82968a7ab5
commit 3f0997b325
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/cpu/mpc85xx/mp.c
View File

@ -86,9 +86,8 @@ int cpu_status(int nr)
printf("\n"); printf("\n");
printf("table @ 0x%p\n", table); printf("table @ 0x%p\n", table);
printf(" addr - 0x%08x\n", table[BOOT_ENTRY_ADDR_LOWER]); printf(" addr - 0x%08x\n", table[BOOT_ENTRY_ADDR_LOWER]);
printf(" pir - 0x%08x\n", table[BOOT_ENTRY_PIR]);
printf(" r3 - 0x%08x\n", table[BOOT_ENTRY_R3_LOWER]); printf(" r3 - 0x%08x\n", table[BOOT_ENTRY_R3_LOWER]);
printf(" r6 - 0x%08x\n", table[BOOT_ENTRY_R6_LOWER]); printf(" pir - 0x%08x\n", table[BOOT_ENTRY_PIR]);
} }
return 0; return 0;
@ -151,7 +150,6 @@ static u8 boot_entry_map[4] = {
0, 0,
BOOT_ENTRY_PIR, BOOT_ENTRY_PIR,
BOOT_ENTRY_R3_LOWER, BOOT_ENTRY_R3_LOWER,
BOOT_ENTRY_R6_LOWER,
}; };
int cpu_release(int nr, int argc, char * const argv[]) int cpu_release(int nr, int argc, char * const argv[])
@ -174,8 +172,8 @@ int cpu_release(int nr, int argc, char * const argv[])
boot_addr = simple_strtoull(argv[0], NULL, 16); boot_addr = simple_strtoull(argv[0], NULL, 16);
/* handle pir, r3, r6 */ /* handle pir, r3 */
for (i = 1; i < 4; i++) { for (i = 1; i < 3; i++) {
if (argv[i][0] != '-') { if (argv[i][0] != '-') {
u8 entry = boot_entry_map[i]; u8 entry = boot_entry_map[i];
val = simple_strtoul(argv[i], NULL, 16); val = simple_strtoul(argv[i], NULL, 16);

2
arch/powerpc/cpu/mpc85xx/release.S
View File

@ -366,7 +366,7 @@ __secondary_start_page:
lwz r3,ENTRY_R3_LOWER(r10) lwz r3,ENTRY_R3_LOWER(r10)
li r4,0 li r4,0
li r5,0 li r5,0
lwz r6,ENTRY_R6_LOWER(r10) li r6,0
lis r7,(64*1024*1024)@h lis r7,(64*1024*1024)@h
li r8,0 li r8,0
li r9,0 li r9,0