October 2009 - U-Boot

[U-Boot] Please pull u-boot-ppc4xx/master
by Stefan Roese 03 Oct '09

03 Oct '09

The following changes since commit 1d96cfe8f5eebfc6ea39d1a387f35ca4499e6b67: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Felix Radensky (1): ppc4xx: Reorganize DDR2 ECC handling Matthias Fuchs (1): ppc4xx: Add SDRAM detection for PMC440 boards Stefan Roese (1): ppc4xx: Merge PPC4xx DDR and DDR2 ECC handling board/esd/pmc440/init.S | 11 +- board/esd/pmc440/sdram.c | 82 ++++++--- cpu/ppc4xx/44x_spd_ddr2.c | 366 ++++++++++++----------------------- cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 6 +- cpu/ppc4xx/ecc.c | 167 +++++++++++----- cpu/ppc4xx/ecc.h | 52 +++--- include/asm-ppc/ppc4xx-sdram.h | 7 +- include/configs/PMC440.h | 1 - 8 files changed, 341 insertions(+), 351 deletions(-)

2 1

[U-Boot] Pull request u-boot-blackfin.git
by Mike Frysinger 03 Oct '09

03 Oct '09

The following changes since commit 984f10baac8ef6032df52f135943d6b0bc96f724: Wolfgang Denk (1): mpc5121ads: fix breakage introduced when reordering elpida_mddrc_config[] are available in the git repository at: git://www.denx.de/git/u-boot-blackfin.git master Mike Frysinger (2): Blackfin: bf533-ezkit: update env location Blackfin: update default console= settings include/configs/bf533-ezkit.h | 2 +- include/configs/bfin_adi_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

2 1

[U-Boot] Ml507 virtex-5
by Spinelli, Claudio (Claudio) 03 Oct '09

03 Oct '09

