| Message ID | 1302126558-1318-14-git-send-email-michael@schwingen.org |
|---|---|
| State | Superseded |
| Commit | 10c9787e683205aa780dba53fa9f43cdd529bec9 |
| Delegated to: | Marek Vasut |
| Headers | show |
On Wednesday, April 06, 2011 11:49:14 PM Michael Schwingen wrote: > Signed-off-by: Michael Schwingen <michael@schwingen.org> > --- > Changes for V2: > - move -ffunction-sections/--gc-sections to board config.mk > - add wildcard to bss segment in linker script > - add ethprime/ethrotate to default environment > Changes for V3: > - use I/O accessors > - coding style fixes > - add PCI clock/reset initialization > - use get_ram_size in dram_init > - add PCI support > - remove config.mk > - remove unused definitions from config.h > - add CONFIG_BOARD_SIZE_LIMIT > Changes for V4: > - add changelog > - add __bss_end to u-boot.lds > > MAINTAINERS | 1 + > board/dvlhost/Makefile | 50 +++++++++ > board/dvlhost/dvlhost.c | 130 +++++++++++++++++++++++ > board/dvlhost/dvlhost_hw.h | 47 +++++++++ > board/dvlhost/u-boot.lds | 87 +++++++++++++++ > board/dvlhost/watchdog.c | 43 ++++++++ > boards.cfg | 1 + > include/configs/dvlhost.h | 248 > ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 607 > insertions(+), 0 deletions(-) > create mode 100644 board/dvlhost/Makefile > create mode 100644 board/dvlhost/dvlhost.c > create mode 100644 board/dvlhost/dvlhost_hw.h > create mode 100644 board/dvlhost/u-boot.lds > create mode 100644 board/dvlhost/watchdog.c > create mode 100644 include/configs/dvlhost.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 4b17b63..97f8a38 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -811,6 +811,7 @@ Michael Schwingen <michael@schwingen.org> > actux2 xscale/ixp > actux3 xscale/ixp > actux4 xscale/ixp > + dvlhost xscale/ixp > > Andrea Scian <andrea.scian@dave-tech.it> > > diff --git a/board/dvlhost/Makefile b/board/dvlhost/Makefile > new file mode 100644 > index 0000000..af9a644 > --- /dev/null > +++ b/board/dvlhost/Makefile > @@ -0,0 +1,50 @@ > +# > +# (C) Copyright 2000-2006 > +# Wolfgang Denk, DENX Software Engineering, wd@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 $(TOPDIR)/config.mk > + > +LIB = $(obj)lib$(BOARD).o > + > +COBJS := dvlhost.o watchdog.o > + > +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > +OBJS := $(addprefix $(obj),$(COBJS)) > +SOBJS := $(addprefix $(obj),$(SOBJS)) > + > +$(LIB): $(obj).depend $(OBJS) > + $(call cmd_link_o_target, $(OBJS)) > + > +clean: > + rm -f $(SOBJS) $(OBJS) > + > +distclean: clean > + rm -f $(LIB) core *.bak $(obj).depend > + > +######################################################################### > + > +# defines $(obj).depend target > +include $(SRCTREE)/rules.mk > + > +sinclude $(obj).depend > + > +######################################################################### > diff --git a/board/dvlhost/dvlhost.c b/board/dvlhost/dvlhost.c > new file mode 100644 > index 0000000..561e47f > --- /dev/null > +++ b/board/dvlhost/dvlhost.c > @@ -0,0 +1,130 @@ > +/* > + * (C) Copyright 2009 > + * Michael Schwingen, michael@schwingen.org > + * > + * 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 <config.h> > +#include <command.h> > +#include <malloc.h> > +#include <asm/arch/ixp425.h> > +#include <asm/io.h> > +#include <miiphy.h> > +#ifdef CONFIG_PCI > +#include <pci.h> > +#include <asm/arch/ixp425pci.h> > +#endif > + > +#include "dvlhost_hw.h" > + > +DECLARE_GLOBAL_DATA_PTR; > + > +int board_early_init_f(void) > +{ > + /* CS1: LED Latch */ > + writel(0xBFFF0002, IXP425_EXP_CS1); > + return 0; > +} > + > +int board_init(void) > +{ > + gd->bd->bi_arch_number = MACH_TYPE_DVLHOST; > + > + /* adress of boot parameters */ > + gd->bd->bi_boot_params = 0x00000100; > + > + /* Setup GPIOs used as output */ > + GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_WDGTRIGGER); > + GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_DLAN_PAIRING); > + GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_PCIRST); > + > + /* > + * LED latch enable and watchdog enable are tied to the same GPIO, > + * so we need to trigger the watchdog if we want to enable the LEDs. > + */ > +#ifdef CONFIG_HW_WATCHDOG > + GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_WDG_LED_EN); > +#else > + GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_WDG_LED_EN); > +#endif > + > + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_WDGTRIGGER); > + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_DLAN_PAIRING); > + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_WDG_LED_EN); > + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_PCIRST); > + > + /* Setup GPIOs for Interrupt inputs */ > + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_BTN_WLAN); > + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_BTN_PAIRING); > + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_BTN_RESET); > + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_IRQA); > + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_IRQB); > + > + /* Setup GPIO's for 33MHz clock output */ > + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_PCI_CLK); > + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_EXTBUS_CLK); > + writel(0x01FF01FF, IXP425_GPIO_GPCLKR); > + > + /* turn off all LEDs */ > + writew(0x0000, DVLHOST_LED_LATCH); > + > + udelay(533); Why 533 ? > + GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_PCIRST); > + > + return 0; > +} > + > +/* Check Board Identity */ > +int checkboard(void) > +{ > + char *s = getenv("serial#"); > + > + puts("Board: dLAN 200AV (dvlhost)"); > + > + if (s != NULL) { > + puts(", serial# "); > + puts(s); > + } > + putc('\n'); > + > + return 0; > +} > + > +int dram_init(void) > +{ > + gd->ram_size = get_ram_size(CONFIG_SYS_SDRAM_BASE, 128<<20); > + return 0; > +} > + > +#ifdef CONFIG_PCI > +struct pci_controller hose; > + > +void pci_init_board(void) > +{ > + pci_ixp_init(&hose); > +} > +#endif > + > +void reset_phy(void) > +{ > + /* init IcPlus IP175C ethernet switch to native IP175C mode */ > + miiphy_write("NPE1", 29, 31, 0x175C); > +} > diff --git a/board/dvlhost/dvlhost_hw.h b/board/dvlhost/dvlhost_hw.h > new file mode 100644 > index 0000000..5e2d0b0 > --- /dev/null > +++ b/board/dvlhost/dvlhost_hw.h > @@ -0,0 +1,47 @@ > +/* > + * (C) Copyright 2009 > + * Michael Schwingen, michael@schwingen.org > + * > + * hardware register definitions for the > + * dLAN200 AV Wireless G ("dvlhost") board. > + * > + * 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 _DVLHOST_HW_H > +#define _DVLHOST_HW_H > + > +/* > + * GPIO settings > + */ > +#define CONFIG_SYS_GPIO_WDGTRIGGER 0 /* Out */ > +#define CONFIG_SYS_GPIO_BTN_WLAN 1 > +#define CONFIG_SYS_GPIO_BTN_PAIRING 6 > +#define CONFIG_SYS_GPIO_DLAN_PAIRING 7 /* Out */ > +#define CONFIG_SYS_GPIO_BTN_RESET 9 > +#define CONFIG_SYS_GPIO_IRQB 10 > +#define CONFIG_SYS_GPIO_IRQA 11 > +#define CONFIG_SYS_GPIO_WDG_LED_EN 12 /* Out */ > +#define CONFIG_SYS_GPIO_PCIRST 13 /* Out */ > +#define CONFIG_SYS_GPIO_PCI_CLK 14 /* Out */ > +#define CONFIG_SYS_GPIO_EXTBUS_CLK 15 /* Out */ > + > +#define DVLHOST_LED_LATCH IXP425_EXP_BUS_CS1_BASE_PHYS > + > +#endif > diff --git a/board/dvlhost/u-boot.lds b/board/dvlhost/u-boot.lds > new file mode 100644 > index 0000000..01ec390 > --- /dev/null > +++ b/board/dvlhost/u-boot.lds > @@ -0,0 +1,87 @@ > +/* > + * (C) Copyright 2000 > + * Wolfgang Denk, DENX Software Engineering, wd@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 > + */ > + > +OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") > +OUTPUT_ARCH (arm) > +ENTRY (_start) > +SECTIONS > +{ > + . = 0x00000000; > + > + . = ALIGN (4); > + .text : { > + arch/arm/cpu/ixp/start.o(.text*) > + net/libnet.o(.text*) > + board/dvlhost/libdvlhost.o(.text*) > + arch/arm/cpu/ixp/libixp.o(.text*) > + drivers/serial/libserial.o(.text*) > + > + . = env_offset; > + common/env_embedded.o(.ppcenv) > + *(.text*) > + } > + > + . = ALIGN (4); > + .rodata : { > + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) > + } > + . = ALIGN (4); > + .data : { > + *(.data*) > + } > + . = ALIGN (4); > + .got : { > + *(.got) > + } > + . =.; > + __u_boot_cmd_start =.; > + .u_boot_cmd : { > + *(.u_boot_cmd) > + } > + __u_boot_cmd_end =.; > + > + . = ALIGN (4); > + .rel.dyn : { > + __rel_dyn_start = .; > + *(.rel*) > + __rel_dyn_end = .; > + } > + > + .dynsym : { > + __dynsym_start = .; > + *(.dynsym) > + } > + > + .bss __rel_dyn_start (OVERLAY) : { > + __bss_start = .; > + *(.bss*) > + . = ALIGN(4); > + _end = .; > + } > + __bss_end__ =.; > + /DISCARD/ : { *(.dynstr*) } > + /DISCARD/ : { *(.dynamic*) } > + /DISCARD/ : { *(.plt*) } > + /DISCARD/ : { *(.interp*) } > + /DISCARD/ : { *(.gnu*) } > +} > diff --git a/board/dvlhost/watchdog.c b/board/dvlhost/watchdog.c > new file mode 100644 > index 0000000..bf83684 > --- /dev/null > +++ b/board/dvlhost/watchdog.c > @@ -0,0 +1,43 @@ > +/* > + * (C) Copyright 2009 > + * Michael Schwingen, michael@schwingen.org > + * > + * 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 <config.h> > +#include <asm/io.h> > +#include "dvlhost_hw.h" > + > +DECLARE_GLOBAL_DATA_PTR; > + > +#ifdef CONFIG_HW_WATCHDOG > +#include <watchdog.h> > +#include <asm/arch/ixp425.h> > + > +void hw_watchdog_reset(void) > +{ > + unsigned int x; > + x = readl(IXP425_GPIO_GPOUTR); > + x ^= (1 << (CONFIG_SYS_GPIO_WDGTRIGGER)); > + writel(x, IXP425_GPIO_GPOUTR); > +} > + > +#endif /* CONFIG_HW_WATCHDOG */ > diff --git a/boards.cfg b/boards.cfg > index b8b17d7..68c835a 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -137,6 +137,7 @@ actux1_8_32 arm ixp > actux1 - actux2 arm ixp > actux3 arm ixp > actux4 arm ixp > +dvlhost arm ixp > ixdp425 arm ixp > ixdpg425 arm ixp > lpd7a400 arm lh7a40x lpd7a40x > diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h > new file mode 100644 > index 0000000..bccd416 > --- /dev/null > +++ b/include/configs/dvlhost.h > @@ -0,0 +1,248 @@ > +/* > + * (C) Copyright 2009 > + * Michael Schwingen, michael@schwingen.org > + * > + * Configuration settings for the > + * dLAN200 AV Wireless G ("dvlhost") board. > + * > + * 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 __CONFIG_H > +#define __CONFIG_H > + > +#define CONFIG_IXP425 1 > +#define CONFIG_DVLHOST 1 > + > +#define CONFIG_DISPLAY_CPUINFO 1 > +#define CONFIG_DISPLAY_BOARDINFO 1 > + > +#define CONFIG_IXP_SERIAL > +#define CONFIG_SYS_IXP425_CONSOLE IXP425_UART2 > +#define CONFIG_BAUDRATE 115200 > +#define CONFIG_BOOTDELAY 3 > +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 > */ +#define CONFIG_BOARD_EARLY_INIT_F 1 > +#define CONFIG_SYS_LDSCRIPT "board/dvlhost/u-boot.lds" > + > +/*************************************************************** > + * U-boot generic defines start here. > + ***************************************************************/ > +/* Size of malloc() pool */ > +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) > + > +/* allow to overwrite serial and ethaddr */ > +#define CONFIG_ENV_OVERWRITE > + > +/* Command line configuration. */ > +#include <config_cmd_default.h> > + > +#define CONFIG_CMD_ELF > +#define CONFIG_PCI > +#ifdef CONFIG_PCI > +#define CONFIG_CMD_PCI > +#define CONFIG_PCI_PNP > +#define CONFIG_IXP_PCI > +#define CONFIG_PCI_SCAN_SHOW > +#define CONFIG_CMD_PCI_ENUM > +#endif > + > +#define CONFIG_BOOTCOMMAND "run boot_flash" > +/* enable passing of ATAGs */ > +#define CONFIG_CMDLINE_TAG 1 > +#define CONFIG_SETUP_MEMORY_TAGS 1 > +#define CONFIG_INITRD_TAG 1 > + > +#if defined(CONFIG_CMD_KGDB) > +# define CONFIG_KGDB_BAUDRATE 230400 > +/* which serial port to use */ > +# define CONFIG_KGDB_SER_INDEX 1 > +#endif > + > +/* Miscellaneous configurable options */ > +#define CONFIG_SYS_LONGHELP > +#define CONFIG_SYS_PROMPT "=> " > +/* Console I/O Buffer Size */ > +#define CONFIG_SYS_CBSIZE 256 > +/* Print Buffer Size */ > +#define > CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) +/* > max number of command args */ > +#define CONFIG_SYS_MAXARGS 16 > +/* Boot Argument Buffer Size */ > +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE > + > +#define CONFIG_SYS_MEMTEST_START 0x00000000 > +#define CONFIG_SYS_MEMTEST_END 0x01D80000 > + > +/* timer clock - 2* OSC_IN system clock */ > +#define CONFIG_IXP425_TIMER_CLK 66666666 > +#define CONFIG_SYS_HZ 1000 > + > +/* default load address */ > +#define CONFIG_SYS_LOAD_ADDR 0x00010000 > + > +/* valid baudrates */ > +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ > + 115200, 230400 } > +#define CONFIG_SERIAL_RTS_ACTIVE 1 > + > +/* > + * Stack sizes > + * > + * The stack sizes are set up in start.S using the settings below > + */ > +#define CONFIG_STACKSIZE (128*1024) /* regular stack */ > + > +/* Expansion bus settings */ > +#define CONFIG_SYS_EXP_CS0 0xbd113442 > + > +/* SDRAM settings */ > +#define CONFIG_NR_DRAM_BANKS 1 > +#define PHYS_SDRAM_1 0x00000000 > +#define CONFIG_SYS_SDRAM_BASE 0x00000000 > + > +/* 32MB SDRAM: 2* 8Mx16, CL3 */ > +#define CONFIG_SYS_SDR_CONFIG 0x18 > +#define PHYS_SDRAM_1_SIZE 0x02000000 > +#define CONFIG_SYS_SDRAM_REFRESH_CNT 0x800 > +#define CONFIG_SYS_SDR_MODE_CONFIG 0x1 > +#define CONFIG_SYS_DRAM_SIZE PHYS_SDRAM_1_SIZE > + > +/* FLASH organization: one Spansion S29AL032D-04 Flash */ > +#define CONFIG_SYS_TEXT_BASE 0x50000000 > +#define CONFIG_SYS_MAX_FLASH_BANKS 1 > +/* max number of sectors on one chip */ > +#define CONFIG_SYS_MAX_FLASH_SECT 140 > +#define PHYS_FLASH_1 0x50000000 > +#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1 } > + > +#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 > +#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1 > +#define CONFIG_SYS_MONITOR_LEN (256 << 10) > +#define CONFIG_BOARD_SIZE_LIMIT 262144 > + > +/* Use common CFI driver */ > +#define CONFIG_SYS_FLASH_CFI > +#define CONFIG_FLASH_CFI_DRIVER > +/* no byte writes on IXP4xx */ > +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT > + > +/* print 'E' for empty sector on flinfo */ > +#define CONFIG_SYS_FLASH_EMPTY_INFO > + > +/* Ethernet */ > + > +/* include IXP4xx NPE support */ > +#define CONFIG_IXP4XX_NPE 1 > + > +#define CONFIG_NET_MULTI 1 > +/* NPE0 PHY: MII dLAN200 AVmodule, 100BaseT-FDX fixed */ > +#define CONFIG_PHY_ADDR 0x18 > +/* NPE1 PHY: MII IP175 switch, port 5 is host port */ > +#define CONFIG_PHY1_ADDR 0x05 > +/* MII PHY management */ > +#define CONFIG_MII 1 > +/* fixed-speed powerline modem without standard PHY registers on MII */ > +#define CONFIG_MII_NPE0_FIXEDLINK 1 > +#define CONFIG_MII_NPE0_SPEED 100 > +#define CONFIG_MII_NPE0_FULLDUPLEX 1 > +/* fixed-speed switch without standard PHY registers on MII */ > +#define CONFIG_MII_NPE1_FIXEDLINK 1 > +#define CONFIG_MII_NPE1_SPEED 100 > +#define CONFIG_MII_NPE1_FULLDUPLEX 1 > + > +/* Number of ethernet rx buffers & descriptors */ > +#define CONFIG_SYS_RX_ETH_BUFFER 16 > +#define CONFIG_RESET_PHY_R 1 > +/* ethernet switch connected to MII port */ > +#define CONFIG_MII_ETHSWITCH 1 > +#define CONFIG_HAS_ETH1 1 > + > +#define CONFIG_CMD_DHCP > +#define CONFIG_CMD_NET > +#define CONFIG_CMD_MII > +#define CONFIG_CMD_PING > +#undef CONFIG_CMD_NFS > + > +/* BOOTP options */ > +#define CONFIG_BOOTP_BOOTFILESIZE > +#define CONFIG_BOOTP_BOOTPATH > +#define CONFIG_BOOTP_GATEWAY > +#define CONFIG_BOOTP_HOSTNAME > + > +/* Cache Configuration */ > +#define CONFIG_SYS_CACHELINE_SIZE 32 > + > +/* > + * environment organization: > + * one flash sector, embedded in uboot area (bottom bootblock flash) > + */ > +#define CONFIG_ENV_IS_IN_FLASH 1 > +#define CONFIG_ENV_SIZE 0x2000 > +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) > +#define CONFIG_SYS_USE_PPCENV 1 > + > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "npe_ucode=50040000\0" \ > + "ethprime=NPE1\0" \ > + "ethrotate=no\0" \ > + "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root),\0" \ > + "kerneladdr=50050000\0" \ > + "kernelfile=dvlhost/uImage\0" \ > + "rootfile=dvlhost/rootfs\0" \ > + "rootaddr=50170000\0" \ > + "loadaddr=10000\0" \ > + "updateboot_ser=mw.b 10000 ff 40000;" \ > + " loady ${loadaddr};" \ > + " run eraseboot writeboot\0" \ > + "updateboot_net=mw.b 10000 ff 40000;" \ > + " tftp ${loadaddr} dvlhost/u-boot.bin;" \ > + " run eraseboot writeboot\0" \ > + "eraseboot=protect off 50000000 50003fff;" \ > + " protect off 50006000 5003ffff;" \ > + " erase 50000000 50003fff;" \ > + " erase 50006000 5003ffff\0" \ > + "writeboot=cp.b 10000 50000000 4000;" \ > + " cp.b 16000 50006000 3a000\0" \ > + "updateucode=loady;" \ > + " era ${npe_ucode} +${filesize};" \ > + " cp.b ${loadaddr} ${npe_ucode} ${filesize}\0" \ > + "updateroot=tftp ${loadaddr} ${rootfile};" \ > + " era ${rootaddr} +${filesize};" \ > + " cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \ > + "updatekern=tftp ${loadaddr} ${kernelfile};" \ > + " era ${kerneladdr} +${filesize};" \ > + " cp.b ${loadaddr} ${kerneladdr} ${filesize}\0" \ > + "flashargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ > + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ > + "netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ > + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ > + "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \ > + "addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \ > + "boot_flash=run flashargs addtty addeth;" \ > + " bootm ${kerneladdr}\0" \ > + "boot_net=run netargs addtty addeth;" \ > + " tftpboot ${loadaddr} ${kernelfile};" \ > + " bootm\0" > + > +/* additions for new relocation code, must be added to all boards */ > +#define CONFIG_SYS_INIT_SP_ADDR \ > + (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) > + > +#endif /* __CONFIG_H */
Am 05/21/2011 02:06 AM, schrieb Marek Vasut: > >> + /* Setup GPIO's for 33MHz clock output */ >> + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_PCI_CLK); >> + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_EXTBUS_CLK); >> + writel(0x01FF01FF, IXP425_GPIO_GPCLKR); >> + >> + /* turn off all LEDs */ >> + writew(0x0000, DVLHOST_LED_LATCH); >> + >> + udelay(533); > Why 533 ? > >> + GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_PCIRST); Hm - that is copied from the PCI init sequence in pci_ixp.c - however, the constant *does* look dodgy: We need at least 100us reset pulse *after the clock is stable* - whatever time that requires. On the other hand, the PCI spec requires 2^25 clocks after reset before the first configuration access, which would be around 1s - we probably violate that, since the timing depends on what other code delays operation until the first PCI configuration access. Since PCI is not 100% functional (at least in my attempts), even on the existing IXDP425 board, I would like to leave this as is for now - at least it is consistent across all IXP boards. cu Michael
diff --git a/MAINTAINERS b/MAINTAINERS index 4b17b63..97f8a38 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -811,6 +811,7 @@ Michael Schwingen <michael@schwingen.org> actux2 xscale/ixp actux3 xscale/ixp actux4 xscale/ixp + dvlhost xscale/ixp Andrea Scian <andrea.scian@dave-tech.it> diff --git a/board/dvlhost/Makefile b/board/dvlhost/Makefile new file mode 100644 index 0000000..af9a644 --- /dev/null +++ b/board/dvlhost/Makefile @@ -0,0 +1,50 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, wd@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 $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS := dvlhost.o watchdog.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/dvlhost/dvlhost.c b/board/dvlhost/dvlhost.c new file mode 100644 index 0000000..561e47f --- /dev/null +++ b/board/dvlhost/dvlhost.c @@ -0,0 +1,130 @@ +/* + * (C) Copyright 2009 + * Michael Schwingen, michael@schwingen.org + * + * 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 <config.h> +#include <command.h> +#include <malloc.h> +#include <asm/arch/ixp425.h> +#include <asm/io.h> +#include <miiphy.h> +#ifdef CONFIG_PCI +#include <pci.h> +#include <asm/arch/ixp425pci.h> +#endif + +#include "dvlhost_hw.h" + +DECLARE_GLOBAL_DATA_PTR; + +int board_early_init_f(void) +{ + /* CS1: LED Latch */ + writel(0xBFFF0002, IXP425_EXP_CS1); + return 0; +} + +int board_init(void) +{ + gd->bd->bi_arch_number = MACH_TYPE_DVLHOST; + + /* adress of boot parameters */ + gd->bd->bi_boot_params = 0x00000100; + + /* Setup GPIOs used as output */ + GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_WDGTRIGGER); + GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_DLAN_PAIRING); + GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_PCIRST); + + /* + * LED latch enable and watchdog enable are tied to the same GPIO, + * so we need to trigger the watchdog if we want to enable the LEDs. + */ +#ifdef CONFIG_HW_WATCHDOG + GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_WDG_LED_EN); +#else + GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_WDG_LED_EN); +#endif + + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_WDGTRIGGER); + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_DLAN_PAIRING); + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_WDG_LED_EN); + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_PCIRST); + + /* Setup GPIOs for Interrupt inputs */ + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_BTN_WLAN); + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_BTN_PAIRING); + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_BTN_RESET); + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_IRQA); + GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_IRQB); + + /* Setup GPIO's for 33MHz clock output */ + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_PCI_CLK); + GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_EXTBUS_CLK); + writel(0x01FF01FF, IXP425_GPIO_GPCLKR); + + /* turn off all LEDs */ + writew(0x0000, DVLHOST_LED_LATCH); + + udelay(533); + GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_PCIRST); + + return 0; +} + +/* Check Board Identity */ +int checkboard(void) +{ + char *s = getenv("serial#"); + + puts("Board: dLAN 200AV (dvlhost)"); + + if (s != NULL) { + puts(", serial# "); + puts(s); + } + putc('\n'); + + return 0; +} + +int dram_init(void) +{ + gd->ram_size = get_ram_size(CONFIG_SYS_SDRAM_BASE, 128<<20); + return 0; +} + +#ifdef CONFIG_PCI +struct pci_controller hose; + +void pci_init_board(void) +{ + pci_ixp_init(&hose); +} +#endif + +void reset_phy(void) +{ + /* init IcPlus IP175C ethernet switch to native IP175C mode */ + miiphy_write("NPE1", 29, 31, 0x175C); +} diff --git a/board/dvlhost/dvlhost_hw.h b/board/dvlhost/dvlhost_hw.h new file mode 100644 index 0000000..5e2d0b0 --- /dev/null +++ b/board/dvlhost/dvlhost_hw.h @@ -0,0 +1,47 @@ +/* + * (C) Copyright 2009 + * Michael Schwingen, michael@schwingen.org + * + * hardware register definitions for the + * dLAN200 AV Wireless G ("dvlhost") board. + * + * 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 _DVLHOST_HW_H +#define _DVLHOST_HW_H + +/* + * GPIO settings + */ +#define CONFIG_SYS_GPIO_WDGTRIGGER 0 /* Out */ +#define CONFIG_SYS_GPIO_BTN_WLAN 1 +#define CONFIG_SYS_GPIO_BTN_PAIRING 6 +#define CONFIG_SYS_GPIO_DLAN_PAIRING 7 /* Out */ +#define CONFIG_SYS_GPIO_BTN_RESET 9 +#define CONFIG_SYS_GPIO_IRQB 10 +#define CONFIG_SYS_GPIO_IRQA 11 +#define CONFIG_SYS_GPIO_WDG_LED_EN 12 /* Out */ +#define CONFIG_SYS_GPIO_PCIRST 13 /* Out */ +#define CONFIG_SYS_GPIO_PCI_CLK 14 /* Out */ +#define CONFIG_SYS_GPIO_EXTBUS_CLK 15 /* Out */ + +#define DVLHOST_LED_LATCH IXP425_EXP_BUS_CS1_BASE_PHYS + +#endif diff --git a/board/dvlhost/u-boot.lds b/board/dvlhost/u-boot.lds new file mode 100644 index 0000000..01ec390 --- /dev/null +++ b/board/dvlhost/u-boot.lds @@ -0,0 +1,87 @@ +/* + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd@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 + */ + +OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") +OUTPUT_ARCH (arm) +ENTRY (_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN (4); + .text : { + arch/arm/cpu/ixp/start.o(.text*) + net/libnet.o(.text*) + board/dvlhost/libdvlhost.o(.text*) + arch/arm/cpu/ixp/libixp.o(.text*) + drivers/serial/libserial.o(.text*) + + . = env_offset; + common/env_embedded.o(.ppcenv) + *(.text*) + } + + . = ALIGN (4); + .rodata : { + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } + . = ALIGN (4); + .data : { + *(.data*) + } + . = ALIGN (4); + .got : { + *(.got) + } + . =.; + __u_boot_cmd_start =.; + .u_boot_cmd : { + *(.u_boot_cmd) + } + __u_boot_cmd_end =.; + + . = ALIGN (4); + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + } + + .bss __rel_dyn_start (OVERLAY) : { + __bss_start = .; + *(.bss*) + . = ALIGN(4); + _end = .; + } + __bss_end__ =.; + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } +} diff --git a/board/dvlhost/watchdog.c b/board/dvlhost/watchdog.c new file mode 100644 index 0000000..bf83684 --- /dev/null +++ b/board/dvlhost/watchdog.c @@ -0,0 +1,43 @@ +/* + * (C) Copyright 2009 + * Michael Schwingen, michael@schwingen.org + * + * 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 <config.h> +#include <asm/io.h> +#include "dvlhost_hw.h" + +DECLARE_GLOBAL_DATA_PTR; + +#ifdef CONFIG_HW_WATCHDOG +#include <watchdog.h> +#include <asm/arch/ixp425.h> + +void hw_watchdog_reset(void) +{ + unsigned int x; + x = readl(IXP425_GPIO_GPOUTR); + x ^= (1 << (CONFIG_SYS_GPIO_WDGTRIGGER)); + writel(x, IXP425_GPIO_GPOUTR); +} + +#endif /* CONFIG_HW_WATCHDOG */ diff --git a/boards.cfg b/boards.cfg index b8b17d7..68c835a 100644 --- a/boards.cfg +++ b/boards.cfg @@ -137,6 +137,7 @@ actux1_8_32 arm ixp actux1 - actux2 arm ixp actux3 arm ixp actux4 arm ixp +dvlhost arm ixp ixdp425 arm ixp ixdpg425 arm ixp lpd7a400 arm lh7a40x lpd7a40x diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h new file mode 100644 index 0000000..bccd416 --- /dev/null +++ b/include/configs/dvlhost.h @@ -0,0 +1,248 @@ +/* + * (C) Copyright 2009 + * Michael Schwingen, michael@schwingen.org + * + * Configuration settings for the + * dLAN200 AV Wireless G ("dvlhost") board. + * + * 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 __CONFIG_H +#define __CONFIG_H + +#define CONFIG_IXP425 1 +#define CONFIG_DVLHOST 1 + +#define CONFIG_DISPLAY_CPUINFO 1 +#define CONFIG_DISPLAY_BOARDINFO 1 + +#define CONFIG_IXP_SERIAL +#define CONFIG_SYS_IXP425_CONSOLE IXP425_UART2 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTDELAY 3 +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ +#define CONFIG_BOARD_EARLY_INIT_F 1 +#define CONFIG_SYS_LDSCRIPT "board/dvlhost/u-boot.lds" + +/*************************************************************** + * U-boot generic defines start here. + ***************************************************************/ +/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +/* Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ELF +#define CONFIG_PCI +#ifdef CONFIG_PCI +#define CONFIG_CMD_PCI +#define CONFIG_PCI_PNP +#define CONFIG_IXP_PCI +#define CONFIG_PCI_SCAN_SHOW +#define CONFIG_CMD_PCI_ENUM +#endif + +#define CONFIG_BOOTCOMMAND "run boot_flash" +/* enable passing of ATAGs */ +#define CONFIG_CMDLINE_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +#if defined(CONFIG_CMD_KGDB) +# define CONFIG_KGDB_BAUDRATE 230400 +/* which serial port to use */ +# define CONFIG_KGDB_SER_INDEX 1 +#endif + +/* Miscellaneous configurable options */ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_PROMPT "=> " +/* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 256 +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) +/* max number of command args */ +#define CONFIG_SYS_MAXARGS 16 +/* Boot Argument Buffer Size */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +#define CONFIG_SYS_MEMTEST_START 0x00000000 +#define CONFIG_SYS_MEMTEST_END 0x01D80000 + +/* timer clock - 2* OSC_IN system clock */ +#define CONFIG_IXP425_TIMER_CLK 66666666 +#define CONFIG_SYS_HZ 1000 + +/* default load address */ +#define CONFIG_SYS_LOAD_ADDR 0x00010000 + +/* valid baudrates */ +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ + 115200, 230400 } +#define CONFIG_SERIAL_RTS_ACTIVE 1 + +/* + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128*1024) /* regular stack */ + +/* Expansion bus settings */ +#define CONFIG_SYS_EXP_CS0 0xbd113442 + +/* SDRAM settings */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 0x00000000 +#define CONFIG_SYS_SDRAM_BASE 0x00000000 + +/* 32MB SDRAM: 2* 8Mx16, CL3 */ +#define CONFIG_SYS_SDR_CONFIG 0x18 +#define PHYS_SDRAM_1_SIZE 0x02000000 +#define CONFIG_SYS_SDRAM_REFRESH_CNT 0x800 +#define CONFIG_SYS_SDR_MODE_CONFIG 0x1 +#define CONFIG_SYS_DRAM_SIZE PHYS_SDRAM_1_SIZE + +/* FLASH organization: one Spansion S29AL032D-04 Flash */ +#define CONFIG_SYS_TEXT_BASE 0x50000000 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* max number of sectors on one chip */ +#define CONFIG_SYS_MAX_FLASH_SECT 140 +#define PHYS_FLASH_1 0x50000000 +#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1 } + +#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 +#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1 +#define CONFIG_SYS_MONITOR_LEN (256 << 10) +#define CONFIG_BOARD_SIZE_LIMIT 262144 + +/* Use common CFI driver */ +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER +/* no byte writes on IXP4xx */ +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT + +/* print 'E' for empty sector on flinfo */ +#define CONFIG_SYS_FLASH_EMPTY_INFO + +/* Ethernet */ + +/* include IXP4xx NPE support */ +#define CONFIG_IXP4XX_NPE 1 + +#define CONFIG_NET_MULTI 1 +/* NPE0 PHY: MII dLAN200 AVmodule, 100BaseT-FDX fixed */ +#define CONFIG_PHY_ADDR 0x18 +/* NPE1 PHY: MII IP175 switch, port 5 is host port */ +#define CONFIG_PHY1_ADDR 0x05 +/* MII PHY management */ +#define CONFIG_MII 1 +/* fixed-speed powerline modem without standard PHY registers on MII */ +#define CONFIG_MII_NPE0_FIXEDLINK 1 +#define CONFIG_MII_NPE0_SPEED 100 +#define CONFIG_MII_NPE0_FULLDUPLEX 1 +/* fixed-speed switch without standard PHY registers on MII */ +#define CONFIG_MII_NPE1_FIXEDLINK 1 +#define CONFIG_MII_NPE1_SPEED 100 +#define CONFIG_MII_NPE1_FULLDUPLEX 1 + +/* Number of ethernet rx buffers & descriptors */ +#define CONFIG_SYS_RX_ETH_BUFFER 16 +#define CONFIG_RESET_PHY_R 1 +/* ethernet switch connected to MII port */ +#define CONFIG_MII_ETHSWITCH 1 +#define CONFIG_HAS_ETH1 1 + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NET +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#undef CONFIG_CMD_NFS + +/* BOOTP options */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* Cache Configuration */ +#define CONFIG_SYS_CACHELINE_SIZE 32 + +/* + * environment organization: + * one flash sector, embedded in uboot area (bottom bootblock flash) + */ +#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) +#define CONFIG_SYS_USE_PPCENV 1 + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "npe_ucode=50040000\0" \ + "ethprime=NPE1\0" \ + "ethrotate=no\0" \ + "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root),\0" \ + "kerneladdr=50050000\0" \ + "kernelfile=dvlhost/uImage\0" \ + "rootfile=dvlhost/rootfs\0" \ + "rootaddr=50170000\0" \ + "loadaddr=10000\0" \ + "updateboot_ser=mw.b 10000 ff 40000;" \ + " loady ${loadaddr};" \ + " run eraseboot writeboot\0" \ + "updateboot_net=mw.b 10000 ff 40000;" \ + " tftp ${loadaddr} dvlhost/u-boot.bin;" \ + " run eraseboot writeboot\0" \ + "eraseboot=protect off 50000000 50003fff;" \ + " protect off 50006000 5003ffff;" \ + " erase 50000000 50003fff;" \ + " erase 50006000 5003ffff\0" \ + "writeboot=cp.b 10000 50000000 4000;" \ + " cp.b 16000 50006000 3a000\0" \ + "updateucode=loady;" \ + " era ${npe_ucode} +${filesize};" \ + " cp.b ${loadaddr} ${npe_ucode} ${filesize}\0" \ + "updateroot=tftp ${loadaddr} ${rootfile};" \ + " era ${rootaddr} +${filesize};" \ + " cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \ + "updatekern=tftp ${loadaddr} ${kernelfile};" \ + " era ${kerneladdr} +${filesize};" \ + " cp.b ${loadaddr} ${kerneladdr} ${filesize}\0" \ + "flashargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \ + "addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \ + "boot_flash=run flashargs addtty addeth;" \ + " bootm ${kerneladdr}\0" \ + "boot_net=run netargs addtty addeth;" \ + " tftpboot ${loadaddr} ${kernelfile};" \ + " bootm\0" + +/* additions for new relocation code, must be added to all boards */ +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) + +#endif /* __CONFIG_H */
Signed-off-by: Michael Schwingen <michael@schwingen.org> --- Changes for V2: - move -ffunction-sections/--gc-sections to board config.mk - add wildcard to bss segment in linker script - add ethprime/ethrotate to default environment Changes for V3: - use I/O accessors - coding style fixes - add PCI clock/reset initialization - use get_ram_size in dram_init - add PCI support - remove config.mk - remove unused definitions from config.h - add CONFIG_BOARD_SIZE_LIMIT Changes for V4: - add changelog - add __bss_end to u-boot.lds MAINTAINERS | 1 + board/dvlhost/Makefile | 50 +++++++++ board/dvlhost/dvlhost.c | 130 +++++++++++++++++++++++ board/dvlhost/dvlhost_hw.h | 47 +++++++++ board/dvlhost/u-boot.lds | 87 +++++++++++++++ board/dvlhost/watchdog.c | 43 ++++++++ boards.cfg | 1 + include/configs/dvlhost.h | 248 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 607 insertions(+), 0 deletions(-) create mode 100644 board/dvlhost/Makefile create mode 100644 board/dvlhost/dvlhost.c create mode 100644 board/dvlhost/dvlhost_hw.h create mode 100644 board/dvlhost/u-boot.lds create mode 100644 board/dvlhost/watchdog.c create mode 100644 include/configs/dvlhost.h