June 2009 - U-Boot

[U-Boot] [PATCH 1/6] net: merge bugfix: Marvell Kirkwood gigabit ethernet driver
by Prafulla Wadaskar 01 Jul '09

01 Jul '09

This patch looks okay on u-boot-net.git/next branch but when it was merged to u-boot.git/master the last line is missing Signed-off-by: Prafulla Wadaskar <prafulla(a)marvell.com> --- drivers/net/kirkwood_egiga.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c index b43bbf2..3c5db19 100644 --- a/drivers/net/kirkwood_egiga.c +++ b/drivers/net/kirkwood_egiga.c @@ -662,3 +662,4 @@ int kirkwood_egiga_initialize(bd_t * bis) #endif } return 0; +} -- 1.5.3.3

3 3

[U-Boot] [RFC/PATCH 0/3] Add optional dma transfers to mtest
by Peter Tyser 01 Jul '09

01 Jul '09

This series tries to add a DMA memory test to the mtest tests. The DMA test performs bursts to SDRAM which can be useful in stressing memory and can be difficult to produce reliably in certain circumstances (eg running with data caches disabled). It can be enabled on 85xx and 86xx boards by defining CONFIG_FSL_DMA, CONFIG_SYS_ALT_MEMTEST, and CONFIG_SYS_DMA_MEMTEST. Other platforms will need to support the dmacpy() function in order to enable the DMA memory test. Peter Tyser (3): fsl_dma: Make DMA transactions snoopable mtest: Add optional support for DMA memory test XPedite5200, XPedite5370: Enable DMA memory test common/cmd_mem.c | 65 +++++++++++++++++++++++++++++++++++++++++ drivers/dma/fsl_dma.c | 4 +- include/configs/XPEDITE5200.h | 4 ++- include/configs/XPEDITE5370.h | 2 + 4 files changed, 72 insertions(+), 3 deletions(-)

2 5

[U-Boot] [PATCH] at91: Add esd gmbh MEESC board support
by Daniel Gorsulowski 01 Jul '09

01 Jul '09