Hi, I have a Xilinx evaluation board ML507 Virtix-5. I loaded u-boot version 1.3.4 on the NOR flash and I am running uboot out of NOR flash. Uboot comes up ok and it seems to be good. Then using Montavista 5.0.24 distribution I builded an uImage (make uImage) for the ml507. I have also builded a filesystem for it. I burned both the uImage and the filesystem in the NOR flash. Then I run uboot from reset, uboot recognizes the uImage and unzips it correctly, no errors from uboot, but when uboot jumps to run the kernel, there is no response on the serial port. Not even the linux banner gets printed. It looks that the kernel is just not running or crashed. Did anybody try this? One thing I noticed that the unzipped kernel version sitting at RAM location zero looks like this and it has the first 4 bytes "60 00 00 00". Not sure what this four bytes indicate. I will appreciate any help. Regards Claudio u-boot> md.w 0 100 00000000: 6000 0000 7c7f 1b78 7c9e 2378 7cbd 2b78 `...|..x|.#x|.+x 00000010: 7cdc 3378 7cfb 3b78 3b00 0000 7c70 0aa6 |.3x|.;x;...|p.. 00000020: 7c80 00a6 7084 0020 4182 0008 6463 0001 |...p.. A...dc.. 00000030: 7c72 eba6 7c00 04ac 4800 0005 7ca8 02a6 |r..|...H...|... 00000040: 7ee0 2f24 3880 0000 3860 0000 7c17 2000 ~./$8...8`..|. . 00000050: 4182 0008 7c64 07a4 3884 0001 2c04 0040 A...|d..8...,..@ 00000060: 4082 ffec 4c00 012c 3c60 c000 6063 0000 @...L..,<`..`c.. 00000070: 3880 0000 3800 0000 7c10 0ba6 7c00 04ac 8...8...|...|... 00000080: 38a0 0000 7cb2 eba6 7c00 04ac 3ca0 0001 8...|...|...<... 00000090: 60a5 f800 7cb8 e3a6 7cb9 e3a6 38a0 0000 `...|...|...8... 000000a0: 7cb0 e3a6 7cb1 e3a6 7cb2 e3a6 7cb3 e3a6 |...|...|...|... 000000b0: 7cb4 e3a6 7cb5 e3a6 7cb6 e3a6 7cb7 e3a6 |...|...|...|... 000000c0: 7cb0 dba6 7cb1 dba6 7cb2 dba6 7cb3 dba6 |...|...|...|... 000000d0: 7cb4 dba6 7cb5 dba6 7cb6 dba6 7cb7 dba6 |...|...|...|... 000000e0: 5463 002a 6063 0290 5484 002a 38a0 0000 Tc.*`c..T..*8... 000000f0: 60a5 0107 3800 003f 7c60 07a4 7c80 0fa4 `...8..?|`..|... 00000100: 7ca0 17a4 3c00 0002 6000 1002 7c1b 03a6 |...<...`...|... 00000110: 3c00 c000 6000 0124 7c1a 03a6 7c00 04ac <...`..$|...|... 00000120: 4c00 0064 2c17 003f 4182 0010 38c0 0000 L..d,..?A...8... 00000130: 7cd7 07a4 4c00 012c 3b40 0280 7f50 63a6 |...L..,;@...Pc. 00000140: 7c00 04ac 3b40 0340 7f51 63a6 7c00 04ac |...;@.@.Qc.|... 00000150: 3b40 0400 7f52 63a6 7c00 04ac 3b40 0500 ;@...Rc.|...;@.. 00000160: 7f53 63a6 7c00 04ac 3b40 05c0 7f54 63a6 .Sc.|...;@...Tc. 00000170: 7c00 04ac 3b40 0680 7f55 63a6 7c00 04ac |...;@...Uc.|... 00000180: 3b40 0740 7f56 63a6 7c00 04ac 3b40 0800 ;@.@.Vc.|...;@.. 00000190: 7f57 63a6 7c00 04ac 3b40 08c0 7f58 63a6 .Wc.|...;@...Xc. 000001a0: 7c00 04ac 3b40 0980 7f59 63a6 7c00 04ac |...;@...Yc.|... 000001b0: 3b40 0a40 7f5a 63a6 7c00 04ac 3b40 0b00 ;@.@.Zc.|...;@.. 000001c0: 7f5b 63a6 7c00 04ac 3b40 0bc0 7f5c 63a6 .[c.|...;@...\c. 000001d0: 7c00 04ac 3b40 0c80 7f5d 63a6 7c00 04ac |...;@...]c.|... 000001e0: 3b40 0d20 7f5e 63a6 7c00 04ac 3b40 0dc0 ;@. .^c.|...;@.. 000001f0: 7f5f 63a6 7c00 04ac 3c80 c000 7c9f 0ba6 ._c.|...<...|...

2 1

[U-Boot] [PATCH] standalone: Increment XF_VERSION to 6
by Peter Tyser 03 Oct '09

03 Oct '09

Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- This should be squashed with the top-most commit in the reloc branch. Ideally we could fold "[PATCH/RFC] arm/microblaze/nios/nios2/sh: Remove relocation fixups" into the reloc branch too so we don't have to increment XF_VERSION again in the next release. I have no way of testing these arches though.... include/exports.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/exports.h b/include/exports.h index 16ea03a..2e8fd8b 100644 --- a/include/exports.h +++ b/include/exports.h @@ -47,7 +47,7 @@ enum { XF_MAX }; -#define XF_VERSION 5 +#define XF_VERSION 6 #if defined(CONFIG_I386) extern gd_t *global_data; -- 1.6.2.1

3 2

[U-Boot] [PATCH/RFC] arm/microblaze/nios/nios2/sh: Remove relocation fixups
by Peter Tyser 03 Oct '09

03 Oct '09

