Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-16 01:38:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mpc86xx'

Browse source
This commit is contained in:
Jon Loeliger 2006-05-31 14:02:09 -05:00
commit ae53c8a705
10 changed files with 53 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/mpc8641hpcn/config.mk
View file

@ -1,5 +1,5 @@
# Copyright 2004 Freescale Semiconductor. # Copyright 2004 Freescale Semiconductor.
# Modified by Jeff Brown (jeffrey@freescale.com) # Modified by Jeff Brown
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this
# project. # project.

26
board/mpc8641hpcn/init.S
View file

@ -1,6 +1,6 @@
/* /*
* Copyright 2004 Freescale Semiconductor. * Copyright 2004 Freescale Semiconductor.
* Jeff Brown (jeffrey@freescale.com) * Jeff Brown
* Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -59,7 +59,6 @@
#define LAWAR2 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_512M)) #define LAWAR2 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_512M))
#define LAWBAR3 ((CFG_PCI2_MEM_BASE>>12) & 0xffffff) #define LAWBAR3 ((CFG_PCI2_MEM_BASE>>12) & 0xffffff)
/*#define LAWAR3 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_512M)) */
#define LAWAR3 (~LAWAR_EN & (LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_512M))) #define LAWAR3 (~LAWAR_EN & (LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_512M)))
/* /*
@ -72,7 +71,6 @@
#define LAWAR5 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_16M)) #define LAWAR5 (LAWAR_EN | LAWAR_TRGT_IF_PCI1 | (LAWAR_SIZE & LAWAR_SIZE_16M))
#define LAWBAR6 ((CFG_PCI2_IO_BASE>>12) & 0xffffff) #define LAWBAR6 ((CFG_PCI2_IO_BASE>>12) & 0xffffff)
/*#define LAWAR6 (LAWAR_EN | LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_16M)) */
#define LAWAR6 (~LAWAR_EN &( LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_16M))) #define LAWAR6 (~LAWAR_EN &( LAWAR_TRGT_IF_PCI2 | (LAWAR_SIZE & LAWAR_SIZE_16M)))
#define LAWBAR7 ((0xfe000000 >>12) & 0xffffff) #define LAWBAR7 ((0xfe000000 >>12) & 0xffffff)
@ -86,7 +84,7 @@
#define LAWAR8 ((LAWAR_TRGT_IF_DDR2 | (LAWAR_SIZE & LAWAR_SIZE_512M)) & ~LAWAR_EN) #define LAWAR8 ((LAWAR_TRGT_IF_DDR2 | (LAWAR_SIZE & LAWAR_SIZE_512M)) & ~LAWAR_EN)
#endif #endif
.section .bootpg, "ax" .section .bootpg, "ax"
.globl law_entry .globl law_entry
law_entry: law_entry:
lis r7,CFG_CCSRBAR@h lis r7,CFG_CCSRBAR@h
@ -110,8 +108,8 @@ law_entry:
stwu r6, 0x20(r4) stwu r6, 0x20(r4)
lis r6,LAWAR2@h lis r6,LAWAR2@h
ori r6,r6,LAWAR2@l ori r6,r6,LAWAR2@l
stwu r6, 0x20(r5) stwu r6, 0x20(r5)
/* LAWBAR3, LAWAR3 */ /* LAWBAR3, LAWAR3 */
lis r6,LAWBAR3@h lis r6,LAWBAR3@h
@ -127,7 +125,7 @@ law_entry:
ori r6,r6,LAWBAR4@l ori r6,r6,LAWBAR4@l
stwu r6, 0x20(r4) stwu r6, 0x20(r4)
lis r6,LAWAR4@h lis r6,LAWAR4@h
ori r6,r6,LAWAR4@l ori r6,r6,LAWAR4@l
stwu r6, 0x20(r5) stwu r6, 0x20(r5)
/* LAWBAR5, LAWAR5 */ /* LAWBAR5, LAWAR5 */
@ -157,14 +155,14 @@ law_entry:
ori r6,r6,LAWAR7@l ori r6,r6,LAWAR7@l
stwu r6, 0x20(r5) stwu r6, 0x20(r5)
/* LAWBAR8, LAWAR8 */ /* LAWBAR8, LAWAR8 */
lis r6,LAWBAR8@h lis r6,LAWBAR8@h
ori r6,r6,LAWBAR8@l ori r6,r6,LAWBAR8@l
stwu r6, 0x20(r4) stwu r6, 0x20(r4)
lis r6,LAWAR8@h lis r6,LAWAR8@h
ori r6,r6,LAWAR8@l ori r6,r6,LAWAR8@l
stwu r6, 0x20(r5) stwu r6, 0x20(r5)
blr blr

