October 2009 - U-Boot

[U-Boot] about ## Unknown FLASH on Bank 0
by Peter Pan 26 Oct '09

26 Oct '09

My U-boot 1.2.0 works fine before. but I want to add some memory test actions before u-boot start Linux. I use the "mtest" command to test the memory. But the "mtest" command will test the memory infinitely. So, I change the /common/cmd_mem.c, and do the following change: #if defined(CFG_ALT_MEMTEST) printf(.....); PRINTF(...); for(;iterations == 1;) /* for(;;) { */ .... Which I think will make the memory test only once. But after I cross-compile the u-boot, the "Unknown FLASH" happens: FLASH: ## Unknown FLASH on Bank 0 ## Unknown FLASH on Bank 0 - Siz= 0x00000000 = 0 MB *** failed *** ### ERROR ### Please RESET the board ### But after I add these in my board flash.c file, the u-boot works well again: for(i = 0; i < 100; i++) printf(""); the above lines is added in flash_get_size function, after I get the 4 codes of the flash, and before I start to compare the codes with S29GL_ID0. Anybody get any idea?

2 1

[U-Boot] [PATCH] MCF5271-only: Added a weak board_reset function to allow custom reset.
by Richard Retanubun 26 Oct '09

26 Oct '09

From 304334adbbc3b7e70366fed0495af46536a7941f Mon Sep 17 00:00:00 2001 From: Richard Retanubun <RichardRetanubun(a)RuggedCom.com> Date: Mon, 26 Oct 2009 14:19:17 -0400 Subject: [PATCH] MCF5271-only: Added a weak board_reset function to allow custom reset. This patch adds a board_reset function to allow boards to specify their own custom reset sequence (e.g. resetting by timing out watchdog). Tested only on MCF5271, can be expanded if needed. Signed-off-by: Richard Retanubun <RichardRetanubun(a)RuggedCom.com> --- Based on Mike Frysinger's suggestion on: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/70304 cpu/mcf52x2/cpu.c | 6 ++++++ cpu/mcf52x2/cpu.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) create mode 100644 cpu/mcf52x2/cpu.h diff --git a/cpu/mcf52x2/cpu.c b/cpu/mcf52x2/cpu.c index 2cfe631..c4c5d50 100644 --- a/cpu/mcf52x2/cpu.c +++ b/cpu/mcf52x2/cpu.c @@ -33,6 +33,7 @@ #include <command.h> #include <asm/immap.h> #include <netdev.h> +#include "cpu.h" DECLARE_GLOBAL_DATA_PTR; @@ -143,6 +144,11 @@ int checkcpu(void) int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[]) { + /* Call the board specific reset actions first. */ + if(board_reset) { + board_reset(); + } + mbar_writeByte(MCF_RCM_RCR, MCF_RCM_RCR_SOFTRST | MCF_RCM_RCR_FRCRSTOUT); return 0; diff --git a/cpu/mcf52x2/cpu.h b/cpu/mcf52x2/cpu.h new file mode 100644 index 0000000..c1227eb --- /dev/null +++ b/cpu/mcf52x2/cpu.h @@ -0,0 +1,33 @@ +/* + * cpu.h + * + * Copyright (c) 2009 Freescale Semiconductor, Inc. + * + * 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., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _CPU_H_ +#define _CPU_H_ + +#include <command.h> + +/* Use this to create board specific reset functions */ +void board_reset(void) __attribute__((__weak__)); + +#endif /* _CPU_H_ */ -- 1.6.2.4

1 0

[U-Boot] [PATCH V3 0/4] add TI DA8xx support:
by Nick Thompson 26 Oct '09

26 Oct '09

