November 2008 - U-Boot

[U-Boot] mkimage warning: ISO C99 requires ...
by Wolfgang Denk 10 Dec '08

10 Dec '08

Dear Bartek, compiling U-Boot in an old OS environment (RedHat-7.3 :-) gives the following warnigns from mkimage.[ch]: In file included from image.c:71: mkimage.h:41:23: warning: ISO C does not permit named variadic macros image.c:2422:54: warning: ISO C99 requires rest arguments to be used image.c:2840:60: warning: ISO C99 requires rest arguments to be used image.c:2847:60: warning: ISO C99 requires rest arguments to be used image.c:2854:67: warning: ISO C99 requires rest arguments to be used image.c:2892:73: warning: ISO C99 requires rest arguments to be used In file included from mkimage.c:25: mkimage.h:41:23: warning: ISO C does not permit named variadic macros mkimage.c:243:47: warning: ISO C99 requires rest arguments to be used mkimage.c:622:48: warning: ISO C99 requires rest arguments to be used Could you please have a look? Thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Any sufficiently advanced bug is indistinguishable from a feature. - Rich Kulawiec

1 1

[U-Boot] FDT warning: redefinition of `uintptr_t'
by Wolfgang Denk 10 Dec '08

10 Dec '08

Dear Jerry, compiling U-Boot in an old OS environment (RedHat-7.3 :-) gives the following warnigns from FDT: include/libfdt_env.h:50: warning: redefinition of `uintptr_t' /usr/include/stdint.h:129: warning: `uintptr_t' previously declared here Could you please have a look? Thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Genitiv ins Wasser, weil's Dativ ist!

2 2

[U-Boot] [PATCH 2/2] Minor changes to allow clean creation of new i386/sc520 boards
by Graeme Russ 10 Dec '08

10 Dec '08

Signed-off-by: Graeme Russ <graeme.russ(a)gmail.com> --- Moved PCI specific definitions out of sc520.h into a new file plus fixed include path to ssi.h cpu/i386/sc520.c | 2 +- include/asm-i386/ic/pci.h | 52 +++++++++++++++++++++++++++++++++++++++++++ include/asm-i386/ic/sc520.h | 22 ------------------ 3 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 include/asm-i386/ic/pci.h diff --git a/cpu/i386/sc520.c b/cpu/i386/sc520.c index 8bcb979..cb6bc03 100644 --- a/cpu/i386/sc520.c +++ b/cpu/i386/sc520.c @@ -32,7 +32,7 @@ #include <config.h> #include <pci.h> #ifdef CONFIG_SC520_SSI -#include <ssi.h> +#include <asm/ic/ssi.h> #endif #include <asm/io.h> #include <asm/pci.h> diff --git a/include/asm-i386/ic/pci.h b/include/asm-i386/ic/pci.h new file mode 100644 index 0000000..9721110 --- /dev/null +++ b/include/asm-i386/ic/pci.h @@ -0,0 +1,52 @@ +/* + * (C) Copyright 2008 + * Graeme Russ <graeme.russ(a)gmail.com>. + * + * (C) Copyright 2002 + * Daniel Engström, Omicron Ceti AB <daniel(a)omicron.se>. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _ASM_IC_SC520_PCI_H_ +#define _ASM_IC_SC520_PCI_H_ 1 + +/* pin number used for PCI interrupt mappings */ +#define SC520_PCI_INTA 0 +#define SC520_PCI_INTB 1 +#define SC520_PCI_INTC 2 +#define SC520_PCI_INTD 3 +#define SC520_PCI_GPIRQ0 4 +#define SC520_PCI_GPIRQ1 5 +#define SC520_PCI_GPIRQ2 6 +#define SC520_PCI_GPIRQ3 7 +#define SC520_PCI_GPIRQ4 8 +#define SC520_PCI_GPIRQ5 9 +#define SC520_PCI_GPIRQ6 10 +#define SC520_PCI_GPIRQ7 11 +#define SC520_PCI_GPIRQ8 12 +#define SC520_PCI_GPIRQ9 13 +#define SC520_PCI_GPIRQ10 14 + +extern int sc520_pci_ints[]; + +void pci_sc520_init(struct pci_controller *hose); +int pci_sc520_set_irq(int pci_pin, int irq); + +#endif diff --git a/include/asm-i386/ic/sc520.h b/include/asm-i386/ic/sc520.h index 0f7e7a5..bf39516 100644 --- a/include/asm-i386/ic/sc520.h +++ b/include/asm-i386/ic/sc520.h @@ -282,24 +282,6 @@ #define SC520_IRQ14 9 #define SC520_IRQ15 10 - -/* pin number used for PCI interrupt mappings */ -#define SC520_PCI_INTA 0 -#define SC520_PCI_INTB 1 -#define SC520_PCI_INTC 2 -#define SC520_PCI_INTD 3 -#define SC520_PCI_GPIRQ0 4 -#define SC520_PCI_GPIRQ1 5 -#define SC520_PCI_GPIRQ2 6 -#define SC520_PCI_GPIRQ3 7 -#define SC520_PCI_GPIRQ4 8 -#define SC520_PCI_GPIRQ5 9 -#define SC520_PCI_GPIRQ6 10 -#define SC520_PCI_GPIRQ7 11 -#define SC520_PCI_GPIRQ8 12 -#define SC520_PCI_GPIRQ9 13 -#define SC520_PCI_GPIRQ10 14 - /* utility functions */ void write_mmcr_byte(u16 mmcr, u8 data); void write_mmcr_word(u16 mmcr, u16 data); @@ -308,11 +290,7 @@ u8 read_mmcr_byte(u16 mmcr); u16 read_mmcr_word(u16 mmcr); u32 read_mmcr_long(u16 mmcr); -extern int sc520_pci_ints[]; - void init_sc520(void); unsigned long init_sc520_dram(void); -void pci_sc520_init(struct pci_controller *hose); -int pci_sc520_set_irq(int pci_pin, int irq); #endif -- 1.5.4.3