This patch adds support for esd gmbh MEESC board. The MEESC is based on an Atmel AT91SAM9263 SoC. Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski(a)esd.eu> --- Jean-Christophe: This patch requires an up-to-date mach-types.h, please sync it. MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/esd/meesc/Makefile | 55 +++++++++++ board/esd/meesc/config.mk | 1 + board/esd/meesc/meesc.c | 211 +++++++++++++++++++++++++++++++++++++++++++ board/esd/meesc/partition.c | 37 ++++++++ include/configs/meesc.h | 185 +++++++++++++++++++++++++++++++++++++ 8 files changed, 497 insertions(+), 0 deletions(-) create mode 100644 board/esd/meesc/Makefile create mode 100644 board/esd/meesc/config.mk create mode 100644 board/esd/meesc/meesc.c create mode 100644 board/esd/meesc/partition.c create mode 100644 include/configs/meesc.h diff --git a/MAINTAINERS b/MAINTAINERS index 9379c7e..449443a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -532,6 +532,10 @@ Peter Figuli <peposh(a)etc.sk> wepep250 xscale +Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> + + meesc ARM926EJS (AT91SAM9263 SoC) + Marius Gröger <mag(a)sysgo.de> impa7 ARM720T (EP7211) diff --git a/MAKEALL b/MAKEALL index f4599d6..eb7b0d7 100755 --- a/MAKEALL +++ b/MAKEALL @@ -587,6 +587,7 @@ LIST_at91=" \ cmc_pu2 \ csb637 \ kb9202 \ + meesc \ mp2usb \ m501sk \ pm9263 \ diff --git a/Makefile b/Makefile index 46871d0..a5db70d 100644 --- a/Makefile +++ b/Makefile @@ -2787,6 +2787,9 @@ at91sam9rlek_config : unconfig fi; @$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91 +meesc_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs meesc esd at91 + pm9263_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs pm9263 ronetix at91 diff --git a/board/esd/meesc/Makefile b/board/esd/meesc/Makefile new file mode 100644 index 0000000..2dd6b25 --- /dev/null +++ b/board/esd/meesc/Makefile @@ -0,0 +1,55 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <stelian.pop(a)leadtechdesign.com> +# Lead Tech Design <www.leadtechdesign.com> +# +# 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-y += $(BOARD).o +COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +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/esd/meesc/config.mk b/board/esd/meesc/config.mk new file mode 100644 index 0000000..9ce161e --- /dev/null +++ b/board/esd/meesc/config.mk @@ -0,0 +1 @@ +TEXT_BASE = 0x21f00000 diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c new file mode 100644 index 0000000..557a51c --- /dev/null +++ b/board/esd/meesc/meesc.c @@ -0,0 +1,211 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop(a)leadtechdesign.com> + * Lead Tech Design <www.leadtechdesign.com> + * + * (C) Copyright 2009 + * Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> + * esd electronic system design gmbh <www.esd.eu> + * + * 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/arch/at91sam9263.h> +#include <asm/arch/at91sam9263_matrix.h> +#include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/at91_rstc.h> +#include <asm/arch/clk.h> +#include <asm/arch/gpio.h> +#include <asm/arch/hardware.h> +#include <asm/arch/io.h> +#include <netdev.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* + * Miscelaneous platform dependent initialisations + */ + +int get_hw_rev(void) +{ + int rev = at91_get_gpio_value(AT91_PIN_PB19); + rev |= at91_get_gpio_value(AT91_PIN_PB20) << 1; + rev |= at91_get_gpio_value(AT91_PIN_PB21) << 2; + rev |= at91_get_gpio_value(AT91_PIN_PB22) << 3; + + if (rev == 15) + rev = 0; + + return rev; +} + +#ifdef CONFIG_CMD_NAND +static void meesc_nand_hw_init(void) +{ + unsigned long csa; + + /* Enable CS3 */ + csa = at91_sys_read(AT91_MATRIX_EBI0CSA); + at91_sys_write(AT91_MATRIX_EBI0CSA, + csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA); + + /* Configure SMC CS3 for NAND/SmartMedia */ + at91_sys_write(AT91_SMC_SETUP(3), + AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | + AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); + at91_sys_write(AT91_SMC_PULSE(3), + AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | + AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); + at91_sys_write(AT91_SMC_CYCLE(3), + AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); + at91_sys_write(AT91_SMC_MODE(3), + AT91_SMC_READMODE | AT91_SMC_WRITEMODE | + AT91_SMC_EXNWMODE_DISABLE | +#ifdef CONFIG_SYS_NAND_DBW_16 + AT91_SMC_DBW_16 | +#else /* CONFIG_SYS_NAND_DBW_8 */ + AT91_SMC_DBW_8 | +#endif + AT91_SMC_TDF_(2)); + + /* Configure RDY/BSY */ + at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); + + /* Enable NandFlash */ + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); +} +#endif /* CONFIG_CMD_NAND */ + +#ifdef CONFIG_MACB +static void meesc_macb_hw_init(void) +{ + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_EMAC); + at91_macb_hw_init(); +} +#endif + +/* + * Static memory controller initialization to enable Beckhoff ET1100 EtherCAT + * controller debugging + * The ET1100 is located at physical address 0x70000000 + * Its process memory is located at physical address 0x70001000 + */ +static void meesc_ethercat_hw_init(void) +{ + /* Configure SMC EBI1_CS0 for EtherCAT */ + at91_sys_write(AT91_SMC1_SETUP(0), + AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0) | + AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0)); + at91_sys_write(AT91_SMC1_PULSE(0), + AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(9) | + AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(9)); + at91_sys_write(AT91_SMC1_CYCLE(0), + AT91_SMC_NWECYCLE_(10) | AT91_SMC_NRDCYCLE_(5)); + /* Configure behavior at external wait signal, byte-select mode, 16 bit + data bus width, none data float wait states and TDF optimization */ + at91_sys_write(AT91_SMC1_MODE(0), + AT91_SMC_READMODE | AT91_SMC_EXNWMODE_READY | + AT91_SMC_BAT_SELECT | AT91_SMC_DBW_16 | AT91_SMC_TDF_(0) | + AT91_SMC_TDFMODE); + + /* Configure RDY/BSY */ + at91_set_B_periph(AT91_PIN_PE20, 0); /* EBI1_NWAIT */ +} + +int dram_init(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM; + gd->bd->bi_dram[0].size = get_ram_size((long *) PHYS_SDRAM, (1 << 27)); + return 0; +} + +int board_eth_init(bd_t *bis) +{ + int rc = 0; +#ifdef CONFIG_MACB + rc = macb_eth_initialize(0, (void *)AT91SAM9263_BASE_EMAC, 0x00); +#endif + return rc; +} + +int checkboard(void) +{ + char str[32]; + char buf[32]; + + puts("Board: esd CAN-EtherCAT Gateway"); + if (getenv_r("serial#", str, sizeof(str)) > 0) { + puts(", serial# "); + puts(str); + } + printf("\nHardware-revision: 1.%d\n", get_hw_rev()); + printf("Crystal frequency:\t%8s MHz\n", + strmhz(buf, get_main_clk_rate())); + printf("CPU clock:\t\t%8s MHz\n", + strmhz(buf, get_cpu_clk_rate())); +#ifdef CONFIG_SHOW_VERBOSE_CLOCKINFO + printf("Master clock:\t\t%8s MHz\n", + strmhz(buf, get_mck_clk_rate())); + printf("PLL A clock:\t\t%8s MHz\n", + strmhz(buf, get_plla_clk_rate())); + printf("PLL B Reg.:\t\t0x%08X\n", + at91_sys_read(AT91_CKGR_PLLBR)); + printf("PLL B clock:\t\t%8s MHz\n", + strmhz(buf, get_pllb_clk_rate())); +#endif + printf("Mach-type: %lu\n", gd->bd->bi_arch_number); + return 0; +} + +int board_init(void) +{ + /* Enable Ctrlc */ + console_init_f(); + + /* Peripheral Clock Enable Register */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_PIOA | + 1 << AT91SAM9263_ID_PIOB | + 1 << AT91SAM9263_ID_PIOCDE | + 1 << AT91SAM9263_ID_CAN); + + /* arch number of MEESC-Board */ + gd->bd->bi_arch_number = MACH_TYPE_MEESC; + + /* adress of boot parameters */ + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + + at91_serial_hw_init(); +#ifdef CONFIG_CMD_NAND + meesc_nand_hw_init(); +#endif + meesc_ethercat_hw_init(); +#ifdef CONFIG_HAS_DATAFLASH + at91_spi0_hw_init(1 << 0); +#endif +#ifdef CONFIG_MACB + meesc_macb_hw_init(); +#endif + at91_set_A_periph(AT91_PIN_PA13, 0); /* CAN_TX */ + at91_set_A_periph(AT91_PIN_PA14, 1); /* CAN_RX */ + return 0; +} diff --git a/board/esd/meesc/partition.c b/board/esd/meesc/partition.c new file mode 100644 index 0000000..df0e1db --- /dev/null +++ b/board/esd/meesc/partition.c @@ -0,0 +1,37 @@ +/* + * (C) Copyright 2008 + * Ulf Samuelsson <ulf(a)atmel.com> + * + * 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/hardware.h> +#include <dataflash.h> + +AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS]; + +struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { + {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ +}; + +/* define the area offsets */ +dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { + {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"}, + {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, + {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"}, +}; diff --git a/include/configs/meesc.h b/include/configs/meesc.h new file mode 100644 index 0000000..5ff90c7 --- /dev/null +++ b/include/configs/meesc.h @@ -0,0 +1,185 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop(a)leadtechdesign.com> + * Lead Tech Design <www.leadtechdesign.com> + * + * (C) Copyright 2009 + * Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> + * esd electronic system design gmbh <www.esd.eu> + * + * Configuation settings for the esd MEESC 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 + +/* Common stuff */ +#define AT91_CPU_NAME "AT91SAM9263" +#define CONFIG_SYS_HZ 1000 /* decrementer freq */ +#define CONFIG_MEESC 1 /* Board is esd MEESC */ +#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ +#define CONFIG_AT91SAM9263 1 /* It's an AT91SAM9263 SoC */ +#define CONFIG_ENV_OVERWRITE 1 /* necessary on prototypes */ +#define CONFIG_DISPLAY_BOARDINFO 1 +#define CONFIG_PREBOOT /* enable preboot variable */ +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 +#undef CONFIG_USE_IRQ /* don't need IRQ/FIQ stuff */ + +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_RELOCATE_UBOOT + +#define CONFIG_ARCH_CPU_INIT + +/* + * Hardware drivers + */ + +/* Console output */ +#define CONFIG_ATMEL_USART 1 +#undef CONFIG_USART0 +#undef CONFIG_USART1 +#undef CONFIG_USART2 +#define CONFIG_USART3 1 /* USART 3 is DBGU */ + +#define CONFIG_BOOTDELAY 3 +#define CONFIG_ZERO_BOOTDELAY_CHECK 1 + +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE 1 +#define CONFIG_BOOTP_BOOTPATH 1 +#define CONFIG_BOOTP_GATEWAY 1 +#define CONFIG_BOOTP_HOSTNAME 1 + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_USB + +#define CONFIG_CMD_PING 1 +#define CONFIG_CMD_DHCP 1 +#define CONFIG_CMD_NAND 1 + +/* LED */ +#define CONFIG_AT91_LED 1 + +/* SDRAM */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM 0x20000000 + +/* DataFlash */ +#define CONFIG_ATMEL_DATAFLASH_SPI +#define CONFIG_HAS_DATAFLASH 1 +#define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ) +#define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 +#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ +#define AT91_SPI_CLK 15000000 +#define DATAFLASH_TCSS (0x1a << 16) +#define DATAFLASH_TCHS (0x1 << 24) + +/* NOR flash is not populated, disable it */ +#define CONFIG_SYS_NO_FLASH 1 + +/* NAND flash */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_ATMEL +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 0x40000000 +#define CONFIG_SYS_NAND_DBW_8 1 +/* our ALE is AD21 */ +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) +/* our CLE is AD22 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22 +#endif + +/* Ethernet */ +#define CONFIG_MACB 1 +#define CONFIG_RMII 1 +#define CONFIG_NET_MULTI 1 +#define CONFIG_NET_RETRY_COUNT 20 +#undef CONFIG_RESET_PHY_R + +#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ + +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#define CONFIG_SYS_MEMTEST_END 0x21e00000 + +#define CONFIG_SYS_USE_DATAFLASH 1 +#undef CONFIG_SYS_USE_NANDFLASH + +#ifdef CONFIG_SYS_USE_DATAFLASH + +/* bootstrap + u-boot + env + linux in dataflash on CS0 */ +#define CONFIG_ENV_IS_IN_DATAFLASH 1 +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \ + 0x8400) +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \ + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE 0x4200 +#define CONFIG_BOOTCOMMAND "cp.b C0042000 22000000 210000; bootm" + +#else /* CONFIG_SYS_USE_NANDFLASH */ + +/* bootstrap + u-boot + env + linux in nandflash */ +#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_OFFSET 0x60000 +#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ +#define CONFIG_BOOTCOMMAND "nand read 22000000 A0000 200000; bootm" + +#endif + +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } + +#define CONFIG_SYS_PROMPT "=> " +#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_CMDLINE_EDITING 1 + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN 0x2D000 +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ + +#define CONFIG_STACKSIZE (32 * 1024) /* regular stack */ + +#ifdef CONFIG_USE_IRQ +#error CONFIG_USE_IRQ not supported +#endif + +#endif -- 1.5.3

