June 2010 - U-Boot

[U-Boot] Warnings when compiling for AVR32 boards
by Reinhard Meyer (-VC) 06 Jun '10

06 Jun '10

During "./MAKEALL avr32" at least my toolchain gives the following warnings for every board: Configuring for atstk1002 board... atmel_usart.c:21:2: warning: #warning Please update to use C structur SoC access ! cmd_bdinfo.c: In function 'do_bdinfo': cmd_bdinfo.c:295: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int' text data bss dec hex filename 91587 7136 211712 310435 4bca3 ./u-boot <same for all boards> ==== atmel_usart.c: that is more or less a TODO warning, it should probably be removed or the structure approach be implemented. And is it wise to directly pointer access hardware, even if the AVR32 hardware allows that without cache problems? ==== cmd_bdinfo.c: this is because printf ("baudrate = %d bps\n", bd->bi_baudrate); but AVR32 bd_t has unsigned long bi_baudrate and there is no explicit case for avr32 architecture, so the code under /* ! PPC, which leaves MIPS */ is compiled and used! The current architecture specific #if chain in cmd_bdinfo.c is as follows: #ifndef CONFIG_ARM /* PowerPC and other */ #ifdef CONFIG_PPC #elif defined(CONFIG_NIOS2) /* Nios-II */ #elif defined(CONFIG_MICROBLAZE) /* ! PPC, which leaves Microblaze */ #elif defined(CONFIG_SPARC) /* SPARC */ #elif defined(CONFIG_M68K) /* M68K */ #elif defined(CONFIG_BLACKFIN) #else /* ! PPC, which leaves MIPS */ >>AVR32 falls into here << #endif /* MIPS */ #else /* ARM */ #endif /* CONFIG_ARM XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ Would it not be better to include ARM in the #elif chain as well, and of course add AVR32 in a similiar way: #if defined(CONFIG_PPC) #elif defined(CONFIG_NIOS2) #elif defined(CONFIG_MICROBLAZE) #elif defined(CONFIG_SPARC) #elif defined(CONFIG_M68K) #elif defined(CONFIG_BLACKFIN) #elif defined(CONFIG_MIPS) #elif defined(CONFIG_AVR32) #elif defined(CONFIG_ARM) #else #error "a case for this architecture does not exist" #endif I can rework that and submit a patch, but I cannot MAKEALL all the architectures. However the changes should be straightforward and involve little risk breaking something. Reinhard

1 0

[U-Boot] [PATCH] add support for EMK TOP7000 CPU Module (2nd try)
by Reinhard Meyer (-VC) 06 Jun '10

06 Jun '10