Add initial support for DA8xx SoC's and the spectrum digital DA830 EVM board. See: http://www.ti.com http://www.spectrumdigital.com/ DA8xx is similar to DaVinci devices, but has a differing memory map and updated peripherals. It is intended that DaVinci drivers will be modified in some way to support these differences. A side effect of this is that there are some legacy code constructs in this patch set that are required to utilize the DaVinci drivers as they stand now. For example there are some volatiles and memory pointer types defined that are no longer considered acceptable. The new code in this patch set doesn't use these constructs and the remaining artefacts can be removed when the DaVinci drivers stop using them. --- Changes from previous patch set: Moved cpu and include/asm/arch code into davinci directories. Merged hardware.h to davinci. Added a new pin mux configuration scheme in davinci/common. Removed timer.c changes to a separate patch (submitted). this patch does not depend on timer.c patch. Applies to u-boot-ti: MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/davinci/common/misc.c | 46 ++++++- board/davinci/common/misc.h | 13 ++ board/davinci/da830evm/Makefile | 51 +++++++ board/davinci/da830evm/config.mk | 45 ++++++ board/davinci/da830evm/da830evm.c | 126 ++++++++++++++++ cpu/arm926ejs/davinci/cpu.c | 40 +++++- cpu/arm926ejs/davinci/psc.c | 43 ++++-- include/asm-arm/arch-davinci/hardware.h | 191 ++++++++++++++++++++++++- include/asm-arm/arch-davinci/i2c_defs.h | 7 + include/common.h | 3 + include/configs/da830evm.h | 244 +++++++++++++++++++++++++++++++ 14 files changed, 803 insertions(+), 14 deletions(-)

2 1

[U-Boot] [PATCH V3 2/4] add TI DA8xx support: Add DA8xx cpu functions
by Nick Thompson 26 Oct '09

26 Oct '09

Provides initial support for TI OMAP-L1x/DA8xx SoC devices. See http://www.ti.com Provides: Low level initialisation. System clock API. Timer control. Signed-off-by: Nick Thompson <nick.thompson(a)gefanuc.com> --- Applies to u-boot-ti diff --git a/cpu/arm926ejs/davinci/cpu.c b/cpu/arm926ejs/davinci/cpu.c index 390cab8..4095d56 100644 --- a/cpu/arm926ejs/davinci/cpu.c +++ b/cpu/arm926ejs/davinci/cpu.c @@ -23,7 +23,7 @@ #include <common.h> #include <netdev.h> #include <asm/arch/hardware.h> - +#include <asm/io.h> /* offsets from PLL controller base */ #define PLLC_PLLCTL 0x100 @@ -60,6 +60,44 @@ #define DDR_PLLDIV PLLC_PLLDIV1 #endif +#ifdef CONFIG_SOC_DA8XX +const unsigned int const sysdiv[9] = { + PLL0_DIV1, PLL0_DIV2, PLL0_DIV3, PLL0_DIV4, + PLL0_DIV5, PLL0_DIV6, PLL0_DIV7, PLL0_DIV8, + PLL0_DIV9 +}; + +int clk_get(unsigned int id) +{ + int pre_div = (readl(PLL0_PREDIV) & 0xff) + 1; + int pllm = readl(PLL0_PLLM) + 1; + int post_div = (readl(PLL0_POSTDIV) & 0xff) + 1; + int pll_out = CONFIG_SYS_OSCIN_FREQ; + + if (id == DAVINCI_AUXCLK_CLKID) + goto out; + + /* + * Lets keep this simple. Combining operations can result in + * unexpected approximations + */ + pll_out /= pre_div; + pll_out *= pllm; + + if (id == DAVINCI_PLLM_CLKID) + goto out; + + pll_out /= post_div; + + if (id == DAVINCI_PLLC_CLKID) + goto out; + + pll_out /= (readl(sysdiv[id - 1]) & 0xff) + 1; + +out: + return pll_out; +} +#endif /* CONFIG_SOC_DA8XX */ #ifdef CONFIG_DISPLAY_CPUINFO diff --git a/cpu/arm926ejs/davinci/psc.c b/cpu/arm926ejs/davinci/psc.c index 5bb972f..7e07ae6 100644 --- a/cpu/arm926ejs/davinci/psc.c +++ b/cpu/arm926ejs/davinci/psc.c @@ -25,6 +25,7 @@ #include <common.h> #include <asm/arch/hardware.h> +#include <asm/io.h> /* * The PSC manages three inputs to a "module" which may be a peripheral or @@ -47,21 +48,41 @@ /* Works on Always On power domain only (no PD argument) */ void lpsc_on(unsigned int id) { - dv_reg_p mdstat, mdctl; + unsigned int mdstat, mdctl, ptstat, ptcmd; +#ifndef CONFIG_SOC_DA8XX if (id >= DAVINCI_LPSC_GEM) return; /* Don't work on DSP Power Domain */ - mdstat = REG_P(PSC_MDSTAT_BASE + (id * 4)); - mdctl = REG_P(PSC_MDCTL_BASE + (id * 4)); + mdstat = PSC_MDSTAT_BASE + (id * 4); + mdctl = PSC_MDCTL_BASE + (id * 4); + ptstat = PSC_PTSTAT; + ptcmd = PSC_PTCMD; +#else + if (id > DAVINCI_LPSC_L3_CBA_RAM) + return; + + if (id < DAVINCI_LPSC_BASE) { + mdstat = PSC0_MDSTAT + (id * 4); + mdctl = PSC0_MDCTL + (id * 4); + ptstat = PSC0_PTSTAT; + ptcmd = PSC0_PTCMD; + } else { + id -= 32; + mdstat = PSC1_MDSTAT + (id * 4); + mdctl = PSC1_MDCTL + (id * 4); + ptstat = PSC1_PTSTAT; + ptcmd = PSC1_PTCMD; + } +#endif - while (REG(PSC_PTSTAT) & 0x01) + while (readl(ptstat) & 0x01) continue; - if ((*mdstat & 0x1f) == 0x03) - return; /* Already on and enabled */ + if ((readl(mdstat) & 0x1f) == 0x03) + return; /* Already on and enabled */ - *mdctl |= 0x03; + writel(readl(mdctl) | 0x03, mdctl); switch (id) { #ifdef CONFIG_SOC_DM644X @@ -80,16 +101,16 @@ void lpsc_on(unsigned int id) case DAVINCI_LPSC_MEMSTICK: case DAVINCI_LPSC_McBSP: case DAVINCI_LPSC_GPIO: - *mdctl |= 0x200; + writel(readl(mdctl) | 0x200, mdctl); break; #endif } - REG(PSC_PTCMD) = 0x01; + writel(0x01, ptcmd); - while (REG(PSC_PTSTAT) & 0x03) + while (readl(ptstat) & 0x01) continue; - while ((*mdstat & 0x1f) != 0x03) /* Probably an overkill... */ + while ((readl(mdstat) & 0x1f) != 0x03) continue; }