4
board/mpc8641hpcn/mpc8641hpcn.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright 2004 Freescale Semiconductor. * Copyright 2004 Freescale Semiconductor.
* Jeff Brown (jeffrey@freescale.com) * Jeff Brown
* Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
* *
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
@ -352,7 +352,7 @@ mpc8641_reset_board(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
goto my_usage; goto my_usage;
} }
my_usage: my_usage:
puts("\nUsage: reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n"); puts("\nUsage: reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n");
puts(" reset altbank [cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>]\n"); puts(" reset altbank [cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>]\n");
puts(" reset altbank [wd]\n"); puts(" reset altbank [wd]\n");

2
board/mpc8641hpcn/u-boot.lds
View file

@ -1,7 +1,7 @@
/* /*
* (C) Copyright 2004, Freescale, Inc. * (C) Copyright 2004, Freescale, Inc.
* (C) Copyright 2002,2003, Motorola,Inc. * (C) Copyright 2002,2003, Motorola,Inc.
* Jeff Brown (jeffrey@freescale.com) * Jeff Brown
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.

4
cpu/mpc86xx/Makefile
View file

@ -3,7 +3,7 @@
# Xianghua Xiao,X.Xiao@motorola.com # Xianghua Xiao,X.Xiao@motorola.com
# #
# (C) Copyright 2004 Freescale Semiconductor. (MC86xx Port) # (C) Copyright 2004 Freescale Semiconductor. (MC86xx Port)
# Jeff Brown (Jeffrey@freescale.com) # Jeff Brown
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this
# project. # project.
# #
@ -30,7 +30,7 @@ LIB = lib$(CPU).a
START = start.o #resetvec.o START = start.o #resetvec.o
ASOBJS = cache.o ASOBJS = cache.o
COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o \ COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o \
pci.o i2c.o spd_sdram.o pci.o i2c.o spd_sdram.o
OBJS = $(COBJS) OBJS = $(COBJS)
all: .depend $(START) $(ASOBJS) $(LIB) all: .depend $(START) $(ASOBJS) $(LIB)

4
cpu/mpc86xx/config.mk
View file

@ -1,6 +1,6 @@
# #
# (C) Copyright 2004 Freescale Semiconductor. # (C) Copyright 2004 Freescale Semiconductor.
# Jeff Brown <jeffrey@freescale.com> # Jeff Brown
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this
# project. # project.
@ -23,4 +23,4 @@
PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
PLATFORM_CPPFLAGS += -DCONFIG_MPC86xx -ffixed-r2 -ffixed-r29 -mstring PLATFORM_CPPFLAGS += -DCONFIG_MPC86xx -ffixed-r2 -ffixed-r29 -mstring

11
cpu/mpc86xx/cpu_init.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright 2004 Freescale Semiconductor. * Copyright 2004 Freescale Semiconductor.
* Jeff Brown (jeffrey@freescale.com) * Jeff Brown
* Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -106,15 +106,6 @@ void cpu_init_f(void)
/* enable SYNCBE | ABE bits in HID1 */ /* enable SYNCBE | ABE bits in HID1 */
set_hid1(get_hid1() | 0x00000C00); set_hid1(get_hid1() | 0x00000C00);
/* Since the bats have been set up at this point and
* the local bus registers have been initialized, we
* turn on the WDEN bit in PIXIS_VCTL
*/
/* val = in8(PIXIS_BASE+PIXIS_VCTL); */
/* Set the WDEN */
/* val |= 0x08; */
/* out8(PIXIS_BASE+PIXIS_VCTL,val); */
} }
/* /*

6
cpu/mpc86xx/i2c.c
View file

@ -7,7 +7,7 @@
* Gleb Natapov <gnatapov@mrv.com> * Gleb Natapov <gnatapov@mrv.com>
* Some bits are taken from linux driver writen by adrian@humboldt.co.uk * Some bits are taken from linux driver writen by adrian@humboldt.co.uk
* *
* Modified for MPC86xx by Jeff Brown (jeffrey@freescale.com) * Modified for MPC86xx by Jeff Brown
* *
* Hardware I2C driver for MPC107 PCI bridge. * Hardware I2C driver for MPC107 PCI bridge.
* *
@ -207,7 +207,7 @@ i2c_read (u8 dev, uint addr, int alen, u8 *data, int length)
i = __i2c_read(data, length); i = __i2c_read(data, length);
exit: exit:
writeb(MPC86xx_I2CCR_MEN, I2CCCR); writeb(MPC86xx_I2CCR_MEN, I2CCCR);
return !(i == length); return !(i == length);
@ -230,7 +230,7 @@ i2c_write (u8 dev, uint addr, int alen, u8 *data, int length)
i = __i2c_write(data, length); i = __i2c_write(data, length);
exit: exit:
writeb(MPC86xx_I2CCR_MEN, I2CCCR); writeb(MPC86xx_I2CCR_MEN, I2CCCR);
return !(i == length); return !(i == length);

42
cpu/mpc86xx/interrupts.c
View file

@ -9,7 +9,7 @@
* Xianghua Xiao (X.Xiao@motorola.com) * Xianghua Xiao (X.Xiao@motorola.com)
* *
* (C) Copyright 2004 Freescale Semiconductor. (MPC86xx Port) * (C) Copyright 2004 Freescale Semiconductor. (MPC86xx Port)
* Jeff Brown (Jeffrey@freescale.com) * Jeff Brown
* Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -37,11 +37,10 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <ppc_asm.tmpl> #include <ppc_asm.tmpl>
unsigned long decrementer_count; /* count value for 1e6/HZ microseconds */ unsigned long decrementer_count; /* count value for 1e6/HZ microseconds */
unsigned long timestamp; unsigned long timestamp;
static __inline__ unsigned long get_msr (void) static __inline__ unsigned long get_msr (void)
{ {
unsigned long msr; unsigned long msr;
@ -75,7 +74,7 @@ static __inline__ void set_dec (unsigned long val)
/* interrupt is not supported yet */ /* interrupt is not supported yet */
int interrupt_init_cpu (unsigned *decrementer_count) int interrupt_init_cpu (unsigned *decrementer_count)
{ {
return 0; return 0;
} }
@ -89,14 +88,14 @@ int interrupt_init (void)
if (ret) if (ret)
return ret; return ret;
decrementer_count = get_tbclk()/CFG_HZ; decrementer_count = get_tbclk()/CFG_HZ;
debug("interrupt init: tbclk() = %d MHz, decrementer_count = %d\n", (get_tbclk()/1000000), decrementer_count); debug("interrupt init: tbclk() = %d MHz, decrementer_count = %d\n", (get_tbclk()/1000000), decrementer_count);
set_dec (decrementer_count); set_dec (decrementer_count);
set_msr (get_msr () | MSR_EE); set_msr (get_msr () | MSR_EE);
debug("MSR = 0x%08lx, Decrementer reg = 0x%08lx\n", get_msr(), get_dec()); debug("MSR = 0x%08lx, Decrementer reg = 0x%08lx\n", get_msr(), get_dec());
return 0; return 0;
} }
@ -119,7 +118,7 @@ int disable_interrupts (void)
void increment_timestamp(void) void increment_timestamp(void)
{ {
timestamp++; timestamp++;
} }
/* /*
@ -136,15 +135,15 @@ timer_interrupt_cpu (struct pt_regs *regs)
void timer_interrupt (struct pt_regs *regs) void timer_interrupt (struct pt_regs *regs)
{ {
/* call cpu specific function from $(CPU)/interrupts.c */ /* call cpu specific function from $(CPU)/interrupts.c */
timer_interrupt_cpu (regs); timer_interrupt_cpu (regs);
timestamp++; timestamp++;
ppcDcbf(&timestamp); ppcDcbf(&timestamp);
/* Restore Decrementer Count */ /* Restore Decrementer Count */
set_dec (decrementer_count); set_dec (decrementer_count);
#if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG) #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
if ((timestamp % (CFG_WATCHDOG_FREQ)) == 0) if ((timestamp % (CFG_WATCHDOG_FREQ)) == 0)
@ -164,17 +163,17 @@ void timer_interrupt (struct pt_regs *regs)
void reset_timer (void) void reset_timer (void)
{ {
timestamp = 0; timestamp = 0;
} }
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return timestamp - base; return timestamp - base;
} }
void set_timer (ulong t) void set_timer (ulong t)
{ {
timestamp = t; timestamp = t;
} }
/* /*
@ -192,11 +191,8 @@ irq_free_handler(int vec)
} }
/*
/*******************************************************************************
*
* irqinfo - print information about PCI devices,not implemented. * irqinfo - print information about PCI devices,not implemented.
*
*/ */
int int
do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])