2 9

[U-Boot] [PATCH] arm: Kirkwood: Correct header define
by Simon Kagstrom 30 Jun '09

30 Jun '09

Correct define typo (. -> ,) Signed-off-by: Simon Kagstrom <simon.kagstrom(a)netinsight.net> --- include/asm-arm/arch-kirkwood/mpp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/asm-arm/arch-kirkwood/mpp.h b/include/asm-arm/arch-kirkwood/mpp.h index e021a80..bc74278 100644 --- a/include/asm-arm/arch-kirkwood/mpp.h +++ b/include/asm-arm/arch-kirkwood/mpp.h @@ -289,7 +289,7 @@ #define MPP48_GPIO MPP( 48, 0x0, 1, 1, 0, 0, 0, 1 ) #define MPP48_TSMP12 MPP( 48, 0x1, 1, 1, 0, 0, 0, 1 ) -#define MPP48_TDM_DTX MPP( 48. 0x2, 0, 1, 0, 0, 0, 1 ) +#define MPP48_TDM_DTX MPP( 48, 0x2, 0, 1, 0, 0, 0, 1 ) #define MPP49_GPIO MPP( 49, 0x0, 1, 1, 0, 0, 0, 1 ) #define MPP49_TSMP9 MPP( 49, 0x1, 1, 1, 0, 0, 0, 1 ) -- 1.6.0.4