3 4

[U-Boot] [PATCH 1/2] Fixed build error due to #define of _LINUX_STRING_H_ in 82559_eeprom.c
by Graeme Russ 10 Dec '08

10 Dec '08

Signed-off-by: Graeme Russ <graeme.russ(a)gmail.com> --- 82559_eeprom.c is only compiled for i386 arch's (see /examples/Makefile lines 92-94). This modification should only impact sc520_cdp and sc520_spunk which need this define removed in order to compile examples/82559_eeprom.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/examples/82559_eeprom.c b/examples/82559_eeprom.c index d99af26..5e2eee9 100644 --- a/examples/82559_eeprom.c +++ b/examples/82559_eeprom.c @@ -19,7 +19,6 @@ */ #define _PPC_STRING_H_ /* avoid unnecessary str/mem functions */ -#define _LINUX_STRING_H_ /* avoid unnecessary str/mem functions */ #include <common.h> #include <exports.h> -- 1.5.4.3

2 1

[U-Boot] [PATCH] serial: Add vcth UART driver
by Stefan Roese 10 Dec '08

10 Dec '08

This patch adds the UART driver for the upcoming VCTH board support. Signed-off-by: Stefan Roese <sr(a)denx.de> --- drivers/serial/Makefile | 1 + drivers/serial/vcth.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) create mode 100755 drivers/serial/vcth.c diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index eafe543..17235ff 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -38,6 +38,7 @@ COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o COBJS-$(CONFIG_USB_TTY) += usbtty.o +COBJS-$(CONFIG_VCTH_SERIAL) += vcth.o COBJS := $(sort $(COBJS-y)) SRCS := $(COBJS:.o=.c) diff --git a/drivers/serial/vcth.c b/drivers/serial/vcth.c new file mode 100755 index 0000000..2c847d0 --- /dev/null +++ b/drivers/serial/vcth.c @@ -0,0 +1,121 @@ +/* + * (C) Copyright 2008 Stefan Roese <sr(a)denx.de>, DENX Software Engineering + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <config.h> +#include <common.h> +#include <asm/io.h> + +#define UART_1_BASE 0xBF89C000 + +#define UART_RBR_OFF 0x00 /* receiver buffer reg */ +#define UART_THR_OFF 0x00 /* transmit holding reg */ +#define UART_DLL_OFF 0x00 /* divisor latch low reg */ +#define UART_IER_OFF 0x04 /* interrupt enable reg */ +#define UART_DLH_OFF 0x04 /* receiver buffer reg */ +#define UART_FCR_OFF 0x08 /* fifo control register */ +#define UART_LCR_OFF 0x0c /* line control register */ +#define UART_MCR_OFF 0x10 /* modem control register */ +#define UART_LSR_OFF 0x14 /* line status register */ +#define UART_MSR_OFF 0x18 /* modem status register */ +#define UART_SCR_OFF 0x1c /* scratch pad register */ + +#define UART_RCV_DATA_RDY 0x01 /* Data Received */ +#define UART_XMT_HOLD_EMPTY 0x20 +#define UART_TRANSMIT_EMPTY 0x40 + +/* 7 bit on line control reg. enalbing rw to dll and dlh */ +#define UART_LCR_DLAB 0x0080 + +#define UART___9600_BDR 0x84 +#define UART__19200_BDR 0x42 +#define UART_115200_BDR 0x08 + +#define UART_DIS_ALL_INTER 0x00 /* disable all interrupts */ + +#define UART_5DATA_BITS 0x0000 /* 5 [bits] 1.5 bits 2 */ +#define UART_6DATA_BITS 0x0001 /* 6 [bits] 1 bits 2 */ +#define UART_7DATA_BITS 0x0002 /* 7 [bits] 1 bits 2 */ +#define UART_8DATA_BITS 0x0003 /* 8 [bits] 1 bits 2 */ + +static void vcth_uart_set_baud_rate(u32 address, u32 dh, u32 dl) +{ + u32 val = __raw_readl(UART_1_BASE + UART_LCR_OFF); + + /* set 7 bit on 1 */ + val |= UART_LCR_DLAB; + __raw_writel(val, UART_1_BASE + UART_LCR_OFF); + + __raw_writel(dl, UART_1_BASE + UART_DLL_OFF); + __raw_writel(dh, UART_1_BASE + UART_DLH_OFF); + + /* set 7 bit on 0 */ + val &= ~UART_LCR_DLAB; + __raw_writel(val, UART_1_BASE + UART_LCR_OFF); + + return; +} + +int serial_init(void) +{ + __raw_writel(UART_DIS_ALL_INTER, UART_1_BASE + UART_IER_OFF); + vcth_uart_set_baud_rate(UART_1_BASE, 0, UART_115200_BDR); + __raw_writel(UART_8DATA_BITS, UART_1_BASE + UART_LCR_OFF); + + return 0; +} + +void serial_setbrg(void) +{ + /* + * Baudrate change not supported currently, fixed to 115200 baud + */ +} + +void serial_putc(const char c) +{ + if (c == '\n') + serial_putc('\r'); + + while (!(UART_XMT_HOLD_EMPTY & __raw_readl(UART_1_BASE + UART_LSR_OFF))) + ; + + __raw_writel(c, UART_1_BASE + UART_THR_OFF); +} + +void serial_puts(const char *s) +{ + while (*s) + serial_putc(*s++); +} + +int serial_getc(void) +{ + while (!(UART_RCV_DATA_RDY & __raw_readl(UART_1_BASE + UART_LSR_OFF))) + ; + + return __raw_readl(UART_1_BASE + UART_RBR_OFF) & 0xff; +} + +int serial_tstc(void) +{ + if (!(UART_RCV_DATA_RDY & __raw_readl(UART_1_BASE + UART_LSR_OFF))) + return 0; + + return 1; +} -- 1.6.0.4