1 0

[U-Boot] [PATCH v2] davinci timer.c: Remove volatiles and memory mapped structures
by Nick Thompson 26 Oct '09

26 Oct '09

Remove volatiles and memory mapped structure accesses and replace with readl and writel macro usage. Signed-off-by: Nick Thompson <nick.thompson(a)gefanuc.com> --- This patch was originally part of the da830 support patch, but this effort is now being integrated into davinci. As a result, these changes would be have been lost, as no change is required for da830. The changes where request to be kept available however, so here they are. cpu/arm926ejs/davinci/timer.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/cpu/arm926ejs/davinci/timer.c b/cpu/arm926ejs/davinci/timer.c index 80751ad..f705a6e 100644 --- a/cpu/arm926ejs/davinci/timer.c +++ b/cpu/arm926ejs/davinci/timer.c @@ -38,8 +38,9 @@ */ #include <common.h> +#include <asm/io.h> -typedef volatile struct { +typedef struct { u_int32_t pid12; u_int32_t emumgt; u_int32_t na1; @@ -53,7 +54,7 @@ typedef volatile struct { u_int32_t wdtcr; } davinci_timer; -davinci_timer *timer = (davinci_timer *)CONFIG_SYS_TIMERBASE; +static davinci_timer * const timer = (davinci_timer *)CONFIG_SYS_TIMERBASE; #define TIMER_LOAD_VAL (CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ) #define TIM_CLK_DIV 16 @@ -64,30 +65,30 @@ static ulong lastinc; int timer_init(void) { /* We are using timer34 in unchained 32-bit mode, full speed */ - timer->tcr = 0x0; - timer->tgcr = 0x0; - timer->tgcr = 0x06 | ((TIM_CLK_DIV - 1) << 8); - timer->tim34 = 0x0; - timer->prd34 = TIMER_LOAD_VAL; + writel(0x0, &timer->tcr); + writel(0x0, &timer->tgcr); + writel(0x06 | ((TIM_CLK_DIV - 1) << 8), &timer->tgcr); + writel(0x0, &timer->tim34); + writel(TIMER_LOAD_VAL, &timer->prd34); lastinc = 0; timestamp = 0; - timer->tcr = 2 << 22; + writel(2 << 22, &timer->tcr); return(0); } void reset_timer(void) { - timer->tcr = 0x0; - timer->tim34 = 0; + writel(0x0, &timer->tcr); + writel(0x0, &timer->tim34); lastinc = 0; timestamp = 0; - timer->tcr = 2 << 22; + writel(2 << 22, &timer->tcr); } static ulong get_timer_raw(void) { - ulong now = timer->tim34; + ulong now = readl(&timer->tim34); if (now >= lastinc) { /* normal mode */