69
cpu/mpc86xx/speed.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright 2004 Freescale Semiconductor. * Copyright 2004 Freescale Semiconductor.
* Jeff Brown (jeffrey@freescale.com) * Jeff Brown
* Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
* *
* (C) Copyright 2000-2002 * (C) Copyright 2000-2002
@ -29,9 +29,6 @@
#include <mpc86xx.h> #include <mpc86xx.h>
#include <asm/processor.h> #include <asm/processor.h>
unsigned long get_board_sys_clk(ulong dummy);
unsigned long get_sysclk_from_px_regs(void);
void get_sys_info (sys_info_t *sysInfo) void get_sys_info (sys_info_t *sysInfo)
{ {
@ -39,11 +36,11 @@ void get_sys_info (sys_info_t *sysInfo)
volatile ccsr_gur_t *gur = &immap->im_gur; volatile ccsr_gur_t *gur = &immap->im_gur;
uint plat_ratio, e600_ratio; uint plat_ratio, e600_ratio;
plat_ratio = (gur->porpllsr) & 0x0000003e; plat_ratio = (gur->porpllsr) & 0x0000003e;
plat_ratio >>= 1; plat_ratio >>= 1;
switch(plat_ratio) { switch(plat_ratio) {
case 0x0: case 0x0:
sysInfo->freqSystemBus = 16 * CONFIG_SYS_CLK_FREQ; sysInfo->freqSystemBus = 16 * CONFIG_SYS_CLK_FREQ;
break; break;
case 0x02: case 0x02:
@ -55,19 +52,14 @@ void get_sys_info (sys_info_t *sysInfo)
case 0x09: case 0x09:
case 0x0a: case 0x0a:
case 0x0c: case 0x0c:
case 0x10: case 0x10:
sysInfo->freqSystemBus = plat_ratio * CONFIG_SYS_CLK_FREQ; sysInfo->freqSystemBus = plat_ratio * CONFIG_SYS_CLK_FREQ;
break; break;
default: default:
sysInfo->freqSystemBus = 0; sysInfo->freqSystemBus = 0;
break; break;
} }
#if 0
printf("assigned system bus freq = %d for plat ratio 0x%08lx\n",
sysInfo->freqSystemBus, plat_ratio);
#endif
e600_ratio = (gur->porpllsr) & 0x003f0000; e600_ratio = (gur->porpllsr) & 0x003f0000;
e600_ratio >>= 16; e600_ratio >>= 16;
@ -75,13 +67,13 @@ void get_sys_info (sys_info_t *sysInfo)
case 0x10: case 0x10:
sysInfo->freqProcessor = 2 * sysInfo->freqSystemBus; sysInfo->freqProcessor = 2 * sysInfo->freqSystemBus;
break; break;
case 0x19: case 0x19:
sysInfo->freqProcessor = 5 * sysInfo->freqSystemBus/2; sysInfo->freqProcessor = 5 * sysInfo->freqSystemBus/2;
break; break;
case 0x20: case 0x20:
sysInfo->freqProcessor = 3 * sysInfo->freqSystemBus; sysInfo->freqProcessor = 3 * sysInfo->freqSystemBus;
break; break;
case 0x39: case 0x39:
sysInfo->freqProcessor = 7 * sysInfo->freqSystemBus/2; sysInfo->freqProcessor = 7 * sysInfo->freqSystemBus/2;
break; break;
case 0x28: case 0x28:
@ -90,16 +82,10 @@ void get_sys_info (sys_info_t *sysInfo)
case 0x1d: case 0x1d:
sysInfo->freqProcessor = 9 * sysInfo->freqSystemBus/2; sysInfo->freqProcessor = 9 * sysInfo->freqSystemBus/2;
break; break;
default: default:
/* JB - Emulator workaround until real cop is plugged in */
/* sysInfo->freqProcessor = 3 * sysInfo->freqSystemBus; */
sysInfo->freqProcessor = e600_ratio + sysInfo->freqSystemBus; sysInfo->freqProcessor = e600_ratio + sysInfo->freqSystemBus;
break; break;
} }
#if 0
printf("assigned processor freq = %d for e600 ratio 0x%08lx\n",
sysInfo->freqProcessor, e600_ratio);
#endif
} }
@ -128,6 +114,7 @@ int get_clocks(void)
* get_bus_freq * get_bus_freq
* Return system bus freq in Hz * Return system bus freq in Hz
*/ */
ulong get_bus_freq(ulong dummy) ulong get_bus_freq(ulong dummy)
{ {
ulong val; ulong val;
@ -139,42 +126,6 @@ ulong get_bus_freq(ulong dummy)
return val; return val;
} }
unsigned long get_sysclk_from_px_regs()
{
ulong val;
u8 vclkh, vclkl;
vclkh = in8(PIXIS_BASE + PIXIS_VCLKH);
vclkl = in8(PIXIS_BASE + PIXIS_VCLKL);
if ((vclkh == 0x84) && (vclkl == 0x07)) {
val = 33000000;
}
if ((vclkh == 0x3F) && (vclkl == 0x20)) {
val = 40000000;
}
if ((vclkh == 0x3F) && (vclkl == 0x2A)) {
val = 50000000;
}
if ((vclkh == 0x24) && (vclkl == 0x04)) {
val = 66000000;
}
if ((vclkh == 0x3F) && (vclkl == 0x4B)) {
val = 83000000;
}
if ((vclkh == 0x3F) && (vclkl == 0x5C)) {
val = 100000000;
}
if ((vclkh == 0xDF) && (vclkl == 0x3B)) {
val = 134000000;
}
if ((vclkh == 0xDF) && (vclkl == 0x4B)) {
val = 166000000;
}
return val;
}
/* /*
* get_board_sys_clk * get_board_sys_clk