2 1

[U-Boot] PATCH: mpc8xx PLPRCR (init_pll_866)
by Spencer Putt 10 Dec '08

10 Dec '08

Signed-off-by: Spencer Putt Raytheon Company The current init_pll_866 makes a bad assumption for the oscillator. A board with a slower oscillator may lead to PLPRCR fields overflowing their bounds and making the board not boot. This patch should more accurately set the PLPRCR regardless of the oscillator, and will increase the probability a board will boot by doing some bounds checking. --- cpu_mpc8xx_speed.c 2008-10-16 15:37:10.000000000 -0400 +++ speed.c 2008-10-16 15:35:44.000000000 -0400 @@ -313,56 +313,60 @@ } /* Configure PLL for MPC866/859/885 CPU series - * PLL multiplication factor is set to the value nearest to the desired clk, - * assuming a oscclk of 10 MHz. + * PLL multiplication factor is set to the value nearest to the desired clk + * If the clk is unattainable, it is set to the highest possible, OSCLK*16 */ static long init_pll_866 (long clk) { extern void plprcr_write_866 (long); volatile immap_t *immr = (immap_t *) CFG_IMMR; - long n, plprcr; - char mfi, mfn, mfd, s, pdf; - long step_mfi, step_mfn; - - if (clk < 20000000) { - clk *= 2; - pdf = 1; - } else { - pdf = 0; - } + long n, plprcr, mfi; + char mfn, mfd, s; + long pdf = -1; + long step_mfi, step_mfn; + +/* The goal is to make (mfi / pdf) * (OSCLK >> s) = clk + * + * Generally having s as high as possible is desired. + * This is because the final resolution depends on the + * the OSCLK freq >> s. So let's see how we can manipulate + * the predivision factor (pdf) to allow s to be as large + * as possible. + */ + s = 2; + mfi = clk / (CONFIG_8xx_OSCLK / 4); - if (clk < 40000000) { - s = 2; - step_mfi = CONFIG_8xx_OSCLK / 4; - mfd = 7; - step_mfn = CONFIG_8xx_OSCLK / 30; - } else if (clk < 80000000) { + if (mfi > 16 * 2) { + s = 0; + } else if (mfi > 16) { s = 1; - step_mfi = CONFIG_8xx_OSCLK / 2; - mfd = 14; - step_mfn = CONFIG_8xx_OSCLK / 30; + } + + /* Modify pdf until mfi is in range (5 to 15) */ + do { + step_mfi = (CONFIG_8xx_OSCLK >> s) / (++pdf + 1); + mfi = clk / step_mfi; + } while (mfi < 5 && pdf < 16); + + /* Set the denominator to 32 */ + mfd = 31; + step_mfn = step_mfi / (mfd + 1); + + /* Check mfi's range (the frequency may be unattainable) */ + if (mfi > 15) { + /* FIXME: possibly warn the user */ + mfi = 15; + mfn = 31; } else { - s = 0; - step_mfi = CONFIG_8xx_OSCLK; - mfd = 29; - step_mfn = CONFIG_8xx_OSCLK / 30; + /* Find the numerator (n/32) */ + mfn = (clk - (mfi * step_mfi)) / step_mfn; } - /* Calculate integer part of multiplication factor - */ - n = clk / step_mfi; - mfi = (char)n; - - /* Calculate numerator of fractional part of multiplication factor - */ - n = clk - (n * step_mfi); - mfn = (char)(n / step_mfn); - - /* Calculate effective clk - */ - n = ((mfi * step_mfi) + (mfn * step_mfn)) / (pdf + 1); + /* Calculate effective clock */ + n = (mfi * step_mfi) + (mfn * step_mfn); + /* Unlock the PLPRCR */ immr->im_clkrstk.cark_plprcrk = KAPWR_KEY; plprcr = (immr->im_clkrst.car_plprcr & ~(PLPRCR_MFN_MSK @@ -379,6 +383,7 @@ plprcr |= PLPRCR_DBRMO; plprcr_write_866 (plprcr); /* set value using SIU4/9 workaround */ + immr->im_clkrstk.cark_plprcrk = 0x00000000; return (n);

2 1

[U-Boot] [PATCH] sh: Update sh timer function
by Nobuhiro Iwamatsu 10 Dec '08

10 Dec '08

Change to write/readX fcuntion and fix timer bug. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- cpu/sh3/Makefile | 2 +- cpu/sh3/time.c | 103 ------------------------------------------------------ cpu/sh4/time.c | 76 ++++++++++++++++++++++++++------------- 3 files changed, 52 insertions(+), 129 deletions(-) delete mode 100644 cpu/sh3/time.c diff --git a/cpu/sh3/Makefile b/cpu/sh3/Makefile index 587413d..e3e5777 100644 --- a/cpu/sh3/Makefile +++ b/cpu/sh3/Makefile @@ -32,7 +32,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a SOBJS = start.o -COBJS = cpu.o interrupts.o watchdog.o time.o cache.o +COBJS = cpu.o interrupts.o watchdog.o cache.o ../sh4/time.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/cpu/sh3/time.c b/cpu/sh3/time.c deleted file mode 100644 index aab3659..0000000 --- a/cpu/sh3/time.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * (C) Copyright 2007 - * Yoshihiro Shimoda <shimoda.yoshihiro(a)renesas.com> - * - * (C) Copyright 2007 - * Nobobuhiro Iwamatsu <iwamatsu(a)nigauri.org> - * - * (C) Copyright 2003 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <common.h> -#include <asm/processor.h> -#include <asm/io.h> - -#define TMU_MAX_COUNTER (~0UL) - -static void tmu_timer_start(unsigned int timer) -{ - if (timer > 2) - return; - - outb(inb(TSTR) | (1 << timer), TSTR); -} - -static void tmu_timer_stop(unsigned int timer) -{ - u8 val = inb(TSTR); - - if (timer > 2) - return; - outb(val & ~(1 << timer), TSTR); -} - -int timer_init(void) -{ - /* Divide clock by 4 */ - outw(0, TCR0); - - tmu_timer_stop(0); - tmu_timer_start(0); - return 0; -} - -/* - In theory we should return a true 64bit value (ie something that doesn't - overflow). However, we don't. Therefore if TMU runs at fastest rate of - 6.75 MHz this value will wrap after u-boot has been running for approx - 10 minutes. -*/ -unsigned long long get_ticks(void) -{ - return (0 - inl(TCNT0)); -} - -unsigned long get_timer(unsigned long base) -{ - return ((0 - inl(TCNT0)) - base); -} - -void set_timer(unsigned long t) -{ - outl(0 - t, TCNT0); -} - -void reset_timer(void) -{ - tmu_timer_stop(0); - set_timer(0); - tmu_timer_start(0); -} - -void udelay(unsigned long usec) -{ - unsigned int start = get_timer(0); - unsigned int end = start + (usec * ((CONFIG_SYS_HZ + 500000) / 1000000)); - - while (get_timer(0) < end) - continue; -} - -unsigned long get_tbclk(void) -{ - return CONFIG_SYS_HZ; -} diff --git a/cpu/sh4/time.c b/cpu/sh4/time.c index 77e0ae2..4bed633 100644 --- a/cpu/sh4/time.c +++ b/cpu/sh4/time.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007 + * (C) Copyright 2007-2008 * Nobobuhiro Iwamatsu <iwamatsu(a)nigauri.org> * * (C) Copyright 2003 @@ -26,54 +26,89 @@ #include <common.h> #include <asm/processor.h> +#include <asm/io.h> #define TMU_MAX_COUNTER (~0UL) +static int clk_adj = 1; static void tmu_timer_start (unsigned int timer) { if (timer > 2) return; - - *((volatile unsigned char *) TSTR) |= (1 << timer); + writeb(readb(TSTR) | (1 << timer), TSTR); } static void tmu_timer_stop (unsigned int timer) { - u8 val = *((volatile u8 *)TSTR); if (timer > 2) return; - *((volatile unsigned char *)TSTR) = val &~(1 << timer); + writeb(readb(TSTR) & ~(1 << timer), TSTR); } int timer_init (void) { - /* Divide clock by 4 */ - *(volatile u16 *)TCR0 = 0; + /* Divide clock by TMU_CLK_DIVIDER */ + u16 bit = 0; + switch( TMU_CLK_DIVIDER ){ + case 4: + bit = 0; + break; + case 16: + bit = 1; + break; + case 64: bit = 2; + break; + case 256: + bit = 3; + break; + case 1024: + bit = 4; + break; + default: + bit = 0; + break; + } + writew(readw(TCR0) | bit, TCR0); + + /* Clock adjustment calc */ + clk_adj = (int)(1.0/((1.0/CONFIG_SYS_HZ)*1000000)); + if (clk_adj < 1) + clk_adj = 1; tmu_timer_stop(0); tmu_timer_start(0); + return 0; } -/* - In theory we should return a true 64bit value (ie something that doesn't - overflow). However, we don't. Therefore if TMU runs at fastest rate of - 6.75 MHz this value will wrap after u-boot has been running for approx - 10 minutes. -*/ unsigned long long get_ticks (void) { - return (0 - *((volatile u32 *) TCNT0)); + return 0 - readl(TCNT0); +} + +static unsigned long get_usec (void) +{ + return (0 - readl(TCNT0)); +} + +void udelay (unsigned long usec) +{ + unsigned int start = get_usec(); + unsigned int end = start + (usec * clk_adj); + + while (get_usec() < end) + continue; } unsigned long get_timer (unsigned long base) { - return ((0 - *((volatile u32 *) TCNT0)) - base); + /* return msec */ + return ((get_usec()/clk_adj)/1000) - base; } void set_timer (unsigned long t) { - *((volatile unsigned int *) TCNT0) = (0 - t); + writel((0 - t), TCNT0); } void reset_timer (void) @@ -83,15 +118,6 @@ void reset_timer (void) tmu_timer_start(0); } -void udelay (unsigned long usec) -{ - unsigned int start = get_timer (0); - unsigned int end = start + (usec * ((CONFIG_SYS_HZ + 500000) / 1000000)); - - while (get_timer (0) < end) - continue; -} - unsigned long get_tbclk (void) { return CONFIG_SYS_HZ; -- 1.5.6.5

3 3

[U-Boot] add usb_system_autoupdate command.
by Matteo Facchinetti 10 Dec '08

10 Dec '08

Hi, I have add the possibility to automatic update entire flash using a USB pendrive. To make it, need the following steps: 1) insert usb pendrive. In pendrive must be present these files: install.dat and the files we want to copy. 2) from uboot console: => usb_system_autoupdate 3) the system update start, reading information from install.dat file. The install.dat file raws has this syntax: <file_type> "<file_name>" <star_flash_addr_partition> <end_flash_addr_partition> file_type values: kernel, uboot, fdt, rootfs. In attachment there's an example of install.dat and the source code. Now using it on my system (mpc5200, uboot_1.3.1) but there's a problem that I can't fix: if try to update uboot partition, it freeze in line 211 when call do_flerase(). debugging I can see that it freeze in: cmd_flash.c 434: printf ("Erased %d sectors\n", erased); after uboot partition erasing. Can you help me? Thanks in advance. Matteo Facchinetti

4 4

[U-Boot] alpr U-Boot image too big
by Stefan Roese 09 Dec '08

09 Dec '08

Hi Pieter, I just noticed that the alpr doesn't build anymore in the current U-Boot version (main and 4xx). The image size (256k) is exceeded because of general code growth. We either need to remove some features/commands from the alpr target or increase the image size. Please advise how to fix this. A patch would be most welcome. Thanks. Best regards, Stefan ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office(a)denx.de =====================================================================

2 3

[U-Boot] [PATCH] mgcoge make ether_scc.c work with CONFIG_NET_MULTI
by Gary Jennejohn 09 Dec '08

09 Dec '08

This change is needed for mgcoge because it uses two ethernet drivers. Add a check for the presence of the PIGGY board on mgcoge. Without this board networking cannot work and the initialization must be aborted. Only allocate rtx once to prevent DPRAM exhaustion. Initialize ether_scc.c and the keymile-specific HDLC driver (to be added soon) in eth.c. Signed-off-by: Gary Jennejohn <garyj(a)denx.de> --- I ran "MAKEALL ppc" and no errors were caused by this patch. cpu/mpc8260/ether_scc.c | 56 +++++++++++++++++++++++++++++++++++++++++------ net/eth.c | 8 ++++++ 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/cpu/mpc8260/ether_scc.c b/cpu/mpc8260/ether_scc.c index c65f0e0..537cd39 100644 --- a/cpu/mpc8260/ether_scc.c +++ b/cpu/mpc8260/ether_scc.c @@ -10,6 +10,12 @@ * Advent Networks, Inc. <http://www.adventnetworks.com> * Jay Monkman <jtm(a)smoothsmoothie.com> * + * Modified so that it plays nicely when more than one ETHERNET interface + * is in use a la ether_fcc.c. + * (C) Copyright 2008 + * DENX Software Engineerin GmbH + * Gary Jennejohn <garyj(a)denx.de> + * * See file CREDITS for list of people who contributed to this * project. * @@ -32,12 +38,17 @@ #include <common.h> #include <asm/cpm_8260.h> #include <mpc8260.h> +#include <malloc.h> #include <net.h> #include <command.h> #include <config.h> #if defined(CONFIG_ETHER_ON_SCC) && defined(CONFIG_CMD_NET) +#ifndef CONFIG_NET_MULTI +#error "CONFIG_NET_MULTI must be defined." +#endif + #if (CONFIG_ETHER_INDEX == 1) # define PROFF_ENET PROFF_SCC1 # define CPM_CR_ENET_PAGE CPM_CR_SCC1_PAGE @@ -100,7 +111,7 @@ typedef volatile struct CommonBufferDescriptor { static RTXBD *rtx; -int eth_send(volatile void *packet, int length) +int sec_send(struct eth_device *dev, volatile void *packet, int length) { int i; int result = 0; @@ -137,7 +148,7 @@ int eth_send(volatile void *packet, int length) } -int eth_rx(void) +int sec_rx(struct eth_device *dev) { int length; @@ -184,19 +195,32 @@ int eth_rx(void) * *************************************************************/ -int eth_init(bd_t *bis) +int sec_init(struct eth_device *dev, bd_t *bis) { int i; volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; scc_enet_t *pram_ptr; uint dpaddr; +#if defined(CONFIG_CHECK_ETHERNET_PRESENT) + if (ethernet_present (CONFIG_ETHER_INDEX) == 0) { + printf("Ethernet index: %d not present.\n", + CONFIG_ETHER_INDEX); + return -1; + } +#endif + rxIdx = 0; txIdx = 0; - /* assign static pointer to BD area */ - dpaddr = m8260_cpm_dpalloc(sizeof(RTXBD) + 2, 16); - rtx = (RTXBD *)&immr->im_dprambase[dpaddr]; + /* + * Assign static pointer to BD area. + * Avoid exhausting DPRAM, which would cause a panic. + */ + if (rtx == NULL) { + dpaddr = m8260_cpm_dpalloc(sizeof(RTXBD) + 2, 16); + rtx = (RTXBD *)&immr->im_dprambase[dpaddr]; + } /* 24.21 - (1-3): ioports have been set up already */ @@ -338,7 +362,7 @@ int eth_init(bd_t *bis) } -void eth_halt(void) +void sec_halt(struct eth_device *dev) { volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; immr->im_scc[CONFIG_ETHER_INDEX-1].scc_gsmrl &= ~(SCC_GSMRL_ENR | @@ -354,4 +378,22 @@ void restart(void) } #endif +int sec_initialize(bd_t *bis) +{ + struct eth_device *dev; + + dev = (struct eth_device *) malloc(sizeof *dev); + memset(dev, 0, sizeof *dev); + + sprintf(dev->name, "SCC ETHERNET"); + dev->init = sec_init; + dev->halt = sec_halt; + dev->send = sec_send; + dev->recv = sec_rx; + + eth_register(dev); + + return 1; +} + #endif diff --git a/net/eth.c b/net/eth.c index ccd871a..5fe8b83 100644 --- a/net/eth.c +++ b/net/eth.c @@ -48,6 +48,8 @@ extern int ppc_4xx_eth_initialize(bd_t *); extern int scc_initialize(bd_t*); extern int npe_initialize(bd_t *); extern int uec_initialize(int); +extern int sec_initialize(bd_t *); +extern int keymile_hdlc_enet_initialize(bd_t *); #ifdef CONFIG_API extern void (*push_packet)(volatile void *, int); @@ -196,6 +198,12 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_IXP4XX_NPE) npe_initialize(bis); #endif +#if defined(CONFIG_ETHER_ON_SCC) && defined(CONFIG_MPC8260) + sec_initialize(bis); +#endif +#if defined(CONFIG_KEYMILE_HDLC_ENET) + keymile_hdlc_enet_initialize(bis); +#endif if (!eth_devices) { puts ("No ethernet found.\n"); show_boot_progress (-64); -- 1.5.4.3 --- Gary Jennejohn ********************************************************************* DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office(a)denx.de *********************************************************************

3 9