2 3

[U-Boot] do_jffs2_ls fails
by Ricardo Martínez 26 Oct '09

26 Oct '09

Hi, I'm trying to execute ls command from u-boot shell, but it fails. My board consists of an ARM926ej, 128MB of NOR flash (at 0x20000000 after remap) and 64MB of DDRII at 0x00000000. u-boot is running perfectly appart from this. This means that it loads linux correctly when I have uImage in a specific /dev/mtdX partition, reserved only for this data. But I want to have this uImage file in linux filesystem, as I have it for other boards (NGW100 from Atmel, AVR32AP7 CPU). Taking a look at the last lines, it seems there is a problem with malloc. Any help would be greatly appreciated. Thanks in advance, Ricardo => ls Scanning JFFS2 FS: / Unknown node type: 2005 len 24 offset 0x280000 .- Unknown node type: 2005 len 24 offset 0x2c0000 \ Unknown node type: 2005 len 24 offset 0x300000 ........| Unknown node type: 2005 len 24 offset 0x340000 ./ Unknown node type: 2005 len 24 offset 0x380000 - Unknown node type: 2005 len 24 offset 0x3c0000 \ Unknown node type: 2005 len 24 offset 0x400000 | Unknown node type: 2005 len 24 offset 0x440000 / Unknown node type: 2005 len 24 offset 0x480000 - Unknown node type: 2005 len 24 offset 0x4c0000 \ Unknown node type: 2005 len 24 offset 0x500000 | Unknown node type: 2005 len 24 offset 0x540000 / Unknown node type: 2005 len 24 offset 0x580000 - Unknown node type: 2005 len 24 offset 0x5c0000 \ Unknown node type: 2005 len 24 offset 0x600000 | Unknown node type: 2005 len 24 offset 0x640000 / Unknown node type: 2005 len 24 offset 0x680000 - Unknown node type: 2005 len 24 offset 0x6c0000 \ Unknown node type: 2005 len 24 offset 0x700000 | Unknown node type: 2005 len 24 offset 0x740000 / Unknown node type: 2005 len 24 offset 0x780000 - Unknown node type: 2005 len 24 offset 0x7c0000 \ Unknown node type: 2005 len 24 offset 0x800000 .| Unknown node type: 2005 len 24 offset 0x840000 / Unknown node type: 2005 len 24 offset 0x880000 - Unknown node type: 2005 len 24 offset 0x8c0000 \ Unknown node type: 2005 len 24 offset 0x900000 | Unknown node type: 2005 len 24 offset 0x940000 / Unknown node type: 2005 len 24 offset 0x980000 - Unknown node type: 2005 len 24 offset 0x9c0000 \ Unknown node type: 2005 len 24 offset 0xa00000 | Unknown node type: 2005 len 24 offset 0xa40000 / Unknown node type: 2005 len 24 offset 0xa80000 - Unknown node type: 2005 len 24 offset 0xac0000 \ Unknown node type: 2005 len 24 offset 0xb00000 add_node: malloc failed add_node failed! ls: Failed to scan JFFSv2 file structure

2 3

[U-Boot] File name substitution in linker scripts
by Stefan Roese 26 Oct '09

26 Oct '09

I'm wondering if and how it's possible to use a "variable" file name for inclusion in a linker script. Reason for this is the consolidation of the ppc4xx linker scripts, where some boards (PPC440) include a board specific file (e.g. board/amcc/canyonlands/init.o) into the section "bootpg": .bootpg RESET_VECTOR_ADDRESS - 0xffc : { cpu/ppc4xx/start.o (.bootpg) board/amcc/canyonlands/init.o (.bootpg) } Is there a way to write something like this: .bootpg RESET_VECTOR_ADDRESS - 0xffc : { cpu/ppc4xx/start.o (.bootpg) board/$(BOARDDIR)/init.o (.bootpg) } in a linker script? Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office(a)denx.de