Add support for EMK TOP7000 CPU Module Specifics: 1) create subdir board/emk/top7000 and files in it 2) create include/configs/top7000.h 3) update board/emk/common/vpd.c 4) add call to misc_init_r() to arch/avr32/lib/board.c 5) create arch/avr32/include/asm/unaligned.h to fix zlib.c compilation problem 6) update Makefile, MAINTAINERS, MAKEALL Signed-off-by: Reinhard Meyer <info(a)emk-elektronik.de> --- MAINTAINERS | 6 +- MAKEALL | 3 +- Makefile | 3 + arch/avr32/include/asm/unaligned.h | 1 + arch/avr32/lib/board.c | 5 + board/emk/common/vpd.c | 71 +++++++++++- board/emk/top7000/Makefile | 41 +++++++ board/emk/top7000/config.mk | 3 + board/emk/top7000/top7000.c | 174 +++++++++++++++++++++++++++++ board/emk/top7000/u-boot.lds | 72 ++++++++++++ include/configs/top7000.h | 217 ++++++++++++++++++++++++++++++++++++ 11 files changed, 588 insertions(+), 8 deletions(-) create mode 100644 arch/avr32/include/asm/unaligned.h create mode 100644 board/emk/top7000/Makefile create mode 100644 board/emk/top7000/config.mk create mode 100644 board/emk/top7000/top7000.c create mode 100644 board/emk/top7000/u-boot.lds create mode 100644 include/configs/top7000.h diff --git a/MAINTAINERS b/MAINTAINERS index 7a13d28..a361be1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -311,7 +311,7 @@ Andrea "llandre" Marson <andrea.marson(a)dave-tech.it> PPChameleonEVB PPC405EP -Reinhard Meyer <r.meyer(a)emk-elektronik.de> +Reinhard Meyer <reinhard.meyer(a)emk-elektronik.de> TOP860 MPC860T TOP5200 MPC5200 @@ -919,6 +919,10 @@ Julien May <julien.may(a)miromico.ch> HAMMERHEAD AT32AP7000 +Reinhard Meyer <reinhard.meyer(a)emk-elektronik.de> + + TOP7000 AT32AP7000 + Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> ATSTK1000 AT32AP7xxx diff --git a/MAKEALL b/MAKEALL index 2527352..3a80041 100755 --- a/MAKEALL +++ b/MAKEALL @@ -873,7 +873,8 @@ LIST_avr32=" \ atngw100 \ favr-32-ezkit \ hammerhead \ - mimc200 \ + mimc200 \ + top7000 \ " ######################################################################### diff --git a/Makefile b/Makefile index c26e491..e57a4ca 100644 --- a/Makefile +++ b/Makefile @@ -3549,6 +3549,9 @@ hammerhead_config : unconfig mimc200_config : unconfig @$(MKCONFIG) $(@:_config=) avr32 at32ap mimc200 mimc at32ap700x +top7000_config : unconfig + @$(MKCONFIG) $(@:_config=) avr32 at32ap top7000 emk at32ap700x + #======================================================================== # SH3 (SuperH) #======================================================================== diff --git a/arch/avr32/include/asm/unaligned.h b/arch/avr32/include/asm/unaligned.h new file mode 100644 index 0000000..6cecbbb --- /dev/null +++ b/arch/avr32/include/asm/unaligned.h @@ -0,0 +1 @@ +#include <asm-generic/unaligned.h> diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index 917ed6c..6be5ab0 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -337,6 +337,11 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) jumptable_init(); console_init_r(); +#if defined(CONFIG_MISC_INIT_R) + /* miscellaneous platform dependent initialisations */ + misc_init_r(); +#endif + s = getenv("loadaddr"); if (s) load_addr = simple_strtoul(s, NULL, 16); diff --git a/board/emk/common/vpd.c b/board/emk/common/vpd.c index c2af219..d2c8af2 100644 --- a/board/emk/common/vpd.c +++ b/board/emk/common/vpd.c @@ -1,6 +1,6 @@ /* - * (C) Copyright 2003 - * Reinhard Meyer, EMK Elektronik GmbH, r.meyer(a)emk-elektronik.de + * (C) Copyright 2003-2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.de * * See file CREDITS for list of people who contributed to this * project. @@ -22,10 +22,9 @@ */ #include <common.h> - -/***************************************************************************** - * read "factory" part of EEPROM and set some environment variables - *****************************************************************************/ +#include <command.h> + +/* read "factory" part of EEPROM and set some environment variables */ void read_factory_r (void) { /* read 'factory' part of EEPROM */ @@ -70,6 +69,10 @@ void read_factory_r (void) /* search for our specific entry */ if (!strncmp ((char *) buf, "[RLA/lan/Ethernet] ", 19)) { setenv ("ethaddr", (char *)(buf + 19)); +#if defined(CONFIG_TOP7000) + } else if (!strncmp ((char *) buf, "[RLA/lan2/Ethernet] ", 20)) { + setenv ("eth1addr", (char *)(buf + 20)); +#endif } else if (!strncmp ((char *) buf, "[BOARD/SERIAL] ", 15)) { setenv ("serial#", (char *)(buf + 15)); } else if (!strncmp ((char *) buf, "[BOARD/TYPE] ", 13)) { @@ -77,3 +80,59 @@ void read_factory_r (void) } } } + +#if defined(CONFIG_TOP7000_VPD) && defined(CONFIG_SYS_FACT_ENTRY) +/* + * create VPD entries to EEPROM. + * IEEE assigned MAC adress range to EMK are 00:80:d9:xx:xx:xx + * EMK assigned MAC adress range for TOP7000 is 00:80:d9:0d:hh:ll + * Every TOP7000 can potentially use 2 MAC adresses. + * hh:ll is derived from the board serial number as follows: + * MAC0: hh:ll = (serialnumber-1)*2 + * MAC1: hh:ll = (serialnumber-1)*2+1 + * Serialnumbers are guaranteed to be unique in the range of 1 to + * 32768 max. + */ +int do_vpd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + uchar buf[512]; + uchar *p; + int i; + u_int addr; + + if (argc != 3) + return 1; + + p = buf+2; + i = simple_strtoul(argv[1], NULL, 10); + if (i<1 || i>32766) + return 1; + + addr=(i-1)*2; + + p+=sprintf((char*)p, + "[RLA/lan/Ethernet] 00:80:d9:0d:%02x:%02x\n", + addr/256, addr%256); + addr++; + p+=sprintf((char*)p, + "[RLA/lan2/Ethernet] 00:80:d9:0d:%02x:%02x\n", + addr/256, addr%256); + p+=sprintf((char*)p, "[BOARD/SERIAL] %05d\n", i); + p+=sprintf((char*)p, "[BOARD/TYPE] %s\n", argv[2]); + + i = p-buf-2; + buf[0]=i; + buf[1]=i>>8; + if (eeprom_write (CONFIG_SYS_I2C_FACT_ADDR, + CONFIG_SYS_FACT_OFFSET, buf, i+2)) { + printf ("cannot write factory configuration\n"); + return 1; + } + + return 0; +} + +U_BOOT_CMD(vpd, 3, 0, do_vpd, + "enter vital product data", + "serialnumber type"); +#endif diff --git a/board/emk/top7000/Makefile b/board/emk/top7000/Makefile new file mode 100644 index 0000000..1fcf08b --- /dev/null +++ b/board/emk/top7000/Makefile @@ -0,0 +1,41 @@ +# +# (C) Copyright 2010 +# EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.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).a + +COBJS := $(BOARD).o ../common/vpd.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/emk/top7000/config.mk b/board/emk/top7000/config.mk new file mode 100644 index 0000000..9a794e5 --- /dev/null +++ b/board/emk/top7000/config.mk @@ -0,0 +1,3 @@ +TEXT_BASE = 0x00000000 +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections +PLATFORM_LDFLAGS += --gc-sections diff --git a/board/emk/top7000/top7000.c b/board/emk/top7000/top7000.c new file mode 100644 index 0000000..171c7ee --- /dev/null +++ b/board/emk/top7000/top7000.c @@ -0,0 +1,174 @@ +/* + * (C) Copyright 2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.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/io.h> +#include <asm/sdram.h> +#include <asm/arch/clk.h> +#include <asm/arch/gpio.h> +#include <asm/arch/hmatrix.h> +#include <asm/arch/portmux.h> +#include <netdev.h> +#include <i2c.h> + +DECLARE_GLOBAL_DATA_PTR; + +static const struct sdram_config sdram_config = { + .data_bits = SDRAM_DATA_16BIT, + .row_bits = 13, + .col_bits = 9, + .bank_bits = 2, + .cas = 3, + .twr = 2, + .trc = 7, + .trp = 2, + .trcd = 2, + .tras = 5, + .txsr = 5, + /* 7.81 us */ + .refresh_period = (781 * (SDRAMC_BUS_HZ / 1000)) / 100000, +}; + +int board_early_init_f(void) +{ + /* Enable SDRAM in the EBI mux */ + hmatrix_slave_write(EBI, SFR, HMATRIX_BIT(EBI_SDRAM_ENABLE)); + + /* 16 data, 26 address lines */ + portmux_enable_ebi(16, 26, 0, PORTMUX_DRIVE_HIGH); + portmux_enable_usart1(PORTMUX_DRIVE_MIN); + +#if defined(CONFIG_MACB) + portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH); + portmux_enable_macb1(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH); +#endif +#if defined(CONFIG_MMC) + portmux_enable_mmci(0, PORTMUX_MMCI_4BIT, PORTMUX_DRIVE_LOW); +#endif +#if defined(CONFIG_ATMEL_SPI) + portmux_enable_spi0(1 << 0, PORTMUX_DRIVE_LOW); +#endif +#ifdef CONFIG_CMD_I2C + /* set SCL and SDA to open drain gpio */ + portmux_select_gpio(PORTMUX_PORT_A,(1<<SDA_PIN), + PORTMUX_DIR_OUTPUT|PORTMUX_INIT_LOW|PORTMUX_OPEN_DRAIN); + portmux_select_gpio(PORTMUX_PORT_A,(1<<SCL_PIN), + PORTMUX_DIR_OUTPUT|PORTMUX_INIT_LOW|PORTMUX_OPEN_DRAIN); + /* initialize i2c. note: params ignored in SOFT I2C */ + i2c_init(0, 0); +#endif + return 0; +} + +phys_size_t initdram(int board_type) +{ + unsigned long expected_size; + unsigned long actual_size; + void *sdram_base; + + sdram_base = map_physmem(EBI_SDRAM_BASE, EBI_SDRAM_SIZE, MAP_NOCACHE); + + expected_size = sdram_init(sdram_base, &sdram_config); + actual_size = get_ram_size(sdram_base, expected_size); + + unmap_physmem(sdram_base, EBI_SDRAM_SIZE); + + if (expected_size != actual_size) + printf("Warning: Only %lu of %lu MiB SDRAM is working\n", + actual_size >> 20, expected_size >> 20); + + return actual_size; +} + +int board_early_init_r(void) +{ + gd->bd->bi_phy_id[0] = 0x01; + gd->bd->bi_phy_id[1] = 0x03; + return 0; +} + +int misc_init_r(void) +{ + /* read 'factory' part of EEPROM */ + extern void read_factory_r(void); + read_factory_r(); + return 0; +} + +#ifdef CONFIG_CMD_NET +int board_eth_init(bd_t *bi) +{ + int rc; + rc = macb_eth_initialize(0, + (void *)MACB0_BASE, bi->bi_phy_id[0]); + if (rc < 0) + return rc; + rc = macb_eth_initialize(1, + (void *)MACB1_BASE, bi->bi_phy_id[1]); + if (rc < 0) + return 1; + return 2; +} +#endif + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +#define DATAFLASH_CS_PIN GPIO_PIN_PA(3) + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs == 0; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + gpio_set_value(DATAFLASH_CS_PIN, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + gpio_set_value(DATAFLASH_CS_PIN, 1); +} +#endif /* CONFIG_ATMEL_SPI */ + +/* I2C access functions */ +#ifdef CONFIG_CMD_I2C + +int iic_read(void) +{ + return pio_get_input_value(GPIO_PIN_PA(SDA_PIN)); +} + +void iic_sda(int bit) +{ + pio_set_output_value(GPIO_PIN_PA(SDA_PIN),bit); +} + +void iic_scl(int bit) +{ + pio_set_output_value(GPIO_PIN_PA(SCL_PIN),bit); +} + +#endif /* CONFIG_CMD_I2C */ diff --git a/board/emk/top7000/u-boot.lds b/board/emk/top7000/u-boot.lds new file mode 100644 index 0000000..ffa119b --- /dev/null +++ b/board/emk/top7000/u-boot.lds @@ -0,0 +1,72 @@ +/* + * (C) Copyright 2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.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-avr32", "elf32-avr32", "elf32-avr32") +OUTPUT_ARCH(avr32) +ENTRY(_start) + +SECTIONS +{ + . = 0; + _text = .; + .text : { + *(.exception.text) + *(.text) + *(.text.*) + } + _etext = .; + + .rodata : { + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } + + . = ALIGN(8); + _data = .; + .data : { + *(.data) + *(.data.*) + } + + . = ALIGN(4); + __u_boot_cmd_start = .; + .u_boot_cmd : { + KEEP(*(.u_boot_cmd)) + } + __u_boot_cmd_end = .; + + . = ALIGN(4); + _got = .; + .got : { + *(.got) + } + _egot = .; + + . = ALIGN(8); + _edata = .; + + .bss : { + *(.bss) + *(.bss.*) + } + . = ALIGN(8); + _end = .; +} diff --git a/include/configs/top7000.h b/include/configs/top7000.h new file mode 100644 index 0000000..e509611 --- /dev/null +++ b/include/configs/top7000.h @@ -0,0 +1,217 @@ +/* + * (C) Copyright 2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.de + * + * Configuration settings for the TOP7000 CPU Module + * + * 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 + */ + +/* + * TOP7000 features/differences to ATNGW100: + * + * parallel FLASH upto 64MB (typically S29GL128/256/512Pxxxx) + * no serial FLASH (SPI not used) + * optional micro SD card for root and user file systems + * VPD and environment in I2C EEPROM + * kernel as image in parallel FLASH + * + * parallel FLASH partitioning: + * 00000000-00020000 128k U-Boot + * 00020000-00200000 2M-128k kernel + * 00200000-end root file system + */ +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/arch/memory-map.h> + +#define CONFIG_AVR32 1 +#define CONFIG_AT32AP 1 +#define CONFIG_AT32AP7000 1 +#define CONFIG_TOP7000 1 +#define CONFIG_SYS_HZ 1000 + +/* + * Set up the PLL to run at 140 MHz, the CPU to run at the PLL + * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency + * and the PBA bus to run at 1/4 the PLL frequency. + */ +#define CONFIG_PLL 1 +#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_SYS_OSC0_HZ 20000000 +#define CONFIG_SYS_PLL0_DIV 1 +#define CONFIG_SYS_PLL0_MUL 7 +#define CONFIG_SYS_PLL0_SUPPRESS_CYCLES 16 +#define CONFIG_SYS_CLKDIV_CPU 0 +#define CONFIG_SYS_CLKDIV_HSB 1 +#define CONFIG_SYS_CLKDIV_PBA 2 +#define CONFIG_SYS_CLKDIV_PBB 1 + +/* + * The PLLOPT register controls the PLL like this: + * icp = PLLOPT<2> + * ivco = PLLOPT<1:0> + * + * We want icp=1 (default) and ivco=0 (80-160 MHz) or ivco=2 (150-240MHz). + */ +#define CONFIG_SYS_PLL0_OPT 0x04 + +#define CONFIG_USART1 1 + +/* User serviceable stuff */ +#define CONFIG_DOS_PARTITION 1 + +#define CONFIG_CMDLINE_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +#define CONFIG_STACKSIZE (2048) + +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTARGS "console=ttyS0 root=/dev/mtdblock2 rootfstype=jffs2" +#define CONFIG_BOOTCOMMAND "bootm 0xa0020000" + +/* + * Only interrupt autoboot if <space> is pressed. Otherwise, garbage + * data on the serial line may interrupt the boot sequence. + */ +#define CONFIG_BOOTDELAY 1 +#define CONFIG_AUTOBOOT 1 +#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d seconds\n", bootdelay +#define CONFIG_AUTOBOOT_DELAY_STR "d" +#define CONFIG_AUTOBOOT_STOP_STR " " + +#define CONFIG_NET_MULTI 1 + +/* + * BOOTP/DHCP options + */ +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY + +#define CONFIG_DOS_PARTITION 1 + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_MMC +#define CONFIG_CMD_I2C + +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_SOURCE +#undef CONFIG_CMD_XIMG + +#define CONFIG_ATMEL_USART 1 +#define CONFIG_MACB 1 +#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_SYS_NR_PIOS 5 +#define CONFIG_SYS_HSDRAMC 1 +#define CONFIG_MMC 1 +#define CONFIG_ATMEL_MCI 1 + +#define CONFIG_SYS_DCACHE_LINESZ 32 +#define CONFIG_SYS_ICACHE_LINESZ 32 + +#define CONFIG_NR_DRAM_BANKS 1 + +#define CONFIG_SYS_FLASH_CFI 1 +#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_EMPTY_INFO 1 + +/* I2C configuration */ +#define CONFIG_SOFT_I2C 1 +#define CONFIG_SYS_I2C_SPEED 400000 +#define CONFIG_SYS_I2C_SLAVE 0x7F +#define SDA_PIN 6 +#define SCL_PIN 7 +#define I2C_SOFT_DECLARATIONS int iic_read(void);\ + void iic_sda(int);\ + void iic_scl(int); +#define I2C_ACTIVE +#define I2C_TRISTATE +#define I2C_READ iic_read() +#define I2C_SDA(bit) iic_sda(bit) +#define I2C_SCL(bit) iic_scl(bit) +#define I2C_DELAY udelay(3) + +/* EEPROM configuration */ +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 70 +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_SYS_EEPROM_SIZE 0x2000 +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 +#define CONFIG_MISC_INIT_R + +/* Environment settings */ +#define CONFIG_ENV_IS_IN_EEPROM 1 +#define CONFIG_ENV_OFFSET 0x1000 +#define CONFIG_ENV_SIZE 0x0700 +#define CONFIG_ENV_OVERWRITE + +/* VPD settings */ +#define CONFIG_SYS_I2C_FACT_ADDR 0x57 +#define CONFIG_SYS_FACT_OFFSET 0x1800 +#define CONFIG_SYS_FACT_SIZE 0x0800 +/* define the next only if you want to allow users to enter VPD data */ +#define CONFIG_SYS_FACT_ENTRY 1 + +/* MAX 64MB S29GL512Pxxx, 512 sectors */ +#define CONFIG_SYS_FLASH_BASE 0x00000000 +#define CONFIG_SYS_FLASH_SIZE 0x4000000 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 512 + +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE + +#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE +#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE +#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE) + +#define CONFIG_SYS_MALLOC_LEN (256*1024) +#define CONFIG_SYS_DMA_ALLOC_LEN (16384) + +/* Allow 4MB for the kernel run-time image */ +#define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000) +#define CONFIG_SYS_BOOTPARAMS_LEN (16 * 1024) + +/* Other configuration settings that shouldn't have to change all that often */ +#define CONFIG_SYS_PROMPT "top7000> " +#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_LONGHELP 1 + +#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000) + +#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 } + +#endif /* __CONFIG_H */ -- 1.5.6.5

