diff options
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | CREDITS | 4 | ||||
| -rw-r--r-- | MAKEALL | 4 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | board/dbau1x00/dbau1x00.c | 11 | ||||
| -rw-r--r-- | board/dbau1x00/memsetup.S | 239 | ||||
| -rw-r--r-- | common/serial.c | 9 | ||||
| -rw-r--r-- | cpu/mips/au1x00_eth.c | 5 | ||||
| -rw-r--r-- | cpu/mips/au1x00_serial.c | 4 | ||||
| -rw-r--r-- | cpu/ppc4xx/serial.c | 240 | ||||
| -rw-r--r-- | doc/README.serial_multi | 17 | ||||
| -rw-r--r-- | include/asm-mips/au1x00.h | 36 | ||||
| -rw-r--r-- | include/configs/dbau1x00.h | 67 | ||||
| -rw-r--r-- | include/serial.h | 7 |
14 files changed, 607 insertions, 53 deletions
@@ -2,6 +2,13 @@ Changes for U-Boot 1.1.3: ====================================================================== +* Patch by Leif Lindholm, 23 Sep 2004: + add support for the AMD db1550 board + +* Patch by Travis Sawyer, 15 Sep 2004: + Add CONFIG_SERIAL_MULTI support for ppc4xx, + update README.serial_multi + * Patches by David Snowdon, 07 Sep 2004: - add u-boot.hex target in the top level Makefile - add support for the UNSW/NICTA PLEB 2 board (pleb2) @@ -253,6 +253,10 @@ E: team@leox.org D: Support for LEOX boards, DS164x RTC W: http://www.leox.org +N: Leif Lindholm +E: leif.lindholm@i3micro.com +D: Support for AMD dbau1550 board. + N: Stephan Linz E: linz@li-pro.net D: Support for Nios Stratix Development Kit (DK-1S10) @@ -180,9 +180,9 @@ LIST_mips4kc="incaip" LIST_mips5kc="purple" -LIST_au1x00="dbau1000 dbau1100 dbau1500" +LIST_au1xx0="dbau1000 dbau1100 dbau1500 dbau1550 dbau1550_el" -LIST_mips="${LIST_mips4kc} ${LIST_mips5kc} ${LIST_au1x00}" +LIST_mips="${LIST_mips4kc} ${LIST_mips5kc} ${LIST_au1xx0}" ######################################################################### ## i386 Systems @@ -1467,6 +1467,16 @@ dbau1500_config : unconfig @echo "#define CONFIG_DBAU1500 1" >>include/config.h @./mkconfig -a dbau1x00 mips mips dbau1x00 +dbau1550_config : unconfig + @ >include/config.h + @echo "#define CONFIG_DBAU1550 1" >>include/config.h + @./mkconfig -a dbau1x00 mips mips dbau1x00 + +dbau1550_el_config : unconfig + @ >include/config.h + @echo "#define CONFIG_DBAU1550 1" >>include/config.h + @./mkconfig -a dbau1x00 mips mips dbau1x00 "" little + ######################################################################### ## MIPS64 5Kc ######################################################################### diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c index df1c15c292..1f7253ee96 100644 --- a/board/dbau1x00/dbau1x00.c +++ b/board/dbau1x00/dbau1x00.c @@ -30,7 +30,7 @@ long int initdram(int board_type) { /* Sdram is setup by assembler code */ /* If memory could be changed, we should return the true value here */ - return 64*1024*1024; + return MEM_SIZE*1024*1024; } #define BCSR_PCMCIA_PC0DRVEN 0x0010 @@ -42,8 +42,8 @@ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 ); int checkboard (void) { u16 status; - volatile u32 *pcmcia_bcsr = (u32*)(DB1000_BCSR_ADDR+0x10); - volatile u32 *phy = (u32*)(DB1000_BCSR_ADDR+0xC); + volatile u32 *pcmcia_bcsr = (u32*)(DB1XX0_BCSR_ADDR+0x10); + volatile u32 *phy = (u32*)(DB1XX0_BCSR_ADDR+0xC); volatile u32 *sys_counter = (volatile u32*)SYS_COUNTER_CNTRL; u32 proc_id; @@ -67,6 +67,11 @@ int checkboard (void) printf ("CPU: Au1100, id: 0x%02x, rev: 0x%02x\n", (proc_id >> 8) & 0xFF, proc_id & 0xFF); break; + case 3: + puts ("Board: DbAu1550\n"); + printf ("CPU: Au1550, id: 0x%02x, rev: 0x%02x\n", + (proc_id >> 8) & 0xFF, proc_id & 0xFF); + break; default: printf ("Unsupported cpu %d, proc_id=0x%x\n", proc_id >> 24, proc_id); } diff --git a/board/dbau1x00/memsetup.S b/board/dbau1x00/memsetup.S index d2a17a01b0..c96d8a5099 100644 --- a/board/dbau1x00/memsetup.S +++ b/board/dbau1x00/memsetup.S @@ -9,7 +9,8 @@ #define AU1500_SYS_ADDR 0xB1900000 #define sys_endian 0x0038 #define CP0_Config0 $16 -#define MEM_1MS ((396000000/1000000) * 1000) +#define CPU_SCALE ((CFG_MHZ) / 12) /* CPU clock is a multiple of 12 MHz */ +#define MEM_1MS ((CFG_MHZ) * 1000) .text .set noreorder @@ -23,6 +24,19 @@ memsetup: * Switch S1.1 Off(bit7 reads 1) is Little Endian * Switch S1.1 On (bit7 reads 0) is Big Endian */ +#ifdef CONFIG_DBAU1550 + li t0, MEM_STCFG2 + li t1, 0x00000040 + sw t1, 0(t0) + + li t0, MEM_STTIME2 + li t1, 0x22080a20 + sw t1, 0(t0) + + li t0, MEM_STADDR2 + li t1, 0x10c03f00 + sw t1, 0(t0) +#else li t0, MEM_STCFG1 li t1, 0x00000080 sw t1, 0(t0) @@ -34,9 +48,10 @@ memsetup: li t0, MEM_STADDR1 li t1, 0x10c03f00 sw t1, 0(t0) +#endif - li t0, 0xAE000008 - lw t1,0(t0) + li t0, DB1XX0_BCSR_ADDR + lw t1,8(t0) andi t1,t1,0x80 beq zero,t1,big_endian nop @@ -98,10 +113,82 @@ big_endian: mtc0 zero, CP0_WIRED nop +#ifdef CONFIG_DBAU1550 + /* No workaround if running from ram */ + lui t0, 0xffc0 + lui t3, 0xbfc0 + and t1, ra, t0 + bne t1, t3, noCacheJump + nop + + /*** From AMD YAMON ***/ + /* + * Step 8) Initialize the caches + */ + li t0, (16*1024) + li t1, 32 + li t2, 0x80000000 + addu t3, t0, t2 +cacheloop: + cache 0, 0(t2) + cache 1, 0(t2) + addu t2, t1 + bne t2, t3, cacheloop + nop + + /* Save return address */ + move t3, ra + + /* Run from cacheable space now */ + bal cachehere + nop +cachehere: + li t1, ~0x20000000 /* convert to KSEG0 */ + and t0, ra, t1 + addi t0, 5*4 /* 5 insns beyond cachehere */ + jr t0 + nop + + /* Restore return address */ + move ra, t3 + + /* + * Step 9) Initialize the TLB + */ + li t0, 0 # index value + li t1, 0x00000000 # entryhi value + li t2, 32 # 32 entries + +tlbloop: + /* Probe TLB for matching EntryHi */ + mtc0 t1, CP0_ENTRYHI + tlbp + nop + + /* Examine Index[P], 1=no matching entry */ + mfc0 t3, CP0_INDEX + li t4, 0x80000000 + and t3, t4, t3 + addiu t1, t1, 1 # increment t1 (asid) + beq zero, t3, tlbloop + nop + + /* Initialize the TLB entry */ + mtc0 t0, CP0_INDEX + mtc0 zero, CP0_ENTRYLO0 + mtc0 zero, CP0_ENTRYLO1 + mtc0 zero, CP0_PAGEMASK + tlbwi + + /* Do it again */ + addiu t0, t0, 1 + bne t0, t2, tlbloop + nop + /* First setup pll:s to make serial work ok */ /* We have a 12 MHz crystal */ li t0, SYS_CPUPLL - li t1, 0x21 /* 396 MHz */ + li t1, CPU_SCALE /* CPU clock */ sw t1, 0(t0) sync nop @@ -119,19 +206,49 @@ big_endian: sync /* Static memory controller */ + /* RCE0 - can not change while fetching, do so from icache */ + move t2, ra /* Store return address */ + bal getAddr + nop - /* RCE0 AMD 29LV640M MirrorBit Flash */ +getAddr: + move t1, ra + move ra, t2 /* Move return addess back */ + + cache 0x14,0(t1) + cache 0x14,32(t1) + /*** /From YAMON ***/ + +noCacheJump: +#endif /* CONFIG_DBAU1550 */ + +#ifdef CONFIG_DBAU1550 + li t0, MEM_STTIME0 + li t1, 0x040181D7 + sw t1, 0(t0) + + /* RCE0 AMD MirrorBit Flash (?) */ li t0, MEM_STCFG0 - li t1, 0x00000013 + li t1, 0x00000003 sw t1, 0(t0) + li t0, MEM_STADDR0 + li t1, 0x11803E00 + sw t1, 0(t0) +#else /* CONFIG_DBAU1550 */ li t0, MEM_STTIME0 - li t1, 0x040181D7 + li t1, 0x00014C0F + sw t1, 0(t0) + + /* RCE0 AMD 29LV640M MirrorBit Flash */ + li t0, MEM_STCFG0 + li t1, 0x00000013 sw t1, 0(t0) li t0, MEM_STADDR0 li t1, 0x11E03F80 sw t1, 0(t0) +#endif /* CONFIG_DBAU1550 */ /* RCE1 CPLD Board Logic */ li t0, MEM_STCFG1 @@ -146,8 +263,21 @@ big_endian: li t1, 0x10c03f00 sw t1, 0(t0) +#ifdef CONFIG_DBAU1550 /* RCE2 CPLD Board Logic */ li t0, MEM_STCFG2 + li t1, 0x00000040 + sw t1, 0(t0) + + li t0, MEM_STTIME2 + li t1, 0x22080a20 + sw t1, 0(t0) + + li t0, MEM_STADDR2 + li t1, 0x10c03f00 + sw t1, 0(t0) +#else + li t0, MEM_STCFG2 li t1, 0x00000000 sw t1, 0(t0) @@ -158,6 +288,7 @@ big_endian: li t0, MEM_STADDR2 li t1, 0x00000000 sw t1, 0(t0) +#endif /* RCE3 PCMCIA 250ns */ li t0, MEM_STCFG3 @@ -281,6 +412,99 @@ big_endian: bne t1, zero, 1b nop +#ifdef CONFIG_DBAU1550 +/* SDCS 0,1,2 DDR SDRAM */ + li t0, MEM_SDMODE0 + li t1, 0x04276221 + sw t1, 0(t0) + + li t0, MEM_SDMODE1 + li t1, 0x04276221 + sw t1, 0(t0) + + li t0, MEM_SDMODE2 + li t1, 0x04276221 + sw t1, 0(t0) + + li t0, MEM_SDADDR0 + li t1, 0xe21003f0 + sw t1, 0(t0) + + li t0, MEM_SDADDR1 + li t1, 0xe21043f0 + sw t1, 0(t0) + + li t0, MEM_SDADDR2 + li t1, 0xe21083f0 + sw t1, 0(t0) + + sync + + li t0, MEM_SDCONFIGA + li t1, 0x9030060a /* Program refresh - disabled */ + sw t1, 0(t0) + sync + + li t0, MEM_SDCONFIGB + li t1, 0x00028000 + sw t1, 0(t0) + sync + + li t0, MEM_SDPRECMD /* Precharge all */ + li t1, 0 + sw t1, 0(t0) + sync + + li t0, MEM_SDWRMD0 + li t1, 0x40000000 + sw t1, 0(t0) + sync + + li t0, MEM_SDWRMD1 + li t1, 0x40000000 + sw t1, 0(t0) + sync + + li t0, MEM_SDWRMD2 + li t1, 0x40000000 + sw t1, 0(t0) + sync + + li t0, MEM_SDWRMD0 + li t1, 0x00000063 + sw t1, 0(t0) + sync + + li t0, MEM_SDWRMD1 + li t1, 0x00000063 + sw t1, 0(t0) + sync + + li t0, MEM_SDWRMD2 + li t1, 0x00000063 + sw t1, 0(t0) + sync + + li t0, MEM_SDPRECMD /* Precharge all */ + sw zero, 0(t0) + sync + + /* Issue 2 autoref */ + li t0, MEM_SDAUTOREF + sw zero, 0(t0) + sync + + li t0, MEM_SDAUTOREF + sw zero, 0(t0) + sync + + /* Enable refresh */ + li t0, MEM_SDCONFIGA + li t1, 0x9830060a /* Program refresh - enabled */ + sw t1, 0(t0) + sync + +#else /* CONFIG_DBAU1550 */ /* SDCS 0,1 SDRAM */ li t0, MEM_SDMODE0 li t1, 0x005522AA @@ -339,6 +563,7 @@ big_endian: sw t1, 0(t0) sync +#endif /* CONFIG_DBAU1550 */ /* wait 1mS after setup */ li t1, MEM_1MS 1: add t1, -1 diff --git a/common/serial.c b/common/serial.c index 4f50911f66..22d8fd0584 100644 --- a/common/serial.c +++ b/common/serial.c @@ -38,6 +38,9 @@ struct serial_device *default_serial_console (void) #elif defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \ || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4) return &serial_scc_device; +#elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ + || defined(CONFIG_405EP) + return &serial0_device; #else #error No default console #endif @@ -71,6 +74,12 @@ void serial_initialize (void) serial_register (&serial_scc_device); #endif +#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ + || defined(CONFIG_405EP) + serial_register(&serial0_device); + serial_register(&serial1_device); +#endif + serial_assign (default_serial_console ()->name); } diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c index 4f68a9b02a..b8219bf05b 100644 --- a/cpu/mips/au1x00_eth.c +++ b/cpu/mips/au1x00_eth.c @@ -46,10 +46,15 @@ #define ETH0_BASE AU1500_ETH0_BASE #define MAC0_ENABLE AU1500_MAC0_ENABLE #else +#ifdef CONFIG_AU1550 +#define ETH0_BASE AU1550_ETH0_BASE +#define MAC0_ENABLE AU1550_MAC0_ENABLE +#else #error "No valid cpu set" #endif #endif #endif +#endif #include <common.h> #include <malloc.h> diff --git a/cpu/mips/au1x00_serial.c b/cpu/mips/au1x00_serial.c index 99e24897fd..ac75da591f 100644 --- a/cpu/mips/au1x00_serial.c +++ b/cpu/mips/au1x00_serial.c @@ -71,8 +71,8 @@ void serial_setbrg (void) volatile u32 *uart_clk = (volatile u32*)(UART0_ADDR+UART_CLK); volatile u32 *uart_lcr = (volatile u32*)(UART0_ADDR+UART_LCR); - /* Set baudrate to 115200 */ - *uart_clk = 0x36; + /* Set baudrate - FIXME for bus speeds != CPU/2 */ + *uart_clk = ((CFG_HZ/(CONFIG_BAUDRATE * 64))); /* Set parity, stop bits and word length to 8N1 */ *uart_lcr = UART_LCR_WLEN8; diff --git a/cpu/ppc4xx/serial.c b/cpu/ppc4xx/serial.c index 41402ccba6..4abd3fc493 100644 --- a/cpu/ppc4xx/serial.c +++ b/cpu/ppc4xx/serial.c @@ -41,13 +41,20 @@ * LICENSED MATERIAL - PROGRAM PROPERTY OF I B M */ /*------------------------------------------------------------------------------- */ - +/* + * Travis Sawyer 15 September 2004 + * Added CONFIG_SERIAL_MULTI support + */ #include <common.h> #include <commproc.h> #include <asm/processor.h> #include <watchdog.h> #include "vecnum.h" +#ifdef CONFIG_SERIAL_MULTI +#include <serial.h> +#endif + #ifdef CONFIG_SERIAL_SOFTWARE_FIFO #include <malloc.h> #endif @@ -147,7 +154,6 @@ #define asyncXOFFchar 0x13 #define asyncXONchar 0x11 - /* * Minimal serial functions needed to use one of the SMC ports * as serial console interface. @@ -177,7 +183,6 @@ int serial_init (void) return (0); } - void serial_setbrg (void) { DECLARE_GLOBAL_DATA_PTR; @@ -190,7 +195,6 @@ void serial_setbrg (void) out8 (SPU_BASE + spu_BRateDivh, ((br_reg & 0xff00) >> 8)); /* ... */ } - void serial_putc (const char c) { if (c == '\n') @@ -208,7 +212,6 @@ void serial_putc (const char c) } } - void serial_puts (const char *s) { while (*s) { @@ -216,7 +219,6 @@ void serial_puts (const char *s) } } - int serial_getc () { unsigned char status = 0; @@ -240,7 +242,6 @@ int serial_getc () return (0x000000ff & (int) in8 (asyncRxBufferport1)); } - int serial_tstc () { unsigned char status; @@ -264,7 +265,6 @@ int serial_tstc () #endif /* CONFIG_IOP480 */ - /*****************************************************************************/ #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) || defined(CONFIG_405EP) @@ -350,7 +350,6 @@ int serial_tstc () /*#define asyncTxBufferport1 ACTING_UART0_BASE+0x00 */ /*#define asyncRxBufferport1 ACTING_UART0_BASE+0x00 */ - #ifdef CONFIG_SERIAL_SOFTWARE_FIFO /*-----------------------------------------------------------------------------+ | Fifo @@ -364,7 +363,6 @@ typedef struct { volatile static serial_buffer_t buf_info; #endif - #if defined(CONFIG_440) && !defined(CFG_EXT_SERIAL_CLOCK) static void serial_divs (int baudrate, unsigned long *pudiv, unsigned short *pbdiv ) @@ -411,14 +409,17 @@ static void serial_divs (int baudrate, unsigned long *pudiv, } #endif /* defined(CONFIG_440) && !defined(CFG_EXT_SERIAL_CLK */ - /* * Minimal serial functions needed to use one of the SMC ports * as serial console interface. */ #if defined(CONFIG_440) -int serial_init (void) +#if defined(CONFIG_SERIAL_MULTI) +int serial_init_dev (unsigned long dev_base) +#else +int serial_init(void) +#endif { DECLARE_GLOBAL_DATA_PTR; @@ -431,8 +432,18 @@ int serial_init (void) #endif #if defined(CONFIG_440_GX) +#if defined(CONFIG_SERIAL_MULTI) + if (UART0_BASE == dev_base) { + mfsdr(UART0_SDR,reg); + reg &= ~CR0_MASK; + } else { + mfsdr(UART1_SDR,reg); + reg &= ~CR0_MASK; + } +#else mfsdr(UART0_SDR,reg); reg &= ~CR0_MASK; +#endif #else reg = mfdcr(cntrl0) & ~CR0_MASK; #endif /* CONFIG_440_GX */ @@ -451,11 +462,32 @@ int serial_init (void) #if defined(CONFIG_440_GX) reg |= udiv << CR0_UDIV_POS; /* set the UART divisor */ +#if defined(CONFIG_SERIAL_MULTI) + if (UART0_BASE == dev_base) { + mtsdr (UART0_SDR,reg); + } else { + mtsdr (UART1_SDR,reg); + } +#else mtsdr (UART0_SDR,reg); +#endif #else reg |= (udiv - 1) << CR0_UDIV_POS; /* set the UART divisor */ mtdcr (cntrl0, reg); #endif + +#if defined(CONFIG_SERIAL_MULTI) + out8 (dev_base + UART_LCR, 0x80); /* set DLAB bit */ + out8 (dev_base + UART_DLL, bdiv); /* set baudrate divisor */ + out8 (dev_base + UART_DLM, bdiv >> 8);/* set baudrate divisor */ + out8 (dev_base + UART_LCR, 0x03); /* clear DLAB; set 8 bits, no parity */ + out8 (dev_base + UART_FCR, 0x00); /* disable FIFO */ + out8 (dev_base + UART_MCR, 0x00); /* no modem control DTR RTS */ + val = in8 (dev_base + UART_LSR); /* clear line status */ + val = in8 (dev_base + UART_RBR); /* read receive buffer */ + out8 (dev_base + UART_SCR, 0x00); /* set scratchpad */ + out8 (dev_base + UART_IER, 0x00); /* set interrupt enable reg */ +#else out8 (ACTING_UART0_BASE + UART_LCR, 0x80); /* set DLAB bit */ out8 (ACTING_UART0_BASE + UART_DLL, bdiv); /* set baudrate divisor */ out8 (ACTING_UART0_BASE + UART_DLM, bdiv >> 8);/* set baudrate divisor */ @@ -466,13 +498,17 @@ int serial_init (void) val = in8 (ACTING_UART0_BASE + UART_RBR); /* read receive buffer */ out8 (ACTING_UART0_BASE + UART_SCR, 0x00); /* set scratchpad */ out8 (ACTING_UART0_BASE + UART_IER, 0x00); /* set interrupt enable reg */ - +#endif return (0); } #else /* !defined(CONFIG_440) */ +#if defined(CONFIG_SERIAL_MULTI) +int serial_init_dev (unsigned long dev_base) +#else int serial_init (void) +#endif { DECLARE_GLOBAL_DATA_PTR; @@ -517,6 +553,18 @@ int serial_init (void) tmp = gd->baudrate * udiv * 16; bdiv = (clk + tmp / 2) / tmp; +#if defined(CONFIG_SERIAL_MULTI) + out8 (dev_base + UART_LCR, 0x80); /* set DLAB bit */ + out8 (dev_base + UART_DLL, bdiv); /* set baudrate divisor */ + out8 (dev_base + UART_DLM, bdiv >> 8);/* set baudrate divisor */ + out8 (dev_base + UART_LCR, 0x03); /* clear DLAB; set 8 bits, no parity */ + out8 (dev_base + UART_FCR, 0x00); /* disable FIFO */ + out8 (dev_base + UART_MCR, 0x00); /* no modem control DTR RTS */ + val = in8 (dev_base + UART_LSR); /* clear line status */ + val = in8 (dev_base + UART_RBR); /* read receive buffer */ + out8 (dev_base + UART_SCR, 0x00); /* set scratchpad */ + out8 (dev_base + UART_IER, 0x00); /* set interrupt enable reg */ +#else out8 (ACTING_UART0_BASE + UART_LCR, 0x80); /* set DLAB bit */ out8 (ACTING_UART0_BASE + UART_DLL, bdiv); /* set baudrate divisor */ out8 (ACTING_UART0_BASE + UART_DLM, bdiv >> 8);/* set baudrate divisor */ @@ -527,13 +575,17 @@ int serial_init (void) val = in8 (ACTING_UART0_BASE + UART_RBR); /* read receive buffer */ out8 (ACTING_UART0_BASE + UART_SCR, 0x00); /* set scratchpad */ out8 (ACTING_UART0_BASE + UART_IER, 0x00); /* set interrupt enable reg */ - +#endif return (0); } #endif /* if defined(CONFIG_440) */ +#if defined(CONFIG_SERIAL_MULTI) +void serial_setbrg_dev (unsigned long dev_base) +#else void serial_setbrg (void) +#endif { DECLARE_GLOBAL_DATA_PTR; @@ -556,39 +608,71 @@ void serial_setbrg (void) tmp = gd->baudrate * udiv * 16; bdiv = (clk + tmp / 2) / tmp; +#if defined(CONFIG_SERIAL_MULTI) + out8 (dev_base + UART_LCR, 0x80); /* set DLAB bit */ + out8 (dev_base + UART_DLL, bdiv); /* set baudrate divisor */ + out8 (dev_base + UART_DLM, bdiv >> 8);/* set baudrate divisor */ + out8 (dev_base + UART_LCR, 0x03); /* clear DLAB; set 8 bits, no parity */ +#else out8 (ACTING_UART0_BASE + UART_LCR, 0x80); /* set DLAB bit */ out8 (ACTING_UART0_BASE + UART_DLL, bdiv); /* set baudrate divisor */ out8 (ACTING_UART0_BASE + UART_DLM, bdiv >> 8);/* set baudrate divisor */ out8 (ACTING_UART0_BASE + UART_LCR, 0x03); /* clear DLAB; set 8 bits, no parity */ +#endif } - +#if defined(CONFIG_SERIAL_MULTI) +void serial_putc_dev (unsigned long dev_base, const char c) +#else void serial_putc (const char c) +#endif { int i; if (c == '\n') +#if defined(CONFIG_SERIAL_MULTI) + serial_putc_dev (dev_base, '\r'); +#else serial_putc ('\r'); +#endif /* check THRE bit, wait for transmiter available */ for (i = 1; i < 3500; i++) { +#if defined(CONFIG_SERIAL_MULTI) + if ((in8 (dev_base + UART_LSR) & 0x20) == 0x20) +#else if ((in8 (ACTING_UART0_BASE + UART_LSR) & 0x20) == 0x20) +#endif break; udelay (100); } +#if defined(CONFIG_SERIAL_MULTI) + out8 (dev_base + UART_THR, c); /* put character out */ +#else out8 (ACTING_UART0_BASE + UART_THR, c); /* put character out */ +#endif } - +#if defined(CONFIG_SERIAL_MULTI) +void serial_puts_dev (unsigned long dev_base, const char *s) +#else void serial_puts (const char *s) +#endif { while (*s) { +#if defined(CONFIG_SERIAL_MULTI) + serial_putc_dev (dev_base, *s++); +#else serial_putc (*s++); +#endif } } - -int serial_getc () +#if defined(CONFIG_SERIAL_MULTI) +int serial_getc_dev (unsigned long dev_base) +#else +int serial_getc (void) +#endif { unsigned char status = 0; @@ -596,7 +680,11 @@ int serial_getc () #if defined(CONFIG_HW_WATCHDOG) WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */ #endif /* CONFIG_HW_WATCHDOG */ +#if defined(CONFIG_SERIAL_MULTI) + status = in8 (dev_base + UART_LSR); +#else status = in8 (ACTING_UART0_BASE + UART_LSR); +#endif if ((status & asyncLSRDataReady1) != 0x0) { break; } @@ -604,22 +692,37 @@ int serial_getc () asyncLSROverrunError1 | asyncLSRParityError1 | asyncLSRBreakInterrupt1 )) != 0) { +#if defined(CONFIG_SERIAL_MULTI) + out8 (dev_base + UART_LSR, +#else out8 (ACTING_UART0_BASE + UART_LSR, +#endif asyncLSRFramingError1 | asyncLSROverrunError1 | asyncLSRParityError1 | asyncLSRBreakInterrupt1); } } +#if defined(CONFIG_SERIAL_MULTI) + return (0x000000ff & (int) in8 (dev_base)); +#else return (0x000000ff & (int) in8 (ACTING_UART0_BASE)); +#endif } - -int serial_tstc () +#if defined(CONFIG_SERIAL_MULTI) +int serial_tstc_dev (unsigned long dev_base) +#else +int serial_tstc (void) +#endif { unsigned char status; +#if defined(CONFIG_SERIAL_MULTI) + status = in8 (dev_base + UART_LSR); +#else status = in8 (ACTING_UART0_BASE + UART_LSR); +#endif if ((status & asyncLSRDataReady1) != 0x0) { return (1); } @@ -627,7 +730,11 @@ int serial_tstc () asyncLSROverrunError1 | asyncLSRParityError1 | asyncLSRBreakInterrupt1 )) != 0) { +#if defined(CONFIG_SERIAL_MULTI) + out8 (dev_base + UART_LSR, +#else out8 (ACTING_UART0_BASE + UART_LSR, +#endif asyncLSRFramingError1 | asyncLSROverrunError1 | asyncLSRParityError1 | @@ -636,7 +743,6 @@ int serial_tstc () return 0; } - #ifdef CONFIG_SERIAL_SOFTWARE_FIFO void serial_isr (void *arg) @@ -651,8 +757,8 @@ void serial_isr (void *arg) } else { space = rx_get - rx_put; } - while (serial_tstc ()) { - c = serial_getc (); + while (serial_tstc_dev (ACTING_UART0_BASE)) { + c = serial_getc_dev (ACTING_UART0_BASE); if (space) { buf_info.rx_buffer[rx_put++] = c; space--; @@ -752,7 +858,6 @@ int serial_buffered_tstc (void) #endif /* CONFIG_SERIAL_SOFTWARE_FIFO */ - #if (CONFIG_COMMANDS & CFG_CMD_KGDB) /* AS HARNOIS : according to CONFIG_KGDB_SER_INDEX kgdb uses serial port @@ -788,7 +893,6 @@ void kgdb_serial_init (void) out8 (ACTING_UART1_BASE + UART_IER, 0x00); /* set interrupt enable reg */ } - void putDebugChar (const char c) { if (c == '\n') @@ -800,7 +904,6 @@ void putDebugChar (const char c) while ((in8 (ACTING_UART1_BASE + UART_LSR) & 0x20) != 0x20); } - void putDebugStr (const char *s) { while (*s) { @@ -808,7 +911,6 @@ void putDebugStr (const char *s) } } - int getDebugChar (void) { unsigned char status = 0; @@ -832,7 +934,6 @@ int getDebugChar (void) return (0x000000ff & (int) in8 (ACTING_UART1_BASE)); } - void kgdb_interruptible (int yes) { return; @@ -867,4 +968,87 @@ void kgdb_interruptible (int yes) #endif /* (CONFIG_KGDB_SER_INDEX & 2) */ #endif /* CFG_CMD_KGDB */ + +#if defined(CONFIG_SERIAL_MULTI) +int serial0_init(void) +{ + return (serial_init_dev(UART0_BASE)); +} + +int serial1_init(void) +{ + return (serial_init_dev(UART1_BASE)); +} +void serial0_setbrg (void) +{ + serial_setbrg_dev(UART0_BASE); +} +void serial1_setbrg (void) +{ + serial_setbrg_dev(UART1_BASE); +} + +void serial0_putc(const char c) +{ + serial_putc_dev(UART0_BASE,c); +} + +void serial1_putc(const char c) +{ + serial_putc_dev(UART1_BASE, c); +} +void serial0_puts(const char *s) +{ + serial_puts_dev(UART0_BASE, s); +} + +void serial1_puts(const char *s) +{ + serial_puts_dev(UART1_BASE, s); +} + +int serial0_getc(void) +{ + return(serial_getc_dev(UART0_BASE)); +} + +int serial1_getc(void) +{ + return(serial_getc_dev(UART1_BASE)); +} +int serial0_tstc(void) +{ + return (serial_tstc_dev(UART0_BASE)); +} + +int serial1_tstc(void) +{ + return (serial_tstc_dev(UART1_BASE)); +} + +struct serial_device serial0_device = +{ + "serial0", + "UART0", + serial0_init, + serial0_setbrg, + serial0_getc, + serial0_tstc, + serial0_putc, + serial0_puts, +}; + +struct serial_device serial1_device = +{ + "serial1", + "UART1", + serial1_init, + serial1_setbrg, + serial1_getc, + serial1_tstc, + serial1_putc, + serial1_puts, +}; +#endif /* CONFIG_SERIAL_MULTI */ + #endif /* CONFIG_405GP || CONFIG_405CR */ diff --git a/doc/README.serial_multi b/doc/README.serial_multi index 1d73376b2c..a8d48fc4d9 100644 --- a/doc/README.serial_multi +++ b/doc/README.serial_multi @@ -2,6 +2,8 @@ The support for multiple serial interfaces as implemented is mainly intended to allow for modem dial-in / dial-out while still being able to use a serial console on a (different) serial port. +MPC8XX Specific +=============== At the moment, the ports must be split on a SMC and a SCC port on a 8xx processor; other configurations are not (yet) supported. @@ -35,3 +37,18 @@ just after switching the console: After that press 'enter' at the SCC console. Note that baudrates <38400 are not allowed on LWMON with watchdog enabled (see CFG_BAUDRATE_TABLE in include/configs/lwmon.h). + + +PPC4XX Specific +=============== +*) The default console is UART0 + +*) The console can be switched to UART1 by any of the following commands: + setenv stdout serial1 + setenv stderr serial1 + setenv stdin serial1 + +*) The console can be switched to UART0 by any of the following commands: + setenv stdout serial0 + setenv stderr serial0 + setenv stdin serial0 diff --git a/include/asm-mips/au1x00.h b/include/asm-mips/au1x00.h index 317e6daae7..4e19dc4da2 100644 --- a/include/asm-mips/au1x00.h +++ b/include/asm-mips/au1x00.h @@ -132,6 +132,27 @@ static __inline__ int au_ffs(int x) #define CP0_DEBUG $23 /* SDRAM Controller */ +#ifdef CONFIG_AU1550 + +#define MEM_SDMODE0 0xB4000800 +#define MEM_SDMODE1 0xB4000808 +#define MEM_SDMODE2 0xB4000810 + +#define MEM_SDADDR0 0xB4000820 +#define MEM_SDADDR1 0xB4000828 +#define MEM_SDADDR2 0xB4000830 + +#define MEM_SDCONFIGA 0xB4000840 +#define MEM_SDCONFIGB 0xB4000848 +#define MEM_SDPRECMD 0xB40008c0 +#define MEM_SDAUTOREF 0xB40008c8 + +#define MEM_SDWRMD0 0xB4000880 +#define MEM_SDWRMD1 0xB4000888 +#define MEM_SDWRMD2 0xB4000890 + +#else /* CONFIG_AU1550 */ + #define MEM_SDMODE0 0xB4000000 #define MEM_SDMODE1 0xB4000004 #define MEM_SDMODE2 0xB4000008 @@ -148,6 +169,8 @@ static __inline__ int au_ffs(int x) #define MEM_SDWRMD1 0xB4000028 #define MEM_SDWRMD2 0xB400002C +#endif /* CONFIG_AU1550 */ + #define MEM_SDSLEEP 0xB4000030 #define MEM_SDSMCKE 0xB4000034 @@ -474,6 +497,8 @@ static __inline__ int au_ffs(int x) #define AU1500_ETH0_BASE 0xB1500000 #define AU1500_ETH1_BASE 0xB1510000 #define AU1100_ETH0_BASE 0xB0500000 +#define AU1550_ETH0_BASE 0xB0500000 +#define AU1550_ETH1_BASE 0xB0510000 /* 4 byte offsets from AU1000_ETH_BASE */ #define MAC_CONTROL 0x0 @@ -523,6 +548,8 @@ static __inline__ int au_ffs(int x) #define AU1500_MAC0_ENABLE 0xB1520000 #define AU1500_MAC1_ENABLE 0xB1520004 #define AU1100_MAC0_ENABLE 0xB0520000 +#define AU1550_MAC0_ENABLE 0xB0520000 +#define AU1550_MAC1_ENABLE 0xB0520004 #define MAC_EN_CLOCK_ENABLE (1<<0) #define MAC_EN_RESET0 (1<<1) @@ -979,6 +1006,15 @@ static __inline__ int au_ffs(int x) #define AC97C_RS (1<<1) #define AC97C_CE (1<<0) +#define DB1000_BCSR_ADDR 0xAE000000 +#define DB1550_BCSR_ADDR 0xAF000000 + +#ifdef CONFIG_DBAU1550 +#define DB1XX0_BCSR_ADDR DB1550_BCSR_ADDR +#else +#define DB1XX0_BCSR_ADDR DB1000_BCSR_ADDR +#endif + #ifdef CONFIG_SOC_AU1500 /* Au1500 PCI Controller */ #define Au1500_CFG_BASE 0xB4005000 /* virtual, kseg0 addr */ diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index d78b727502..984115ae5f 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -42,10 +42,15 @@ #ifdef CONFIG_DBAU1500 #define CONFIG_AU1500 1 #else +#ifdef CONFIG_DBAU1550 +/* Cabernet */ +#define CONFIG_AU1550 1 +#else #error "No valid board set" #endif #endif #endif +#endif #define CONFIG_ETHADDR DE:AD:BE:EF:01:01 /* Ethernet address */ @@ -66,23 +71,34 @@ "bootfile=/tftpboot/vmlinux.srec\0" \ "load=tftp 80500000 $(u-boot)\0" \ "" + +#ifdef CONFIG_DBAU1550 +/* Boot from flash by default, revert to bootp */ +#define CONFIG_BOOTCOMMAND "bootm 0xbfc20000; bootp; bootm" + +#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_FLASH | CFG_CMD_LOADB | CFG_CMD_NET) & \ + ~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FPGA | CFG_CMD_IDE | \ + CFG_CMD_MII | CFG_CMD_RUN | CFG_CMD_BDI | CFG_CMD_BEDBUG | \ + CFG_CMD_NFS | CFG_CMD_ELF | CFG_CMD_PCMCIA | CFG_CMD_I2C)) +#else /* CONFIG_DBAU1550 */ /* Boot from Compact flash partition 2 as default */ #define CONFIG_BOOTCOMMAND "ide reset;disk 0x81000000 0:2;bootm" -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | \ - CFG_CMD_IDE | \ - CFG_CMD_DHCP | \ - CFG_CMD_ELF ) & \ - ~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \ - CFG_CMD_MII | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | \ - CFG_CMD_BDI | CFG_CMD_BEDBUG)) +#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP | CFG_CMD_ELF) & \ + ~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \ + CFG_CMD_MII | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | \ + CFG_CMD_ELF | CFG_CMD_BDI | CFG_CMD_BEDBUG)) +#endif /* CONFIG_DBAU1550 */ + #include <cmd_confdefs.h> /* * Miscellaneous configurable options */ #define CFG_LONGHELP /* undef to save memory */ -#define CFG_PROMPT "DbAu1x00 # " /* Monitor Command Prompt */ + +#define CFG_PROMPT "DbAu1xx0 # " /* Monitor Command Prompt */ + #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ #define CFG_MAXARGS 16 /* max number of command args*/ @@ -91,7 +107,13 @@ #define CFG_BOOTPARAMS_LEN 128*1024 -#define CFG_HZ 396000000 /* FIXME causes overflow in net.c */ +#define CFG_MHZ 396 + +#if (CFG_MHZ % 12) != 0 +#error "Invalid CPU frequency - must be multiple of 12!" +#endif + +#define CFG_HZ (CFG_MHZ * 1000000) /* FIXME causes overflow in net.c */ #define CFG_SDRAM_BASE 0x80000000 /* Cached addr */ @@ -103,12 +125,29 @@ /*----------------------------------------------------------------------- * FLASH and environment organization */ +#ifdef CONFIG_DBAU1550 + +#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ +#define CFG_MAX_FLASH_SECT (512) /* max number of sectors on one chip */ + +#define PHYS_FLASH_1 0xb8000000 /* Flash Bank #1 */ +#define PHYS_FLASH_2 0xbc000000 /* Flash Bank #2 */ + +#define CFG_FLASH_BANKS_LIST {PHYS_FLASH_1, PHYS_FLASH_2} + +#else /* CONFIG_DBAU1550 */ + #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT (128) /* max number of sectors on one chip */ #define PHYS_FLASH_1 0xbec00000 /* Flash Bank #1 */ #define PHYS_FLASH_2 0xbfc00000 /* Flash Bank #2 */ +#endif /* CONFIG_DBAU1550 */ + +#define CFG_FLASH_CFI 1 +#define CFG_FLASH_CFI_DRIVER 1 + /* The following #defines are needed to get flash environment right */ #define CFG_MONITOR_BASE TEXT_BASE #define CFG_MONITOR_LEN (192 << 10) @@ -134,8 +173,15 @@ #define CONFIG_NET_MULTI +#ifdef CONFIG_DBAU1550 +#define MEM_SIZE 192 +#else +#define MEM_SIZE 64 +#endif + #define CONFIG_MEMSIZE_IN_BYTES +#ifndef CONFIG_DBAU1550 /*---ATA PCMCIA ------------------------------------*/ #define CFG_PCMCIA_MEM_SIZE 0x4000000 /* Offset to slot 1 FIXME!!! */ #define CFG_PCMCIA_MEM_ADDR 0x20000000 @@ -166,6 +212,7 @@ /* Offset for alternate registers */ #define CFG_ATA_ALT_OFFSET 0x0100 +#endif /* CONFIG_DBAU1550 */ /*----------------------------------------------------------------------- * Cache Configuration @@ -174,6 +221,4 @@ #define CFG_ICACHE_SIZE 16384 #define CFG_CACHELINE_SIZE 32 -#define DB1000_BCSR_ADDR 0xAE000000 - #endif /* __CONFIG_H */ diff --git a/include/serial.h b/include/serial.h index c206540cc6..c8abb72e1f 100644 --- a/include/serial.h +++ b/include/serial.h @@ -22,6 +22,13 @@ extern struct serial_device serial_smc_device; extern struct serial_device serial_scc_device; extern struct serial_device * default_serial_console (void); +#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ + || defined(CONFIG_405EP) +extern struct serial_device serial0_device; +extern struct serial_device serial1_device; +#endif + + extern void serial_initialize(void); extern void serial_devices_init(void); extern int serial_assign(char * name); |