2 1

[U-Boot] [PATCH v2 4/4] add TI DA8xx support: Integrate DA830 EVM support into U-Boot
by Nick Thompson 26 Oct '09

26 Oct '09

Integrate DA830 EVM support into U-Boot. Provides initial support for TI OMAP-L137/DA830 SoC devices on a Spectrum Digital EVM board. See http://www.spectrumdigital.com/ Signed-off-by: Nick Thompson <nick.thompson(a)gefanuc.com> --- Applies to u-boot-ti MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + include/common.h | 4 + include/configs/da830evm.h | 244 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 256 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 528b963..88b4abd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -712,6 +712,10 @@ Andrea Scian <andrea.scian(a)dave-tech.it> B2 ARM7TDMI (S3C44B0X) +Nick Thompson <nick.thompson(a)gefanuc.com> + + da830evm ARM926EJS (DA830/OMAP-L137) + Albin Tonnerre <albin.tonnerre(a)free-electrons.com> sbc35_a9g20 ARM926EJS (AT91SAM9G20 SoC) diff --git a/MAKEALL b/MAKEALL index 0a34a58..4d4350b 100755 --- a/MAKEALL +++ b/MAKEALL @@ -569,6 +569,7 @@ LIST_ARM9=" \ davinci_dm355evm \ davinci_dm355leopard \ davinci_dm6467evm \ + da830evm \ " ######################################################################### diff --git a/Makefile b/Makefile index 449099a..ab0469c 100644 --- a/Makefile +++ b/Makefile @@ -2936,6 +2936,9 @@ davinci_dm365evm_config : unconfig davinci_dm6467evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci +da830evm_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs da830evm davinci da8xx + imx27lite_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27 diff --git a/include/common.h b/include/common.h index f7c93bf..81cafab 100644 --- a/include/common.h +++ b/include/common.h @@ -107,6 +107,10 @@ typedef volatile unsigned char vu_char; #ifdef CONFIG_BLACKFIN #include <asm/blackfin.h> #endif +#ifdef CONFIG_SOC_DA8XX +#include <asm/arch/hardware.h> +#endif + #include <part.h> #include <flash.h> diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h new file mode 100644 index 0000000..d974efd --- /dev/null +++ b/include/configs/da830evm.h @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2008 Texas Instruments, Inc <www.ti.com> + * + * Based on davinci_dvevm.h. Original Copyrights follow: + * + * Copyright (C) 2007 Sergey Kubushyn <ksi(a)koi8.net> + * + * 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 +#include <asm/sizes.h> +#include <asm/arch/clock.h> + +/* + * Board + */ + +/* + * SoC Configuration + */ +#define CONFIG_MACH_DAVINCI_DA830_EVM +#define CONFIG_ARM926EJS /* arm926ejs CPU core */ +#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ +#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) +#define CONFIG_SYS_OSCIN_FREQ 24000000 +#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE +#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) +#define CONFIG_SYS_HZ 1000 +#undef CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ + +/* + * Memory Info + */ +#define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024) /* malloc() len */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* reserved for initial data */ +#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ +#define PHYS_SDRAM_1_SIZE 0x04000000 /* SDRAM size 64MB */ +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 /* memtest start addr */ +#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 16*1024*1024) /* 16MB test */ +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ +#define CONFIG_STACKSIZE (256*1024) /* regular stack */ + +/* + * Serial Driver info + */ +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ +#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ +#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) +#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ +#define CONFIG_BAUDRATE 115200 /* Default baud rate */ +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +/* + * I2C Configuration + */ +#define CONFIG_HARD_I2C +#define CONFIG_DRIVER_DAVINCI_I2C +#define CONFIG_SYS_I2C_SPEED 25000 /* 100Kbps won't work, H/W bug */ +#define CONFIG_SYS_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ + +/* + * I2C EEPROM definitions for catalyst 24W256 EEPROM chip + */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20 + +/* + * Network & Ethernet Configuration + */ +#ifdef CONFIG_DRIVER_TI_EMAC +#define CONFIG_MII +#define CONFIG_BOOTP_DEFAULT +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_NET_RETRY_COUNT 10 +#define CONFIG_NET_MULTI +#endif + +/* + * Flash & Environment + */ +#ifdef CONFIG_USE_NAND +#undef CONFIG_ENV_IS_IN_FLASH +#define CONFIG_NAND_DAVINCI +#define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ +#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ +#define CONFIG_ENV_SIZE (128 << 10) +#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST +#define CONFIG_SYS_NAND_CS 3 +#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE +#define CONFIG_SYS_CLE_MASK 0x10 +#define CONFIG_SYS_ALE_MASK 0x8 +#define CONFIG_SYS_NAND_HW_ECC +#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ +#define NAND_MAX_CHIPS 1 +#define DEF_BOOTM "" +#endif + +#ifdef CONFIG_USE_NOR +#define CONFIG_ENV_IS_IN_FLASH +#undef CONFIG_SYS_NO_FLASH +#define CONFIG_SYS_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */ +#define CONFIG_SYS_FLASH_SECT_SZ (64 << 10) /* 64KB */ +#define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_SECT_SZ*3) +#define CONFIG_SYS_FLASH_BASE DAVINCI_ASYNC_EMIF_DATA_CE2_BASE +#define PHYS_FLASH_SIZE (32 << 20) /* Flash size 32MB */ +#define CONFIG_SYS_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ) +#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ +#define CONFIG_SYS_FLASH_SPL_ACCESS +#endif + +#ifdef CONFIG_USE_SPIFLASH +#undef CONFIG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_SIZE (16 << 10) +#define CONFIG_ENV_OFFSET (256 << 10) +#define CONFIG_ENV_SECT_SIZE 4096 +#define CONFIG_SYS_NO_FLASH +#define CONFIG_SPI +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_WINBOND +#define CONFIG_DAVINCI_SPI +#define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE +#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID) +#define CONFIG_SF_DEFAULT_SPEED 50000000 +#define CONFIG_SYS_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +#endif + + +/* + * U-Boot general configuration + */ +#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ +#undef CONFIG_MISC_INIT_R +#undef CONFIG_BOOTDELAY +#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_SYS_PROMPT "DA830-evm > " /* Command Prompt */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_MEMTEST_START + 0x700000) +#define CONFIG_VERSION_VARIABLE +#define CONFIG_AUTO_COMPLETE /* Won't work with hush so far, may be later */ +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " +#define CONFIG_CMDLINE_EDITING +#define CONFIG_SYS_LONGHELP +#define CONFIG_CRC32_VERIFY +#define CONFIG_MX_CYCLIC +#define CONFIG_USE_PINMUX + +/* + * Linux Information + */ +#define LINUX_BOOT_PARAM_ADDR (CONFIG_SYS_MEMTEST_START + 0x100) +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_BOOTARGS "mem=32M console=ttyS2,115200n8 root=/dev/mtdblock/2 rw noinitrd ip=dhcp" +#define CONFIG_BOOTCOMMAND "" +#define CONFIG_BOOTDELAY 3 + +/* + * U-Boot commands + */ +#include <config_cmd_default.h> +#define CONFIG_CMD_ENV +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_SAVES +#define CONFIG_CMD_MEMORY +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR +#define CONFIG_CMD_EEPROM + +#ifndef CONFIG_DRIVER_TI_EMAC +#undef CONFIG_CMD_NET +#endif + +#ifdef CONFIG_USE_NAND +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS +#define CONFIG_CMD_NAND +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_PARTITIONS +#define CONFIG_CMD_UBI +#define CONFIG_RBTREE +#endif + +#ifdef CONFIG_USE_SPIFLASH +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_FLASH +#define CONFIG_CMD_SPI +#define CONFIG_CMD_SAVEENV +#endif + +#if !defined(CONFIG_USE_NAND) && \ + !defined(CONFIG_USE_NOR) && \ + !defined(CONFIG_USE_SPIFLASH) +#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_SIZE (16 << 10) +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_ENV +#endif + +#ifdef CONFIG_USB_DA8XX +#define CONFIG_CMD_USB /* include support for usb */ +#define CONFIG_CMD_STORAGE /* include support for usb */ +#define CONFIG_CMD_FAT /* include support for FAT/storage*/ +#define CONFIG_DOS_PARTITION /* include support for FAT/storage*/ +#endif + +#endif /* __CONFIG_H */