1 1

[U-Boot] [PATCH] add support for EMK TOP7000 CPU module
by Reinhard Meyer (-VC) 06 Jun '10

06 Jun '10

Add support for EMK TOP7000 CPU module Specifics: 1) create subdir board/emk/top7000 and files in it 2) create include/configs/top7000.h 3) update board/emk/common/vpd.c 4) add call to misc_init_r() to arch/avr32/lib/board.c 5) create arch/avr32/include/asm/unaligned.h to fix zlib.c compilation problem 6) update Makefile, MAINTAINERS, MAKEALL Signed-off-by: Reinhard Meyer <info(a)emk-elektronik.de> --- MAINTAINERS | 6 +- MAKEALL | 3 +- Makefile | 3 + arch/avr32/include/asm/unaligned.h | 1 + arch/avr32/lib/board.c | 5 + board/emk/common/vpd.c | 56 +++++++++- board/emk/top7000/Makefile | 41 +++++++ board/emk/top7000/config.mk | 3 + board/emk/top7000/top7000.c | 169 ++++++++++++++++++++++++++++ board/emk/top7000/u-boot.lds | 72 ++++++++++++ include/configs/top7000.h | 216 ++++++++++++++++++++++++++++++++++++ 11 files changed, 570 insertions(+), 5 deletions(-) create mode 100644 arch/avr32/include/asm/unaligned.h create mode 100644 board/emk/top7000/Makefile create mode 100644 board/emk/top7000/config.mk create mode 100644 board/emk/top7000/top7000.c create mode 100644 board/emk/top7000/u-boot.lds create mode 100644 include/configs/top7000.h diff --git a/MAINTAINERS b/MAINTAINERS index 7a13d28..a361be1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -311,7 +311,7 @@ Andrea "llandre" Marson <andrea.marson(a)dave-tech.it> PPChameleonEVB PPC405EP -Reinhard Meyer <r.meyer(a)emk-elektronik.de> +Reinhard Meyer <reinhard.meyer(a)emk-elektronik.de> TOP860 MPC860T TOP5200 MPC5200 @@ -919,6 +919,10 @@ Julien May <julien.may(a)miromico.ch> HAMMERHEAD AT32AP7000 +Reinhard Meyer <reinhard.meyer(a)emk-elektronik.de> + + TOP7000 AT32AP7000 + Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> ATSTK1000 AT32AP7xxx diff --git a/MAKEALL b/MAKEALL index 2527352..3a80041 100755 --- a/MAKEALL +++ b/MAKEALL @@ -873,7 +873,8 @@ LIST_avr32=" \ atngw100 \ favr-32-ezkit \ hammerhead \ - mimc200 \ + mimc200 \ + top7000 \ " ######################################################################### diff --git a/Makefile b/Makefile index c26e491..e57a4ca 100644 --- a/Makefile +++ b/Makefile @@ -3549,6 +3549,9 @@ hammerhead_config : unconfig mimc200_config : unconfig @$(MKCONFIG) $(@:_config=) avr32 at32ap mimc200 mimc at32ap700x +top7000_config : unconfig + @$(MKCONFIG) $(@:_config=) avr32 at32ap top7000 emk at32ap700x + #======================================================================== # SH3 (SuperH) #======================================================================== diff --git a/arch/avr32/include/asm/unaligned.h b/arch/avr32/include/asm/unaligned.h new file mode 100644 index 0000000..6cecbbb --- /dev/null +++ b/arch/avr32/include/asm/unaligned.h @@ -0,0 +1 @@ +#include <asm-generic/unaligned.h> diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index 917ed6c..6be5ab0 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -337,6 +337,11 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) jumptable_init(); console_init_r(); +#if defined(CONFIG_MISC_INIT_R) + /* miscellaneous platform dependent initialisations */ + misc_init_r(); +#endif + s = getenv("loadaddr"); if (s) load_addr = simple_strtoul(s, NULL, 16); diff --git a/board/emk/common/vpd.c b/board/emk/common/vpd.c index c2af219..a6c456b --- a/board/emk/common/vpd.c +++ b/board/emk/common/vpd.c @@ -1,6 +1,6 @@ /* - * (C) Copyright 2003 - * Reinhard Meyer, EMK Elektronik GmbH, r.meyer(a)emk-elektronik.de + * (C) Copyright 2003-2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.de * * See file CREDITS for list of people who contributed to this * project. @@ -22,7 +22,8 @@ */ #include <common.h> - +#include <command.h> + /***************************************************************************** * read "factory" part of EEPROM and set some environment variables *****************************************************************************/ @@ -70,6 +71,10 @@ void read_factory_r (void) /* search for our specific entry */ if (!strncmp ((char *) buf, "[RLA/lan/Ethernet] ", 19)) { setenv ("ethaddr", (char *)(buf + 19)); +#if defined(CONFIG_TOP7000) + } else if (!strncmp ((char *) buf, "[RLA/lan2/Ethernet] ", 20)) { + setenv ("eth1addr", (char *)(buf + 20)); +#endif } else if (!strncmp ((char *) buf, "[BOARD/SERIAL] ", 15)) { setenv ("serial#", (char *)(buf + 15)); } else if (!strncmp ((char *) buf, "[BOARD/TYPE] ", 13)) { @@ -77,3 +82,48 @@ void read_factory_r (void) } } } + +#if defined(CONFIG_TOP7000) +int do_vpd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + uchar buf[512]; + uchar *p; + int i; + u_int addr; + + if (argc != 3) + return 1; + + p = buf+2; + i = simple_strtoul(argv[1], NULL, 10); + if (i<1 || i>32766) + return 1; + + addr=(i-1)*2; + + p+=sprintf((char*)p, + "[RLA/lan/Ethernet] 00:80:d9:0d:%02x:%02x\n", + addr/256, addr%256); + addr++; + p+=sprintf((char*)p, + "[RLA/lan2/Ethernet] 00:80:d9:0d:%02x:%02x\n", + addr/256, addr%256); + p+=sprintf((char*)p, "[BOARD/SERIAL] %05d\n", i); + p+=sprintf((char*)p, "[BOARD/TYPE] %s\n", argv[2]); + + i = p-buf-2; + buf[0]=i; + buf[1]=i>>8; + if (eeprom_write (CONFIG_SYS_I2C_FACT_ADDR, + CONFIG_SYS_FACT_OFFSET, buf, i+2)) { + printf ("cannot write factory configuration\n"); + return 1; + } + + return 0; +} + +U_BOOT_CMD(vpd, 3, 0, do_vpd, + "enter vital product data", + "serialnumber type"); +#endif diff --git a/board/emk/top7000/Makefile b/board/emk/top7000/Makefile new file mode 100644 index 0000000..1fcf08b --- /dev/null +++ b/board/emk/top7000/Makefile @@ -0,0 +1,41 @@ +# +# (C) Copyright 2010 +# EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.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).a + +COBJS := $(BOARD).o ../common/vpd.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/emk/top7000/config.mk b/board/emk/top7000/config.mk new file mode 100644 index 0000000..9a794e5 --- /dev/null +++ b/board/emk/top7000/config.mk @@ -0,0 +1,3 @@ +TEXT_BASE = 0x00000000 +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections +PLATFORM_LDFLAGS += --gc-sections diff --git a/board/emk/top7000/top7000.c b/board/emk/top7000/top7000.c new file mode 100644 index 0000000..bdc63cd --- /dev/null +++ b/board/emk/top7000/top7000.c @@ -0,0 +1,169 @@ +/* + * (C) Copyright 2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.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/io.h> +#include <asm/sdram.h> +#include <asm/arch/clk.h> +#include <asm/arch/gpio.h> +#include <asm/arch/hmatrix.h> +#include <asm/arch/portmux.h> +#include <netdev.h> +#include <i2c.h> + +DECLARE_GLOBAL_DATA_PTR; + +static const struct sdram_config sdram_config = { + .data_bits = SDRAM_DATA_16BIT, + .row_bits = 13, + .col_bits = 9, + .bank_bits = 2, + .cas = 3, + .twr = 2, + .trc = 7, + .trp = 2, + .trcd = 2, + .tras = 5, + .txsr = 5, + /* 7.81 us */ + .refresh_period = (781 * (SDRAMC_BUS_HZ / 1000)) / 100000, +}; + +int board_early_init_f(void) +{ + /* Enable SDRAM in the EBI mux */ + hmatrix_slave_write(EBI, SFR, HMATRIX_BIT(EBI_SDRAM_ENABLE)); + + /* 16 data, 26 address lines */ + portmux_enable_ebi(16, 26, 0, PORTMUX_DRIVE_HIGH); + portmux_enable_usart1(PORTMUX_DRIVE_MIN); + +#if defined(CONFIG_MACB) + portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH); + portmux_enable_macb1(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH); +#endif +#if defined(CONFIG_MMC) + portmux_enable_mmci(0, PORTMUX_MMCI_4BIT, PORTMUX_DRIVE_LOW); +#endif +#if defined(CONFIG_ATMEL_SPI) + portmux_enable_spi0(1 << 0, PORTMUX_DRIVE_LOW); +#endif +#ifdef CONFIG_CMD_I2C + /* set SCL and SDA to open drain gpio */ + portmux_select_gpio(PORTMUX_PORT_A,(1<<SDA_PIN), + PORTMUX_DIR_OUTPUT|PORTMUX_INIT_LOW|PORTMUX_OPEN_DRAIN); + portmux_select_gpio(PORTMUX_PORT_A,(1<<SCL_PIN), + PORTMUX_DIR_OUTPUT|PORTMUX_INIT_LOW|PORTMUX_OPEN_DRAIN); + /* initialize i2c. note: params ignored in SOFT I2C */ + i2c_init(0, 0); +#endif + return 0; +} + +phys_size_t initdram(int board_type) +{ + unsigned long expected_size; + unsigned long actual_size; + void *sdram_base; + + sdram_base = map_physmem(EBI_SDRAM_BASE, EBI_SDRAM_SIZE, MAP_NOCACHE); + + expected_size = sdram_init(sdram_base, &sdram_config); + actual_size = get_ram_size(sdram_base, expected_size); + + unmap_physmem(sdram_base, EBI_SDRAM_SIZE); + + if (expected_size != actual_size) + printf("Warning: Only %lu of %lu MiB SDRAM is working\n", + actual_size >> 20, expected_size >> 20); + + return actual_size; +} + +int board_early_init_r(void) +{ + gd->bd->bi_phy_id[0] = 0x01; + gd->bd->bi_phy_id[1] = 0x03; + return 0; +} + +int misc_init_r(void) +{ + /* read 'factory' part of EEPROM */ + extern void read_factory_r(void); + read_factory_r(); + return 0; +} + +#ifdef CONFIG_CMD_NET +int board_eth_init(bd_t *bi) +{ + macb_eth_initialize(0, + (void *)MACB0_BASE, bi->bi_phy_id[0]); + macb_eth_initialize(1, + (void *)MACB1_BASE, bi->bi_phy_id[1]); + return 0; +} +#endif + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +#define DATAFLASH_CS_PIN GPIO_PIN_PA(3) + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs == 0; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + gpio_set_value(DATAFLASH_CS_PIN, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + gpio_set_value(DATAFLASH_CS_PIN, 1); +} +#endif /* CONFIG_ATMEL_SPI */ + +/* I2C access functions */ +#ifdef CONFIG_CMD_I2C + +int iic_read(void) +{ + return pio_get_input_value(GPIO_PIN_PA(SDA_PIN)); +} + +void iic_sda(int bit) +{ + pio_set_output_value(GPIO_PIN_PA(SDA_PIN),bit); +} + +void iic_scl(int bit) +{ + pio_set_output_value(GPIO_PIN_PA(SCL_PIN),bit); +} + +#endif /* CONFIG_CMD_I2C */ diff --git a/board/emk/top7000/u-boot.lds b/board/emk/top7000/u-boot.lds new file mode 100644 index 0000000..ffa119b --- /dev/null +++ b/board/emk/top7000/u-boot.lds @@ -0,0 +1,72 @@ +/* + * (C) Copyright 2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.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-avr32", "elf32-avr32", "elf32-avr32") +OUTPUT_ARCH(avr32) +ENTRY(_start) + +SECTIONS +{ + . = 0; + _text = .; + .text : { + *(.exception.text) + *(.text) + *(.text.*) + } + _etext = .; + + .rodata : { + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } + + . = ALIGN(8); + _data = .; + .data : { + *(.data) + *(.data.*) + } + + . = ALIGN(4); + __u_boot_cmd_start = .; + .u_boot_cmd : { + KEEP(*(.u_boot_cmd)) + } + __u_boot_cmd_end = .; + + . = ALIGN(4); + _got = .; + .got : { + *(.got) + } + _egot = .; + + . = ALIGN(8); + _edata = .; + + .bss : { + *(.bss) + *(.bss.*) + } + . = ALIGN(8); + _end = .; +} diff --git a/include/configs/top7000.h b/include/configs/top7000.h new file mode 100644 index 0000000..c29fa00 --- /dev/null +++ b/include/configs/top7000.h @@ -0,0 +1,216 @@ +/* + * (C) Copyright 2010 + * EMK Elektronik GmbH & Co. KG, reinhard.meyer(a)emk-elektronik.de + * + * Configuration settings for the TOP7000 CPU Module + * + * 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 + */ + +/* + * TOP7000 features/differences to ATNGW100: + * + * parallel FLASH upto 64MB (typically S29GL128/256/512Pxxxx) + * no serial FLASH (SPI not used) + * optional micro SD card for root and user file systems + * VPD and environment in I2C EEPROM + * kernel as image in parallel FLASH + * + * parallel FLASH partitioning: + * 00000000-00020000 128k U-Boot + * 00020000-00200000 2M-128k kernel + * 00200000-end root file system + */ +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/arch/memory-map.h> + +#define CONFIG_AVR32 1 +#define CONFIG_AT32AP 1 +#define CONFIG_AT32AP7000 1 +#define CONFIG_TOP7000 1 + +#define CONFIG_SYS_HZ 1000 + +/* + * Set up the PLL to run at 140 MHz, the CPU to run at the PLL + * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency + * and the PBA bus to run at 1/4 the PLL frequency. + */ +#define CONFIG_PLL 1 +#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_SYS_OSC0_HZ 20000000 +#define CONFIG_SYS_PLL0_DIV 1 +#define CONFIG_SYS_PLL0_MUL 7 +#define CONFIG_SYS_PLL0_SUPPRESS_CYCLES 16 +#define CONFIG_SYS_CLKDIV_CPU 0 +#define CONFIG_SYS_CLKDIV_HSB 1 +#define CONFIG_SYS_CLKDIV_PBA 2 +#define CONFIG_SYS_CLKDIV_PBB 1 + +/* + * The PLLOPT register controls the PLL like this: + * icp = PLLOPT<2> + * ivco = PLLOPT<1:0> + * + * We want icp=1 (default) and ivco=0 (80-160 MHz) or ivco=2 (150-240MHz). + */ +#define CONFIG_SYS_PLL0_OPT 0x04 + +#define CONFIG_USART1 1 + +/* User serviceable stuff */ +#define CONFIG_DOS_PARTITION 1 + +#define CONFIG_CMDLINE_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +#define CONFIG_STACKSIZE (2048) + +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTARGS "console=ttyS0 root=/dev/mtdblock2 rootfstype=jffs2" +#define CONFIG_BOOTCOMMAND "bootm 0xa0020000" + +/* + * Only interrupt autoboot if <space> is pressed. Otherwise, garbage + * data on the serial line may interrupt the boot sequence. + */ +#define CONFIG_BOOTDELAY 1 +#define CONFIG_AUTOBOOT 1 +#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d seconds\n", bootdelay +#define CONFIG_AUTOBOOT_DELAY_STR "d" +#define CONFIG_AUTOBOOT_STOP_STR " " + +#define CONFIG_NET_MULTI 1 + +/* + * BOOTP/DHCP options + */ +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY + +#define CONFIG_DOS_PARTITION 1 + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_MMC +#define CONFIG_CMD_I2C + +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_SOURCE +#undef CONFIG_CMD_XIMG + +#define CONFIG_ATMEL_USART 1 +#define CONFIG_MACB 1 +#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_SYS_NR_PIOS 5 +#define CONFIG_SYS_HSDRAMC 1 +#define CONFIG_MMC 1 +#define CONFIG_ATMEL_MCI 1 + +#define CONFIG_SYS_DCACHE_LINESZ 32 +#define CONFIG_SYS_ICACHE_LINESZ 32 + +#define CONFIG_NR_DRAM_BANKS 1 + +#define CONFIG_SYS_FLASH_CFI 1 +#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_EMPTY_INFO 1 + +/* I2C configuration */ +#define CONFIG_SOFT_I2C 1 +#define CONFIG_SYS_I2C_SPEED 400000 +#define CONFIG_SYS_I2C_SLAVE 0x7F +#define SDA_PIN 6 +#define SCL_PIN 7 +#define I2C_SOFT_DECLARATIONS int iic_read(void);\ + void iic_sda(int);\ + void iic_scl(int); +#define I2C_ACTIVE +#define I2C_TRISTATE +#define I2C_READ iic_read() +#define I2C_SDA(bit) iic_sda(bit) +#define I2C_SCL(bit) iic_scl(bit) +#define I2C_DELAY udelay(3) + +/* EEPROM configuration */ +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 70 +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_SYS_EEPROM_SIZE 0x2000 +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 +#define CONFIG_MISC_INIT_R + +/* Environment settings */ +#define CONFIG_ENV_IS_IN_EEPROM 1 +#define CONFIG_ENV_OFFSET 0x1000 +#define CONFIG_ENV_SIZE 0x0700 +#define CONFIG_ENV_OVERWRITE + +/* VPD settings */ +#define CONFIG_SYS_I2C_FACT_ADDR 0x57 +#define CONFIG_SYS_FACT_OFFSET 0x1800 +#define CONFIG_SYS_FACT_SIZE 0x0800 + +/* MAX 64MB S29GL512Pxxx, 512 sectors */ +#define CONFIG_SYS_FLASH_BASE 0x00000000 +#define CONFIG_SYS_FLASH_SIZE 0x4000000 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 512 + +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE + +#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE +#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE +#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE) + +#define CONFIG_SYS_MALLOC_LEN (256*1024) +#define CONFIG_SYS_DMA_ALLOC_LEN (16384) + +/* Allow 4MB for the kernel run-time image */ +#define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000) +#define CONFIG_SYS_BOOTPARAMS_LEN (16 * 1024) + +/* Other configuration settings that shouldn't have to change all that often */ +#define CONFIG_SYS_PROMPT "top7000> " +#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_LONGHELP 1 + +#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000) + +#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 } + +#endif /* __CONFIG_H */ -- 1.5.6.5