These architectures don't need relocation fixups, so reduce their codesize a bit by defining CONFIG_RELOC_FIXUP_WORKS. Also remove the reloc_off field from their global data structures as it is no longer needed. Note that the location of the standalone application jump table pointer in the global data structure is affected by this change, breaking execution of standalone applications compiled for previous versions of U-Boot. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- I apparently forgot to send this yesterday with the rest of the relocation patches. If the ppc relocation series just sent gets accepted, this change should cut out some unneeded code from other arches which don't use relocation fixups. I haven't compiled any of these arches though, so take the patch with a grain of salt. common/stdio.c | 4 ++-- include/asm-arm/config.h | 3 +++ include/asm-arm/global_data.h | 1 - include/asm-microblaze/config.h | 3 +++ include/asm-microblaze/global_data.h | 1 - include/asm-nios/config.h | 3 +++ include/asm-nios/global_data.h | 1 - include/asm-nios2/config.h | 3 +++ include/asm-nios2/global_data.h | 1 - include/asm-sh/config.h | 3 +++ include/asm-sh/global_data.h | 1 - 11 files changed, 17 insertions(+), 7 deletions(-) diff --git a/common/stdio.c b/common/stdio.c index 5e58dbe..870ddfd 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -201,7 +201,7 @@ int stdio_deregister(char *devname) int stdio_init (void) { -#if !defined(CONFIG_ARM) && !defined(CONFIG_RELOC_FIXUP_WORKS) +#if !defined(CONFIG_RELOC_FIXUP_WORKS) /* already relocated for current ARM implementation */ ulong relocation_offset = gd->reloc_off; int i; @@ -211,7 +211,7 @@ int stdio_init (void) stdio_names[i] = (char *) (((ulong) stdio_names[i]) + relocation_offset); } -#endif /* !ARM && !CONFIG_RELOC_FIXUP_WORKS */ +#endif /* !CONFIG_RELOC_FIXUP_WORKS */ /* Initialize the list */ INIT_LIST_HEAD(&(devs.list)); diff --git a/include/asm-arm/config.h b/include/asm-arm/config.h index 049c44e..b76fd8e 100644 --- a/include/asm-arm/config.h +++ b/include/asm-arm/config.h @@ -21,4 +21,7 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +/* Relocation to SDRAM works on all ARM boards */ +#define CONFIG_RELOC_FIXUP_WORKS + #endif diff --git a/include/asm-arm/global_data.h b/include/asm-arm/global_data.h index 5c56ce3..8115a24 100644 --- a/include/asm-arm/global_data.h +++ b/include/asm-arm/global_data.h @@ -38,7 +38,6 @@ typedef struct global_data { unsigned long flags; unsigned long baudrate; unsigned long have_console; /* serial_init() was called */ - unsigned long reloc_off; /* Relocation Offset */ unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid? */ unsigned long fb_base; /* base address of frame buffer */ diff --git a/include/asm-microblaze/config.h b/include/asm-microblaze/config.h index 049c44e..8a9064b 100644 --- a/include/asm-microblaze/config.h +++ b/include/asm-microblaze/config.h @@ -21,4 +21,7 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +/* Relocation to SDRAM works on all Microblaze boards */ +#define CONFIG_RELOC_FIXUP_WORKS + #endif diff --git a/include/asm-microblaze/global_data.h b/include/asm-microblaze/global_data.h index 3f49c34..ec7837f 100644 --- a/include/asm-microblaze/global_data.h +++ b/include/asm-microblaze/global_data.h @@ -39,7 +39,6 @@ typedef struct global_data { unsigned long flags; unsigned long baudrate; unsigned long have_console; /* serial_init() was called */ - unsigned long reloc_off; /* Relocation Offset */ unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid? */ unsigned long fb_base; /* base address of frame buffer */ diff --git a/include/asm-nios/config.h b/include/asm-nios/config.h index 049c44e..2efe898 100644 --- a/include/asm-nios/config.h +++ b/include/asm-nios/config.h @@ -21,4 +21,7 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +/* Relocation to SDRAM works on all NIOS boards */ +#define CONFIG_RELOC_FIXUP_WORKS + #endif diff --git a/include/asm-nios/global_data.h b/include/asm-nios/global_data.h index 4929a5b..fa54ee4 100644 --- a/include/asm-nios/global_data.h +++ b/include/asm-nios/global_data.h @@ -31,7 +31,6 @@ typedef struct global_data { unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long have_console; /* serial_init() was called */ phys_size_t ram_size; /* RAM size */ - unsigned long reloc_off; /* Relocation Offset */ unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid */ #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) diff --git a/include/asm-nios2/config.h b/include/asm-nios2/config.h index 049c44e..011d603 100644 --- a/include/asm-nios2/config.h +++ b/include/asm-nios2/config.h @@ -21,4 +21,7 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +/* Relocation to SDRAM works on all NIOS2 boards */ +#define CONFIG_RELOC_FIXUP_WORKS + #endif diff --git a/include/asm-nios2/global_data.h b/include/asm-nios2/global_data.h index db71324..34aa962 100644 --- a/include/asm-nios2/global_data.h +++ b/include/asm-nios2/global_data.h @@ -30,7 +30,6 @@ typedef struct global_data { unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long have_console; /* serial_init() was called */ phys_size_t ram_size; /* RAM size */ - unsigned long reloc_off; /* Relocation Offset */ unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid */ #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) diff --git a/include/asm-sh/config.h b/include/asm-sh/config.h index 049c44e..978cc92 100644 --- a/include/asm-sh/config.h +++ b/include/asm-sh/config.h @@ -21,4 +21,7 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +/* Relocation to SDRAM works on all sh boards */ +#define CONFIG_RELOC_FIXUP_WORKS + #endif diff --git a/include/asm-sh/global_data.h b/include/asm-sh/global_data.h index f8ade5c..c12b855 100644 --- a/include/asm-sh/global_data.h +++ b/include/asm-sh/global_data.h @@ -35,7 +35,6 @@ typedef struct global_data unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long have_console; /* serial_init() was called */ phys_size_t ram_size; /* RAM size */ - unsigned long reloc_off; /* Relocation Offset */ unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid */ void **jt; /* Standalone app jump table */ -- 1.6.2.1

