diff options
| -rw-r--r-- | CHANGELOG | 12 | ||||
| -rw-r--r-- | CREDITS | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | cpu/arm926ejs/interrupts.c | 1 | ||||
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 4 | ||||
| -rw-r--r-- | lib_arm/armlinux.c | 3 | ||||
| -rw-r--r-- | lib_ppc/board.c | 6 |
8 files changed, 26 insertions, 11 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4a4aa295648..b171eff0448 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,18 @@ Changes for U-Boot 1.0.2: ====================================================================== +* Patch by Phillippe Robin, 16 Mar 2004: + avoid dereferencing NULL pointer in lib_arm/armlinux.c + +* Patch by Stephen Williams, 15 Mar 2004: + Fix CONFIG_SERIAL_SOFTWARE_FIFO documentation + +* Patch by Tolunay Orkun, 15 Mar 2004: + Initialize bi_opbfreq to real OPB frequency via get_OPB_freq() + +* Patch by Travis Sawyer, 15 Mar 2004: + Update CREDITS & MAINTAINERS files for PPC440GX & Ocotea port + * Add start-up delay to make sure power has stabilized before attempting to switch on USB on SX1 board. @@ -284,7 +284,7 @@ D: Author of LiMon-1.4.2, which contributed some ideas N: Travis B. Sawyer E: travis.sawyer@sandburst.com -D: Support for IBM PPC440GX, XES XPedite1000 440GX PrPMC board. +D: Support for IBM PPC440GX, XES XPedite1000 440GX PrPMC board. IBM 440gx Ref Platform (Ocotea) N: Paolo Scaffardi E: arsenio@tin.it diff --git a/MAINTAINERS b/MAINTAINERS index fa9db9639b1..6f8383ebb8b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -230,6 +230,11 @@ Stefan Roese <stefan.roese@esd-electronics.com> PMC405 PPC405GP VOH405 PPC405EP +Travis Sawyer (travis.sawyer@sandburst.com> + + XPEDITE1K PPC440GX + OCOTEA PPC440GX + Peter De Schrijver <p2@mind.be> ML2 PPC4xx @@ -441,8 +441,8 @@ The following options need to be configured: (RTS/CTS) and UART's built-in FIFO. Set the number of bytes the interrupt driven input buffer should have. - Set to 0 to disable this feature (this is the default). - This will also disable hardware handshake. + Leave undefined to disable this feature, including + disable the buffer and hardware handshake. - Console UART Number: CONFIG_UART1_CONSOLE diff --git a/cpu/arm926ejs/interrupts.c b/cpu/arm926ejs/interrupts.c index 3770660282e..4fdac9fc17f 100644 --- a/cpu/arm926ejs/interrupts.c +++ b/cpu/arm926ejs/interrupts.c @@ -211,7 +211,6 @@ int interrupt_init (void) *(volatile ulong *)(CFG_TIMERBASE + 0) = CFG_TIMER_RELOAD; /* TimerLoad */ *(volatile ulong *)(CFG_TIMERBASE + 4) = CFG_TIMER_RELOAD; /* TimerValue */ *(volatile ulong *)(CFG_TIMERBASE + 8) = 0x8C; - /* *(volatile ulong *)(CFG_TIMERBASE + 8) = CFG_TIMER_CTRL | 0x40; Periodic */ #endif /* CONFIG_VERSATILE */ /* init the timestamp and lastdec value */ diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 50499e214e5..6e20faa3900 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -830,8 +830,8 @@ int mpc5xxx_fec_initialize(bd_t * bis) fec->eth = (ethernet_regs *)MPC5XXX_FEC; fec->tbdBase = (FEC_TBD *)FEC_BD_BASE; fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD)); -#if defined(CONFIG_ICECUBE) || - defined(CONFIG_PM520) || +#if defined(CONFIG_ICECUBE) || \ + defined(CONFIG_PM520) || \ defined(CONFIG_TOP5200) # ifndef CONFIG_FEC_10MBIT fec->xcv_type = MII100; diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c index 8ace062750e..eca9a052c4e 100644 --- a/lib_arm/armlinux.c +++ b/lib_arm/armlinux.c @@ -312,6 +312,9 @@ static void setup_commandline_tag (bd_t *bd, char *commandline) { char *p; + if (!commandline) + return; + /* eat leading white space */ for (p = commandline; *p == ' '; p++); diff --git a/lib_ppc/board.c b/lib_ppc/board.c index a85425c312b..a3f7f173bf9 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -507,12 +507,8 @@ void board_init_f (ulong bootflag) bd->bi_plb_busfreq = gd->bus_clk; #if defined(CONFIG_405GP) || defined(CONFIG_405EP) bd->bi_pci_busfreq = get_PCI_freq (); + bd->bi_opbfreq = get_OPB_freq (); -#ifdef CFG_OPB_FREQ - bd->bi_opbfreq = CFG_OPB_FREQ; -#else - bd->bi_opbfreq = 50000000; -#endif bd->bi_iic_fast[0] = 0; bd->bi_iic_fast[1] = 0; #elif defined(CONFIG_XILINX_ML300) |