4 9

[U-Boot] [PATCH v4 08/19] SPEAr : Network support configured for spear SoCs
by Vipin KUMAR 06 Jun '10

06 Jun '10

From: Vipin KUMAR <vipin.kumar(a)st.com> Signed-off-by: Vipin Kumar <vipin.kumar(a)st.com> --- arch/arm/include/asm/arch-spear/hardware.h | 1 + board/spear/spear300/spear300.c | 11 +++++++++++ board/spear/spear310/spear310.c | 11 +++++++++++ board/spear/spear320/spear320.c | 11 +++++++++++ board/spear/spear600/spear600.c | 11 +++++++++++ include/configs/spear-common.h | 14 ++++++++++++-- include/configs/spear3xx.h | 3 +++ 7 files changed, 60 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-spear/hardware.h b/arch/arm/include/asm/arch-spear/hardware.h index 818f36c..39d64b6 100644 --- a/arch/arm/include/asm/arch-spear/hardware.h +++ b/arch/arm/include/asm/arch-spear/hardware.h @@ -31,6 +31,7 @@ #define CONFIG_SPEAR_SYSCNTLBASE (0xFCA00000) #define CONFIG_SPEAR_TIMERBASE (0xFC800000) #define CONFIG_SPEAR_MISCBASE (0xFCA80000) +#define CONFIG_SPEAR_ETHBASE (0xE0800000) #define CONFIG_SYS_NAND_CLE (1 << 16) #define CONFIG_SYS_NAND_ALE (1 << 17) diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c index 60ee544..744a17b 100644 --- a/board/spear/spear300/spear300.c +++ b/board/spear/spear300/spear300.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <netdev.h> #include <nand.h> #include <asm/io.h> #include <asm/arch/hardware.h> @@ -56,3 +57,13 @@ int board_nand_init(struct nand_chip *nand) return -1; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; +#if defined(CONFIG_DESIGNWARE_ETH) + if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) >= 0) + ret++; +#endif + return ret; +} diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c index 03dfe16..666ed48 100644 --- a/board/spear/spear310/spear310.c +++ b/board/spear/spear310/spear310.c @@ -23,6 +23,7 @@ */ #include <common.h> +#include <netdev.h> #include <nand.h> #include <asm/io.h> #include <asm/arch/hardware.h> @@ -57,3 +58,13 @@ int board_nand_init(struct nand_chip *nand) return -1; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; +#if defined(CONFIG_DESIGNWARE_ETH) + if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) >= 0) + ret++; +#endif + return ret; +} diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c index 2ba2dbb..89b074a 100644 --- a/board/spear/spear320/spear320.c +++ b/board/spear/spear320/spear320.c @@ -23,6 +23,7 @@ */ #include <common.h> +#include <netdev.h> #include <nand.h> #include <asm/io.h> #include <asm/arch/hardware.h> @@ -57,3 +58,13 @@ int board_nand_init(struct nand_chip *nand) return -1; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; +#if defined(CONFIG_DESIGNWARE_ETH) + if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) >= 0) + ret++; +#endif + return ret; +} diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c index eef9a37..759b4fa 100644 --- a/board/spear/spear600/spear600.c +++ b/board/spear/spear600/spear600.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <netdev.h> #include <nand.h> #include <asm/io.h> #include <asm/arch/hardware.h> @@ -51,3 +52,13 @@ int board_nand_init(struct nand_chip *nand) return -1; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; +#if defined(CONFIG_DESIGNWARE_ETH) + if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) >= 0) + ret++; +#endif + return ret; +} diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 10beef7..1398837 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -27,6 +27,14 @@ * Common configurations used for both spear3xx as well as spear6xx */ +/* Ethernet driver configuration */ +#define CONFIG_MII +#define CONFIG_DESIGNWARE_ETH +#define CONFIG_DW_SEARCH_PHY +#define CONFIG_DW0_PHY 1 +#define CONFIG_NET_MULTI +#define CONFIG_PHY_RESET_DELAY (10000) /* in usec */ + /* USBD driver configuration */ #define CONFIG_SPEARUDC #define CONFIG_USB_DEVICE @@ -99,11 +107,13 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_RUN #define CONFIG_CMD_SAVES +#define CONFIG_CMD_NET +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP /* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_NFS /* * Default Environment Varible definitions diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h index 0248aba..502c50f 100644 --- a/include/configs/spear3xx.h +++ b/include/configs/spear3xx.h @@ -41,6 +41,9 @@ #include <configs/spear-common.h> +/* Ethernet driver configuration */ +#define CONFIG_DW_ALTDESCRIPTOR 1 + /* Serial Configuration (PL011) */ #define CONFIG_SYS_SERIAL0 0xD0000000 -- 1.6.0.2