2 1

[U-Boot] [PATCH] TI DaVinci DM646x: Adding initial support for DM6467 EVM
by s-paulraj＠ti.com 02 Oct '09

02 Oct '09

From: Sandeep Paulraj <s-paulraj(a)ti.com> This patch adds the initial support for DM6467 EVM. Other features like NET and NAND support will be added as follow up patches. Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- There are multiple flavours of the DM646x. The newest DM646x SOC can operate at 1 GHz. The DM6467 EVM from Spectrum Digital can be used for both speed grades of the DM646x SOC . The only change on the EVM being an oscilator that operated at a higher frequency. The same board file will be used to support both SOC's. Support for this feature will be added as follow up patches. Patches will also be sent to enable EMAC, NAND and other features. Makefile | 3 + board/davinci/dm6467evm/Makefile | 52 ++++++++++++++ board/davinci/dm6467evm/config.mk | 2 + board/davinci/dm6467evm/dm6467evm.c | 31 ++++++++ include/configs/davinci_dm6467evm.h | 131 +++++++++++++++++++++++++++++++++++ 5 files changed, 219 insertions(+), 0 deletions(-) create mode 100644 board/davinci/dm6467evm/Makefile create mode 100644 board/davinci/dm6467evm/config.mk create mode 100644 board/davinci/dm6467evm/dm6467evm.c create mode 100644 include/configs/davinci_dm6467evm.h diff --git a/Makefile b/Makefile index 0b61d05..dc797b0 100644 --- a/Makefile +++ b/Makefile @@ -2962,6 +2962,9 @@ davinci_dm355evm_config : unconfig davinci_dm365evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm365evm davinci davinci +davinci_dm6467evm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci + imx27lite_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27 diff --git a/board/davinci/dm6467evm/Makefile b/board/davinci/dm6467evm/Makefile new file mode 100644 index 0000000..26b0705 --- /dev/null +++ b/board/davinci/dm6467evm/Makefile @@ -0,0 +1,52 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# Copyright (C) 2007 Sergey Kubushyn <ksi(a)koi8.net> +# +# 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 +SOBJS := + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +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 + +######################################################################### +# This is for $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/davinci/dm6467evm/config.mk b/board/davinci/dm6467evm/config.mk new file mode 100644 index 0000000..ca801c2 --- /dev/null +++ b/board/davinci/dm6467evm/config.mk @@ -0,0 +1,2 @@ +#Provide at least 16MB spacing between us and the Linux Kernel image +TEXT_BASE = 0x81080000 diff --git a/board/davinci/dm6467evm/dm6467evm.c b/board/davinci/dm6467evm/dm6467evm.c new file mode 100644 index 0000000..9605818 --- /dev/null +++ b/board/davinci/dm6467evm/dm6467evm.c @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2009 Texas Instruments Incorporated + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <common.h> +#include <asm/io.h> + +DECLARE_GLOBAL_DATA_PTR; + +int board_init(void) +{ + gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_DM6467_EVM; + gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; + + return 0; +} + diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h new file mode 100644 index 0000000..c23d533 --- /dev/null +++ b/include/configs/davinci_dm6467evm.h @@ -0,0 +1,131 @@ +/* + * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.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 + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* Spectrum Digital TMS320DM6467 EVM board */ +#define DAVINCI_DM6467EVM + +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_RELOCATE_UBOOT + +/* SoC Configuration */ +#define CONFIG_ARM926EJS /* arm926ejs CPU */ +#define CONFIG_SYS_TIMERBASE 0x01c21400 /* use timer 0 */ +#define CONFIG_SYS_HZ_CLOCK 27000000 +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SOC_DM646X + +/* EEPROM definitions for EEPROM */ +#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 + +/* Memory Info */ +#define CONFIG_SYS_MALLOC_LEN (1 << 20) /* 1 MiB */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* initial data */ +#define CONFIG_SYS_MEMTEST_START 0x80000000 +#define CONFIG_SYS_MEMTEST_END 0x81000000 /* 16MB RAM test */ +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ +#define PHYS_SDRAM_1 0x80000000 /* DDR Start */ +#define PHYS_SDRAM_1_SIZE (256 << 20) /* DDR size 256MB */ + +/* Linux interfacing */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_SYS_BARGSIZE 1024 /* Bootarg Size */ +#define CONFIG_SYS_LOAD_ADDR 0x80700000 /* kernel address */ + +/* Serial Driver info */ +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE 4 +#define CONFIG_SYS_NS16550_COM1 0x01c20000 +#define CONFIG_SYS_NS16550_CLK 24000000 +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200 +#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 80000 +#define CONFIG_SYS_I2C_SLAVE 10 + +/* Flash & Environment */ +#define CONFIG_SYS_NO_FLASH +#ifdef CONFIG_SYS_USE_NAND +#define CONFIG_NAND_DAVINCI +#undef CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ +#define CONFIG_SYS_NAND_BASE_LIST {0x42000000, } +#define CONFIG_SYS_NAND_HW_ECC +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_ENV_OFFSET 0 +#else +#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_ENV_SIZE (4 << 10) /* 4 KiB */ +#endif + +/* U-Boot general configuration */ +#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ +#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_SYS_PROMPT "DM6467 EVM > " /* Monitor 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 +#define CONFIG_VERSION_VARIABLE +#define CONFIG_AUTO_COMPLETE +#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_BOOTCOMMAND "source 0x82080000; dhcp; bootm" +#define CONFIG_BOOTARGS \ + "mem=120M console=ttyS0,115200n8 " \ + "root=/dev/hda1 rw noinitrd ip=dhcp" + +/* U-Boot commands */ +#include <config_cmd_default.h> +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_SAVES +#define CONFIG_CMD_EEPROM +#undef CONFIG_CMD_NET +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR +#ifdef CONFIG_SYS_USE_NAND +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS +#define CONFIG_CMD_NAND +#endif + +#endif /* __CONFIG_H */ + -- 1.6.0.4