3 2

[U-Boot] [PATCH] xscale: add support for the polaris board
by Stefano Babic 30 Jun '09

30 Jun '09

The Polaris board is based on the TrizepsIV module of Keith & Koep (http://www.keith-koep.com). Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- MAINTAINERS | 4 ++++ MAKEALL | 1 + Makefile | 7 ++++++- board/trizepsiv/conxs.c | 22 ++++++++++++---------- include/configs/trizepsiv.h | 25 ++++++++++++++++++++++--- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9379c7e..97476e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -500,6 +500,10 @@ Rowel Atienza <rowel(a)diwalabs.com> armadillo ARM720T +Stefano Babic <sbabic(a)denx.de> + + trizepsiv xscale + Dirk Behme <dirk.behme(a)gmail.com> omap3_beagle ARM CORTEX-A8 (OMAP3530 SoC) diff --git a/MAKEALL b/MAKEALL index f4599d6..73c5b61 100755 --- a/MAKEALL +++ b/MAKEALL @@ -610,6 +610,7 @@ LIST_pxa=" \ xm250 \ xsengine \ zylonite \ + trizepsiv \ " LIST_ixp=" \ diff --git a/Makefile b/Makefile index acec1a0..3a77988 100644 --- a/Makefile +++ b/Makefile @@ -3082,8 +3082,13 @@ scpu_config: unconfig pxa255_idp_config: unconfig @$(MKCONFIG) $(@:_config=) arm pxa pxa255_idp +polaris_config \ trizepsiv_config : unconfig - @$(MKCONFIG) $(@:_config=) arm pxa trizepsiv + @mkdir -p $(obj)include + @if [ "$(findstring polaris,$@)" ] ; then \ + echo "#define CONFIG_POLARIS 1" >>$(obj)include/config.h ; \ + fi; + @$(MKCONFIG) -a trizepsiv arm pxa trizepsiv wepep250_config : unconfig @$(MKCONFIG) $(@:_config=) arm pxa wepep250 diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c index 5c0eb41..4249e3d 100644 --- a/board/trizepsiv/conxs.c +++ b/board/trizepsiv/conxs.c @@ -44,6 +44,11 @@ extern struct serial_device serial_ffuart_device; extern struct serial_device serial_btuart_device; extern struct serial_device serial_stuart_device; +#if CONFIG_POLARIS +#define BOOT_CONSOLE "serial_stuart" +#else +#define BOOT_CONSOLE "serial_ffuart" +#endif /* ------------------------------------------------------------------------- */ /* @@ -112,17 +117,14 @@ int board_late_init(void) #if defined(CONFIG_SERIAL_MULTI) char *console=getenv("boot_console"); - if ((strcmp(console,"serial_btuart") == 0) || - (strcmp(console,"serial_stuart") == 0) || - (strcmp(console,"serial_ffuart") == 0)) { - setenv("stdout",console); - setenv("stdin", console); - setenv("stderr",console); - } else { - setenv("stdout", "serial"); - setenv("stdin", "serial"); - setenv("stderr", "serial"); + if ((console == NULL) || (strcmp(console,"serial_btuart") && + strcmp(console,"serial_stuart") && + strcmp(console,"serial_ffuart"))) { + console = BOOT_CONSOLE; } + setenv("stdout",console); + setenv("stdin", console); + setenv("stderr",console); #endif return 0; } diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index bfa7157..fa5aae8 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -239,11 +239,17 @@ #define CONFIG_SYS_GRER1_VAL 0x00000000 #define CONFIG_SYS_GRER2_VAL 0x00000000 #define CONFIG_SYS_GRER3_VAL 0x00000000 -#define CONFIG_SYS_GFER0_VAL 0x00000000 + #define CONFIG_SYS_GFER1_VAL 0x00000000 -#define CONFIG_SYS_GFER2_VAL 0x00000000 #define CONFIG_SYS_GFER3_VAL 0x00000020 +#if CONFIG_POLARIS +#define CONFIG_SYS_GFER0_VAL 0x00000001 +#define CONFIG_SYS_GFER2_VAL 0x00200000 +#else +#define CONFIG_SYS_GFER0_VAL 0x00000000 +#define CONFIG_SYS_GFER2_VAL 0x00000000 +#endif #define CONFIG_SYS_PSSR_VAL 0x20 /* CHECK */ @@ -259,7 +265,11 @@ #define CONFIG_SYS_MSC0_VAL 0x4df84df0 #define CONFIG_SYS_MSC1_VAL 0x7ff87ff4 +#if CONFIG_POLARIS +#define CONFIG_SYS_MSC2_VAL 0xa2697ff8 +#else #define CONFIG_SYS_MSC2_VAL 0xa26936d4 +#endif #define CONFIG_SYS_MDCNFG_VAL 0x880009C9 #define CONFIG_SYS_MDREFR_VAL 0x20ca201e #define CONFIG_SYS_MDMRS_VAL 0x00220022 @@ -280,7 +290,13 @@ #define CONFIG_NET_MULTI 1 #define CONFIG_DRIVER_DM9000 1 -#define CONFIG_DM9000_BASE 0x08000000 + +#if CONFIG_POLARIS +#define CONFIG_DM9000_BASE 0x0C800000 +#else +#define CONFIG_DM9000_BASE 0x08000000 +#endif + #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE+0x8004) @@ -312,6 +328,9 @@ /* write flash less slowly */ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 +/* Unlock to be used with Intel chips */ +#define CONFIG_SYS_FLASH_PROTECTION 1 + /* Flash environment locations */ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (PHYS_FLASH_1 + CONFIG_SYS_MONITOR_LEN) /* Addr of Environment Sector */ -- 1.6.0.4

2 1

[U-Boot] [PATCH] xscale: fix USB initialization for Trizepsiv module
by Stefano Babic 30 Jun '09

30 Jun '09

Due to change in the usb_board_init() prototype, the USB for the TrizepsIV was not correctly initialized. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- board/trizepsiv/conxs.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c index 4249e3d..8c11456 100644 --- a/board/trizepsiv/conxs.c +++ b/board/trizepsiv/conxs.c @@ -55,7 +55,7 @@ extern struct serial_device serial_stuart_device; * Miscelaneous platform dependent initialisations */ -void usb_board_init(void) +int usb_board_init(void) { UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) & ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE); @@ -76,6 +76,8 @@ void usb_board_init(void) /* Set port power control mask bits, only 3 ports. */ UHCRHDB |= (0x7<<17); + + return 0; } void usb_board_init_fail(void) @@ -94,7 +96,6 @@ void usb_board_stop(void) CKEN &= ~CKEN10_USBHOST; - puts("Called USB STOP\n"); return; } -- 1.6.0.4