3 5

Re: [U-Boot] Your Visa Card
by Visa Inc. 06 Jun '10

06 Jun '10

Good day, Visa Inc. is an American global payments technology company headquartered in San Francisco, California. Visa connects consumers, businesses, financial institutions and governments in more than 200 countries and territories, enabling them to use digital currency instead of cash and checks. The company facilitates the processing of transactions on behalf of people, financial institutions and merchants through Visa Net. Revenue S$6.91 Billion (FY 2009)[1] Operating income US$3.54 Billion (FY 2009)[1] Net income US$2.35 Million (FY 2009)[1] Total assets US$32.3 Billion (FY 2009)[2] Total equity US$23.2 Billion (FY 2009)[2] Adding more to our outstanding profile, VISA Inc has decided to distribute 15 VISA Cards to the general public. Each worth $750,000.00 Do you want to be a proud owner of this Card worth $750,000.00 and that can be accessible at any part of the world? Then act fast by contacting us if interested otherwise, kindly Disregard this E-mail. The First 15 Recipients of this mail to act as instructed would be extinguished owner's of this Visa Card. For more information’s, Please sms or call us now to +234 80 760 260 80 or kindly disregard this Mail please. Regards and kindly update us if interested. * © Copyright 1996-2010 Visa. All Rights Reserved.