3 3

[U-Boot] [PATCH] TI: DaVinci DM365: Flag for updated EMAC driver.
by s-paulraj＠ti.com 02 Oct '09

02 Oct '09

From: Sandeep Paulraj <s-paulraj(a)ti.com> The flag "CONFIG_DAVINCI_EMAC_VERSION2" is used by the DaVinci EMAC driver to differentiate between different versions of the IP. Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- include/configs/davinci_dm365evm.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index 2797f82..643d26c 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -57,6 +57,7 @@ /* Network Configuration */ #define CONFIG_DRIVER_TI_EMAC +#define CONFIG_DAVINCI_EMAC_VERSION2 #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS -- 1.6.0.4

2 1

[U-Boot] [PATCH] TI: DaVinci: Updating EMAC driver for DM365 and DM646x
by s-paulraj＠ti.com 02 Oct '09

02 Oct '09

From: Sandeep Paulraj <s-paulraj(a)ti.com> The EMAC IP on DM365 and DM646x is slightly different from that on DM644x. This patch updates the DaVinci EMAC driver so that EMAC becomes operational on DM365 in U-Boot. A flag 'CONFIG_DAVINCI_EMAC_VERSION2' is used in the driver. This flag will need to be defined in the DM365 config file. Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- The same modifications work on DM646x in a slightly older version of U-Boot. So when enabled this should work on the DM6467 EVM as well. This has at this point of time not been tested on the DM6467 in the latest version of U-Boot. drivers/net/davinci_emac.c | 79 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index fa8cee4..0d61c91 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -107,6 +107,33 @@ static void davinci_eth_mdio_enable(void) while (adap_mdio->CONTROL & MDIO_CONTROL_IDLE) {;} } +/* Read a PHY register via MDIO inteface */ +static int mdio_read(int phy_addr, int reg_num) +{ + adap_mdio->USERACCESS0 = MDIO_USERACCESS0_GO | + MDIO_USERACCESS0_WRITE_READ | + ((reg_num & 0x1F) << 21) | + ((phy_addr & 0x1F) << 16); + + /* Wait for command to complete */ + while ((adap_mdio->USERACCESS0 & MDIO_USERACCESS0_GO) != 0); + + return adap_mdio->USERACCESS0 & 0xFFFF; +} + +/* Write to a PHY register via MDIO inteface */ +void mdio_write(int phy_addr, int reg_num, unsigned int data) +{ + /* Wait for User access register to be ready */ + while ((adap_mdio->USERACCESS0 & MDIO_USERACCESS0_GO) != 0); + + adap_mdio->USERACCESS0 = MDIO_USERACCESS0_GO | + MDIO_USERACCESS0_WRITE_WRITE | + ((reg_num & 0x1F) << 21) | + ((phy_addr & 0x1F) << 16) | + (data & 0xFFFF); +} + /* * Tries to find an active connected PHY. Returns 1 if address if found. * If no active PHY (or more than one PHY) found returns 0. @@ -248,6 +275,31 @@ static int davinci_mii_phy_write(char *devname, unsigned char addr, unsigned cha #endif +static void emac_gigabit_enable(void) +{ + int temp; + + temp = mdio_read(EMAC_MDIO_PHY_NUM, 0); + + if (temp & (1 << 6)) { + /* + * Check if link detected is giga-bit + * If Gigabit mode detected, enable gigbit in MAC and PHY + */ + adap_emac->MACCONTROL |= EMAC_MACCONTROL_GIGFORCE | + EMAC_MACCONTROL_GIGABIT_ENABLE; + + /* + * The SYS_CLK which feeds the SOC for giga-bit operation + * does not seem to be enabled after reset as expected. + * Force enabling SYS_CLK by writing to the PHY + */ + temp = mdio_read(EMAC_MDIO_PHY_NUM, 22); + temp |= (1 << 4); + mdio_write(EMAC_MDIO_PHY_NUM, 22, temp); + } +} + /* Eth device open */ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) @@ -261,10 +313,15 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) /* Reset EMAC module and disable interrupts in wrapper */ adap_emac->SOFTRESET = 1; while (adap_emac->SOFTRESET != 0) {;} +#if defined(CONFIG_DAVINCI_EMAC_VERSION2) + adap_ewrap->SOFTRST = 1; + while (adap_ewrap->SOFTRST != 0); +#else adap_ewrap->EWCTL = 0; for (cnt = 0; cnt < 5; cnt++) { clkdiv = adap_ewrap->EWCTL; } +#endif rx_desc = emac_rx_desc; @@ -282,6 +339,10 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) adap_emac->MACADDRLO = (davinci_eth_mac_addr[5] << 8) | (davinci_eth_mac_addr[4]); +#if defined(CONFIG_DAVINCI_EMAC_VERSION2) + /* Set the Match and Valid Bits */ + adap_emac->MACADDRLO |= (1 << 19) | (1 << 20); +#endif adap_emac->MACHASH1 = 0; adap_emac->MACHASH2 = 0; @@ -347,8 +408,15 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) clkdiv = (EMAC_MDIO_BUS_FREQ / EMAC_MDIO_CLOCK_FREQ) - 1; adap_mdio->CONTROL = ((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | MDIO_CONTROL_FAULT); +#if defined(CONFIG_DAVINCI_EMAC_VERSION2) + /* We need to wait for MDIO to start */ + udelay(1000); +#endif + if (!phy.get_link_speed(active_phy_addr)) return(0); + else + emac_gigabit_enable(); /* Start receive process */ adap_emac->RX0HDP = (u_int32_t)emac_rx_desc; @@ -411,7 +479,11 @@ static void davinci_eth_close(struct eth_device *dev) /* Reset EMAC module and disable interrupts in wrapper */ adap_emac->SOFTRESET = 1; +#if defined(CONFIG_DAVINCI_EMAC_VERSION2) + adap_ewrap->SOFTRST = 1; +#else adap_ewrap->EWCTL = 0; +#endif debug_emac("- emac_close\n"); } @@ -433,7 +505,8 @@ static int davinci_eth_send_packet (struct eth_device *dev, if (!phy.get_link_speed (active_phy_addr)) { printf ("WARN: emac_send_packet: No link\n"); return (ret_status); - } + } else + emac_gigabit_enable(); /* Check packet size and if < EMAC_MIN_ETHERNET_PKT_SIZE, pad it up */ if (length < EMAC_MIN_ETHERNET_PKT_SIZE) { @@ -456,7 +529,9 @@ static int davinci_eth_send_packet (struct eth_device *dev, if (!phy.get_link_speed (active_phy_addr)) { davinci_eth_ch_teardown (EMAC_CH_TX); return (ret_status); - } + } else + emac_gigabit_enable(); + if (adap_emac->TXINTSTATRAW & 0x01) { ret_status = length; break; -- 1.6.0.4