2 1

[U-Boot] Trouble "booting using board info"
by Mikhail Zaturenskiy 30 Jun '09

30 Jun '09

Hello, I'm trying to load Linux from U-Boot. I'm pretty new at this so there may be some obvious things wrong with what I'm doing. I am using ELDK 4.2 and U-Boot 2009.03 on an EP88xC rev1.1 board (MPC885 cpu) and the linux kernel sources obtained from instructions at "http://www.denx.de/wiki/view/DULG/LinuxConfiguration#Section_6.1.". Below is my output as it currently stands (with lots of debug output): U-Boot 2009.03-svn8591 (Jun 24 2009 - 10:24:20) CPU: MPC885ZPnn at 100 MHz [40.0...133.0 MHz] 8 kB I-Cache 8 kB D-Cache FEC present clock 100000000Hz != 300000Hz Board: EP88xC 1.1 CPLD revision 2 DRAM: 64 MB Top of RAM usable for U-Boot at: 04000000 Reserving 187k for U-Boot at: 03fd1000 Reserving 384k for malloc() at: 03f71000 Reserving 60 Bytes for Board Info at: 03f70fc4 Reserving 56 Bytes for Global Data at: 03f70f8c Stack Pointer at: 03f70f68 New Stack Pointer is: 03f70f68 Now running in RAM - U-Boot at: 03fd1000 FLASH: flash detect cfi fwc addr fc000000 cmd f0 f0 8bit x 8 bit fwc addr fc000000 cmd ff ff 8bit x 8 bit fwc addr fc000055 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr fc000010 is= 30 51 fwc addr fc000555 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr fc000010 is= 30 51 fwc addr fc000000 cmd f0 f0f0 16bit x 8 bit fwc addr fc000000 cmd ff ffff 16bit x 8 bit fwc addr fc0000aa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr fc000020 is= 3234 5151 fwc addr fc000aaa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr fc000020 is= 3234 5151 fwc addr fc000000 cmd f0 00f0 16bit x 16 bit fwc addr fc000000 cmd ff 00ff 16bit x 16 bit fwc addr fc0000aa cmd 98 0098 16bit x 16 bit is= cmd 51(Q) addr fc000020 is= 3234 0051 fwc addr fc000aaa cmd 98 0098 16bit x 16 bit is= cmd 51(Q) addr fc000020 is= 3234 0051 fwc addr fc000000 cmd f0 f0f0f0f0 32bit x 8 bit fwc addr fc000000 cmd ff ffffffff 32bit x 8 bit fwc addr fc000154 cmd 98 98989898 32bit x 8 bit is= cmd 51(Q) addr fc000040 is= 00510051 51515151 fwc addr fc001554 cmd 98 98989898 32bit x 8 bit is= cmd 51(Q) addr fc000040 is= 00510051 51515151 fwc addr fc000000 cmd f0 00f000f0 32bit x 16 bit fwc addr fc000000 cmd ff 00ff00ff 32bit x 16 bit fwc addr fc000154 cmd 98 00980098 32bit x 16 bit is= cmd 51(Q) addr fc000040 is= 00510051 00510051 is= cmd 52(R) addr fc000044 is= 00520052 00520052 is= cmd 59(Y) addr fc000048 is= 00590059 00590059 device interface is 2 found port 4 chip 2 port 32 bits chip 16 bits 00 : 51 52 59 02 00 40 00 00 00 00 00 27 36 00 00 07 QRY..@.....'6... 10 : 07 0a 00 03 05 04 00 18 02 00 05 00 01 7f 00 00 ................ 20 : 02 00 00 00 00 00 00 00 00 00 00 00 00 12 cc 27 ...............' fwc addr fc000000 cmd f0 00f000f0 32bit x 16 bit fwc addr fc001554 cmd aa 00aa00aa 32bit x 16 bit fwc addr fc000aa8 cmd 55 00550055 32bit x 16 bit fwc addr fc001554 cmd 90 00900090 32bit x 16 bit fwc addr fc000000 cmd f0 00f000f0 32bit x 16 bit fwc addr fc000154 cmd 98 00980098 32bit x 16 bit manufacturer is 2 manufacturer id is 0x1 device id is 0x227e device id2 is 0x0 cfi version is 0x3133 size_ratio 2 port 32 bits chip 16 bits found 1 erase regions erase region 0: 0x0200007f erase_region_count = 128 erase_region_size = 131072 fwc addr fc000000 cmd f0 00f000f0 32bit x 16 bit flash_protect ON: from 0xFC000000 to 0xFC028FFF protect on 0 flash_protect ON: from 0xFC040000 to 0xFC07FFFF protect on 1 32 MB env_relocate[233] offset = 0x7fd1000 env_relocate[254] malloced ENV at 03f71008 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial U-Boot relocated to 03fd1000 Net: FEC ETHERNET, FEC2 ETHERNET ### main_loop entered: bootdelay=2 ### main_loop: bootcmd="bootm fc080000" Hit any key to stop autoboot: 0 ## Current stack ends at 0x03f70d50 * kernel: cmdline image address = 0xfc080000 Wrong Image Format for bootm command ERROR: can't get kernel image! => setenv ipaddr 10.0.54.150 => setenv serverip 10.0.54.129 => setenv ethaddr 00-e0-86-0c-84-fd eth_set_enetaddr(num=0, addr=00-e0-86-0c-84-fd) Setting new HW address on FEC ETHERNET New Address is 00:E0:86:0C:84:FD eth_set_enetaddr(num=0, addr=00-e0-86-0c-84-fd) Setting new HW address on FEC ETHERNET New Address is 00:E0:86:0C:84:FD => tftp 400000 ep88x_uimage Trying FEC ETHERNET Using FEC ETHERNET device TFTP from server 10.0.54.129; our IP address is 10.0.54.150 Filename 'ep88x_uimage'. Load address: 0x400000 Loading: ################################################################# ######## done Bytes transferred = 1057401 (102279 hex) => bootm 400000 ## Current stack ends at 0x03f70d60 * kernel: cmdline image address = 0x00400000 ## Booting kernel from Legacy Image at 00400000 ... Image Name: Linux-2.6.30-rc2-01402-gd4e2f68 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 1057337 Bytes = 1 MB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK kernel data at 0x00400040, len = 0x00102239 (1057337) ## No init Ramdisk ramdisk start = 0x00000000, ramdisk end = 0x00000000 Uncompressing Kernel Image ... OK kernel loaded at 0x00000000, end = 0x0022421c ## cmdline at 0x007fff00 ... 0x007fff36 ## kernel board info at 0x007ffec0 bd address = 0x03F70FC4 memstart = 0x00000000 memsize = 0x00000000 flashstart = 0xFC000000 flashsize = 0x02000000 flashoffset = 0x00029000 sramstart = 0x00000000 sramsize = 0x00000000 immr_base = 0xF0000000 bootflags = 0x00000001 intfreq = 100 MHz busfreq = 50 MHz ethaddr = 00:E0:86:0C:84:FD IP addr = 10.0.54.150 baudrate = 9600 bps ## initrd_high = 0xffffffff, copy_to_ram = 1 ramdisk load start = 0x00000000, ramdisk load end = 0x00000000 ## Transferring control to Linux (at address 00000000) ... Booting using board info... Nothing happens after this. I know I still have to make a ramdisk image to use as the root filesystem. My questions for now are: 1. Should I be getting any more console output given what I have so far? Or is something wrong? 2. I am concerned that "memsize = 0x00000000", is this normal? 3. I tried creating and using a FDT using instructions on "http://www.denx.de/wiki/view/DULG/LinuxFDTBlob", loading it at 0x00650000 and using "bootm 400000 - 650000", but the resulting output was pretty much identical. Is that normal? 4. Anything else in that output looks funky? I looked at "http://ozlabs.org/pipermail/linuxppc-embedded/2005-August/019548.html" and "http://ozlabs.org/pipermail/linuxppc-embedded/2007-August/027742.html" but they don't follow up on the solutions so I don't know if those issues have been resolved. Any suggestions are appreciated. Thanks! Mikhail Zaturenskiy