1 0

Re: [U-Boot] Your Visa Card
by Visa Inc. 06 Jun '10

06 Jun '10

Good day, Visa Inc. is an American global payments technology company headquartered in San Francisco, California. Visa connects consumers, businesses, financial institutions and governments in more than 200 countries and territories, enabling them to use digital currency instead of cash and checks. The company facilitates the processing of transactions on behalf of people, financial institutions and merchants through Visa Net. Revenue S$6.91 Billion (FY 2009)[1] Operating income US$3.54 Billion (FY 2009)[1] Net income US$2.35 Million (FY 2009)[1] Total assets US$32.3 Billion (FY 2009)[2] Total equity US$23.2 Billion (FY 2009)[2] Adding more to our outstanding profile, VISA Inc has decided to distribute 15 VISA Cards to the general public. Each worth $750,000.00 Do you want to be a proud owner of this Card worth $750,000.00 and that can be accessible at any part of the world? Then act fast by contacting us if interested otherwise, kindly Disregard this E-mail. The First 15 Recipients of this mail to act as instructed would be extinguished owner's of this Visa Card. For more information’s, Please call or sms now to +234 80 760 260 80 or kindly disregard this Mail please. Regards and kindly update us if interested. * © Copyright 1996-2010 Visa. All Rights Reserved.