2 1

[U-Boot] [PATCH] TI DaVinci DM365: Fix Compilation warning for DM365 EVM
by s-paulraj＠ti.com 02 Oct '09

02 Oct '09

From: Sandeep Paulraj <s-paulraj(a)ti.com> This patch fixes a compilation warning while compiling the DM365 EVM. Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- board/davinci/dm365evm/dm365evm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/davinci/dm365evm/dm365evm.c b/board/davinci/dm365evm/dm365evm.c index 5b97060..1e3a14f 100644 --- a/board/davinci/dm365evm/dm365evm.c +++ b/board/davinci/dm365evm/dm365evm.c @@ -79,8 +79,8 @@ int board_eth_init(bd_t *bis) static void nand_dm365evm_select_chip(struct mtd_info *mtd, int chip) { struct nand_chip *this = mtd->priv; - u32 wbase = (u32) this->IO_ADDR_W; - u32 rbase = (u32) this->IO_ADDR_R; + unsigned long wbase = (unsigned long) this->IO_ADDR_W; + unsigned long rbase = (unsigned long) this->IO_ADDR_R; if (chip == 1) { __set_bit(14, &wbase); -- 1.6.0.4

2 1

[U-Boot] [PATCH] TI DaVinci DM355: Fix Compilation warning for DM355 EVM
by s-paulraj＠ti.com 02 Oct '09

02 Oct '09

From: Sandeep Paulraj <s-paulraj(a)ti.com> This patch fixes a compilation warning while compiling the DM355 EVM. Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- board/davinci/dm355evm/dm355evm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/davinci/dm355evm/dm355evm.c b/board/davinci/dm355evm/dm355evm.c index 0a44748..87f284c 100644 --- a/board/davinci/dm355evm/dm355evm.c +++ b/board/davinci/dm355evm/dm355evm.c @@ -92,8 +92,8 @@ int board_eth_init(bd_t *bis) static void nand_dm355evm_select_chip(struct mtd_info *mtd, int chip) { struct nand_chip *this = mtd->priv; - u32 wbase = (u32) this->IO_ADDR_W; - u32 rbase = (u32) this->IO_ADDR_R; + unsigned long wbase = (unsigned long) this->IO_ADDR_W; + unsigned long rbase = (unsigned long) this->IO_ADDR_R; if (chip == 1) { __set_bit(14, &wbase); -- 1.6.0.4

2 1