4 12

[U-Boot] [PATCH] MTD: change env_address type from unsigned long to loff_t
by HeungJun Kim 30 Jun '09

30 Jun '09

If use the onenand boot, the env_relocate_spec() calls mtd->read(), and the type of the argument #2 of mtd->read() was changed to loff_t. But, the "env_addr" type is still unsigned long, thus this patch change the type from unsigned long to loff_t. Acked-by: Kyungmin Park <kyungmin.park(a)samsung.com> Signed-off-by: HeungJun, Kim <riverful.kim(a)samsung.com> --- common/env_onenand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/env_onenand.c b/common/env_onenand.c index ed77051..48089a9 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -58,7 +58,7 @@ uchar env_get_char_spec(int index) void env_relocate_spec(void) { - unsigned long env_addr; + loff_t env_addr; int use_default = 0; size_t retlen; -- 1.5.6.3

2 1

[U-Boot] WINNING NOTIFICATION
by Mrs.Jeneth Steel 30 Jun '09

30 Jun '09

BATCH No: 573881545-NL/2009 TICKET No:PP 3502 /8707-01 Dear Winner, Your e-mail address has subsequently won you the sum of £1,200,000.00 (GBP). Contact: Mr. Well Paulson for full details and claims procedures. ( ukcertifield.desk(a)yahoo.com.hk ) Tel: +44-7035-924-138 For: The U.K National Lottery. UK-Lotto Coordinator; Mrs. Elizabeth Grethe

1 0

[U-Boot] uboot iMX25 or iMX27
by Johann Steinbrecher 30 Jun '09

30 Jun '09

Hello, does anybody have experience in setting up the uboot for a iMX25 or iMX27 processor. Is there already a uboot configuration for those processors? Greetings Johann

2 1