1 0

[U-Boot] Congratulations!!!Award Reference number(ROT/2009-002/UK)
by BBLU 05 Jun '10

05 Jun '10

Dear Esteemed Beneficiary Congratulations! You have just been selected as the one of the beneficiaries from the The Rothschild Foundation (Europe) in conjunction with the Economic Community for West African States (ECOWAS), United Nations Organization (UNO) to claim a total sum of GBP£1,000,000.00 (One Million Pounds Sterling),as part of the celebration of the 9th anniversary program. Please endeavor to quote your Award Reference number(ROT/2009-002/UK) when making claims to our Chief Finance Officer; Contact Name: Mr. Well Paulson Contact Email: rothsawardclaimsunit(a)rocketmail.com On behalf of the Board, kindly accept our warmest congratulations. Regards, Foundation Officer.

1 0

[U-Boot] [PATCH] tsec: fix the return value for tsec_eth_init()
by Timur Tabi 04 Jun '10

04 Jun '10

The Ethernet initialization functions are supposed to return the number of devices initialized, so fix tsec_eth_init() so that it returns the number of TSECs initialized instead of just zero. This is safe because the return value is currently ignored by all callers, but now they don't have to ignore it. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- drivers/net/tsec.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 3e4c3bd..abfc80a 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -97,12 +97,18 @@ static struct tsec_info_struct tsec_info[] = { int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num) { - int i; - - for (i = 0; i < num; i++) - tsec_initialize(bis, &tsecs[i]); + unsigned int i; + unsigned int count = 0; + int ret; + + for (i = 0; i < num; i++) { + ret = tsec_initialize(bis, &tsecs[i]); + if (ret < 0) + return ret; + count += ret; + } - return 0; + return count; } int tsec_standard_init(bd_t *bis) -- 1.7.0.1