3 2

[U-Boot] [PATCH] davinci timer.c: Remove volatiles and memory mapped structures
by Nick Thompson 26 Oct '09

26 Oct '09

Remove volatiles and memory mapped structure accesses from the davinci cpu timer.c functions and replace with readl and writel macro usage. Signed-off-by: Nick Thompson <nick.thompson(a)gefanuc.com> --- This patch was originally part of the da830 support patch, but this effort is now being integrated into davinci. As a result, these changes would be have been lost, as no change is required for da830. The changes where request to be kept available however, so here they are. cpu/arm926ejs/davinci/timer.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/cpu/arm926ejs/davinci/timer.c b/cpu/arm926ejs/davinci/timer.c index 80751ad..2b22eef 100644 --- a/cpu/arm926ejs/davinci/timer.c +++ b/cpu/arm926ejs/davinci/timer.c @@ -1,4 +1,8 @@ /* + * Copyright (C) 2009 Nick Thompson, GE Fanuc, Ltd. <nick.thompson(a)gefanuc.com> + * + * Coding style changes. Use writel and readl for hardware accesses. + * * (C) Copyright 2003 * Texas Instruments <www.ti.com> * @@ -38,8 +42,9 @@ */ #include <common.h> +#include <asm/io.h> -typedef volatile struct { +typedef struct { u_int32_t pid12; u_int32_t emumgt; u_int32_t na1; @@ -53,7 +58,7 @@ typedef volatile struct { u_int32_t wdtcr; } davinci_timer; -davinci_timer *timer = (davinci_timer *)CONFIG_SYS_TIMERBASE; +static davinci_timer * const timer = (davinci_timer *)CONFIG_SYS_TIMERBASE; #define TIMER_LOAD_VAL (CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ) #define TIM_CLK_DIV 16 @@ -64,30 +69,30 @@ static ulong lastinc; int timer_init(void) { /* We are using timer34 in unchained 32-bit mode, full speed */ - timer->tcr = 0x0; - timer->tgcr = 0x0; - timer->tgcr = 0x06 | ((TIM_CLK_DIV - 1) << 8); - timer->tim34 = 0x0; - timer->prd34 = TIMER_LOAD_VAL; + writel(0x0, &timer->tcr); + writel(0x0, &timer->tgcr); + writel(0x06 | ((TIM_CLK_DIV - 1) << 8), &timer->tgcr); + writel(0x0, &timer->tim34); + writel(TIMER_LOAD_VAL, &timer->prd34); lastinc = 0; timestamp = 0; - timer->tcr = 2 << 22; + writel(2 << 22, &timer->tcr); return(0); } void reset_timer(void) { - timer->tcr = 0x0; - timer->tim34 = 0; + writel(0x0, &timer->tcr); + writel(0x0, &timer->tim34); lastinc = 0; timestamp = 0; - timer->tcr = 2 << 22; + writel(2 << 22, &timer->tcr); } static ulong get_timer_raw(void) { - ulong now = timer->tim34; + ulong now = readl(&timer->tim34); if (now >= lastinc) { /* normal mode */

3 2

[U-Boot] Compiling with arm-eabi and YAFFS2
by Chris Isbell 26 Oct '09

26 Oct '09

U-Boot 2009.08 fails to compile with the arm-eabi compiler (V4.1.0 and V4.3.1) when YAFFS2 support is enabled (CONFIG_YAFFS2 defined as 1). It reports undefined symbols. (JFFS2 support compiles successfully.) Having investigated, it appears that a work around is to create dummy functions as follows: #ifdef CONFIG_YAFFS2 /* * These stub functions are needed when using the arm-eabi compiler with YAFFS2 * support. This is a complete hack and will probably need to be revised. * (Chris Isbell 23rd October 2009.) */ void abort(void) { } void __exidx_start(void) { } void __exidx_end(void) { } #endif For convenience, I included these temporarily with my board-specific initialisation code - which is clearly not a good place. Has anyone else run into this problem and is there a more elegant solution? Thanks, -- Chris Isbell Systems Integration Manager, CDSRail Fareham, Hampshire, UK.

3 5