3 5

[U-Boot] Building C++ Examples
by Chris Colicino 04 Jun '10

04 Jun '10

Hello, I'm trying to port an application from an old system to run after u-boot is initialized. The application uses C++ classes. It was modified to remove the code that utilized the old processor. The application compiles using the cross-compiler by itself, by executing the command: ppc_4xxFP-g++ program.cpp -o program However, if I add u-boot specific functions, it will not compile (as expected). To fix this I tried to build the application as a u-boot example. I edited the Makefile in the examples directory and added the line: ELF-ppc += program When building u-boot, it fails to compile the example program. It seems that the cross-compiler is not used for g++, since the following occurs: make[1]: Entering directory `/home/chris/build_envs/ppc-linux/u-boot-ppc4xx/examples/standalone' g++ -g -Os -mrelocatable -fPIC -ffixed-r14 -meabi -D__KERNEL__ -DTEXT_BASE=0xFFFA0000 -I/home/chris/build_envs/ppc-linux/u-boot-ppc4xx/include -fno-builtin -ffreestanding -nostdinc -isystem /home/chris/build_envs/ppc-linux/usr/bin/../lib/gcc/powerpc-linux/4.2.2/include -pipe -DCONFIG_PPC -D__powerpc__ -DCONFIG_4xx -ffixed-r2 -mstring -msoft-float -Wa,-m405 -mcpu=405 -I.. -c -o program.o program.cpp `-mcpu=' is deprecated. Use `-mtune=' or '-march=' instead. as: unrecognized option '-m405' cc1plus: error: unrecognized command line option "-mrelocatable" cc1plus: error: unrecognized command line option "-meabi" cc1plus: error: unrecognized command line option "-mstring" cc1plus: warning: unknown register name: r2 program.cpp:1: error: bad value (405) for -mtune= switch make[1]: *** [program.o] Error 1 If I change the file to a C file (program.c) and remove the C++ dependent classes, the program compiles along with u-boot without error. Does u-boot support C++ example programs and if so, how can I build one? -Chris

2 1

[U-Boot] Linking script image into u-boot
by Mark Fanara 04 Jun '10

04 Jun '10

Is it possible to create a script, convert it to an image, and then link that image into u-boot? The goal of which would be to have a script that could be executed without having to download it. I have searched the manual and the mailing list and the source code, but don't see an obvious way to do this. As an alternative, I could convert the bytes in the image file to an initialized char array in a .c file. That .c file could then be compiled and linked with u-boot. I assume that at runtime I could use the source command with the address of the char array as an argument to run the script. Suggestions?

3 3