May 2009 - U-Boot

[U-Boot] [patch u-boot/arm/next git] initial DaVinci DM355 EVM board support
by David Brownell 09 May '09

09 May '09

From: David Brownell <dbrownell(a)users.sourceforge.net> Initial U-Boot support for the DaVinci DM355 EVM. This is a board from Spectrum Digital. Board docs include schematic and firmware for its microcontroller: http://c6000.spectrumdigital.com/evmdm355/ Most of the DM355 chip is fully documented by TI, the most notable exception being the MPEG/JPEG coprocessor (programmable using codecs available at no cost from TI) omitted from its DM335 sibling: http://focus.ti.com/docs/prod/folders/print/tms320dm355.html This version can boot from the on-board DM9000 Ethernet chip, after being loaded (from NAND, MMC/SD, or UART). In the near future, NAND and USB support could be added. The current NAND driver works fine with the socketed 2GByte SLC NAND device included with the board, or swapping it out with a small page NAND chip ... as long as the 1-bit hardware ECC hardware is used. The intention is however to always use the 4-bit ECC hardware, and that driver support is not yet ready. Signed-off-by: David Brownell <dbrownell(a)users.sourceforge.net> --- Depends on patches queued in arm/next, to support non-dm6446 DaVinci chips and add the core dm355 chip support. DM9000 support depends on the EEPROM-reading bugfix, now merged to the main u-boot tree. MAKEALL | 1 Makefile | 3 board/davinci/dm355evm/Makefile | 52 ++++++++ board/davinci/dm355evm/config.mk | 11 + board/davinci/dm355evm/dm355evm.c | 84 ++++++++++++++ board/davinci/dm355evm/u-boot.lds | 52 ++++++++ include/configs/davinci_dm355evm.h | 209 +++++++++++++++++++++++++++++++++++ 7 files changed, 412 insertions(+) --- a/MAKEALL +++ b/MAKEALL @@ -527,6 +527,7 @@ LIST_ARM9=" \ davinci_schmoogie \ davinci_sffsdr \ davinci_sonata \ + davinci_dm355evm \ " ######################################################################### --- a/Makefile +++ b/Makefile @@ -2790,6 +2790,9 @@ davinci_sffsdr_config : unconfig davinci_sonata_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci +davinci_dm355evm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355evm davinci davinci + lpd7a400_config \ lpd7a404_config: unconfig @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x --- /dev/null +++ b/board/davinci/dm355evm/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 + +######################################################################### --- /dev/null +++ b/board/davinci/dm355evm/config.mk @@ -0,0 +1,11 @@ +# +# Spectrum Digital DM355 EVM board +# dm355evm board has 1 bank of 128 MB DDR RAM +# Physical Address: 8000'0000 to 8800'0000 +# +# Linux Kernel is expected to be at 8000'8000, entry 8000'8000 +# (mem base + reserved) +# + +#Provide at least 16MB spacing between us and the Linux Kernel image +TEXT_BASE = 0x81080000 --- /dev/null +++ b/board/davinci/dm355evm/dm355evm.c @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2009 David Brownell + * + * 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 <net.h> +#include <asm/io.h> +#include <asm/arch/hardware.h> +#include <asm/arch/emif_defs.h> +#include "../common/misc.h" + + +DECLARE_GLOBAL_DATA_PTR; + +/* + * With the DM355 EVM, u-boot is *always* a third stage loader: + * + * - 1st stage is ROM Boot Loader (RBL), which searches for a + * second stage loader in one of three places based on SW7: + * NAND (with MMC/SD fallback), MMC/SD, or UART. + * + * - 2nd stage is User Boot Loader (UBL), using at most 30KB + * of on-chip SRAM, responsible for lowlevel init, and for + * loading the third stage loader into DRAM. + * + * - 3rd stage, that's us! + */ + +int board_init(void) +{ + gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_DM355_EVM; + gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; + + /* We expect the UBL to have handled "lowlevel init", which + * involves setting up at least: + * - clocks + * + PLL1 (for ARM and peripherals) and PLL2 (for DDR) + * + clock divisors for those PLLs + * + LPSC_DDR module enabled + * + LPSC_TIMER0 module (still) enabled + * - EMIF + * + DDR init and timings + * + AEMIF timings (for NAND and DM9000) + * - pinmux + * + * Some of that is repeated here, mostly as a precaution. + */ + + /* AEMIF: Some address lines are available as GPIOs; A3..A13 + * could be too, if we used A12 as a GPIO during NAND chipselect. + */ + REG(PINMUX2) = 0x0c08; + + /* UART0 may still be in SyncReset if we didn't boot from UART */ + davinci_enable_uart0(); + + /* EDMA may be in SyncReset too; turn it on, Linux won't (yet) */ + lpsc_on(DAVINCI_LPSC_TPCC); + lpsc_on(DAVINCI_LPSC_TPTC0); + lpsc_on(DAVINCI_LPSC_TPTC1); + + return 0; +} + +/* Platform dependent initialisation. */ +int misc_init_r(void) +{ + dv_display_clk_infos(); + return 0; +} --- /dev/null +++ b/board/davinci/dm355evm/u-boot.lds @@ -0,0 +1,52 @@ +/* + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + . = ALIGN(4); + .text : + { + cpu/arm926ejs/start.o (.text) + *(.text) + } + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + . = ALIGN(4); + .data : { *(.data) } + . = ALIGN(4); + .got : { *(.got) } + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + . = ALIGN(4); + __bss_start = .; + .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } + _end = .; +} --- /dev/null +++ b/include/configs/davinci_dm355evm.h @@ -0,0 +1,209 @@ +/* + * Copyright (C) 2009 David Brownell + * + * 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> + +/* Spectrum Digital TMS320DM355 EVM board */ +#define DAVINCI_DM355EVM + +#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 3rd stage loader */ +#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 24000000 /* timer0 freq */ +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SOC_DM355 + +/* Memory Info */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 0x80000000 +#define PHYS_SDRAM_1_SIZE SZ_128M + +/* Serial Driver info: UART0 for console */ +#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 CONFIG_SYS_HZ_CLOCK +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200 + +/* Ethernet: external DM9000 */ +#define CONFIG_DRIVER_DM9000 1 +#define CONFIG_DM9000_BASE 0x04014000 +#define DM9000_IO CONFIG_DM9000_BASE +#define DM9000_DATA (CONFIG_DM9000_BASE + 2) + +/* I2C */ +#define CONFIG_HARD_I2C +#define CONFIG_DRIVER_DAVINCI_I2C +#define CONFIG_SYS_I2C_SPEED 400000 +#define CONFIG_SYS_I2C_SLAVE 0x10 /* SMBus host address */ + +/* NAND: socketed, two chipselects, normally 2 GBytes */ +/* NYET -- #define CONFIG_NAND_DAVINCI */ +#define CONFIG_SYS_NAND_HW_ECC +#define CONFIG_SYS_NAND_USE_FLASH_BBT + +/*#define CONFIG_SYS_NAND_SMALLPAGE */ +#define CONFIG_SYS_NAND_LARGEPAGE + +#ifdef CONFIG_SYS_NAND_SMALLPAGE +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_MAX_CHIPS 1 +#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, } +#else +/* FIXME should be one device, two chips ... */ +#define CONFIG_SYS_MAX_NAND_DEVICE 2 +#define CONFIG_SYS_NAND_MAX_CHIPS 1 +#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, 0x02004000, } +#endif + +/* USB: OTG connector */ +/* #define CONFIG_USB_DAVINCI */ + +/* U-Boot command configuration */ +#include <config_cmd_default.h> + +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_I2C +#define CONFIG_CMD_PING +#define CONFIG_CMD_SAVES + +#ifdef CONFIG_NAND_DAVINCI +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_PARTITIONS +#define CONFIG_CMD_NAND +#define CONFIG_CMD_UBI +#define CONFIG_RBTREE +#endif + +#ifdef CONFIG_USB_DAVINCI +#define CONFIG_MUSB_HCD +#define CONFIG_CMD_USB +#endif + +/* TEMPORARY -- no safe place to save env, yet */ +#undef CONFIG_CMD_SAVEENV +#define CONFIG_ENV_IS_NOWHERE + +#define CONFIG_SYS_NO_FLASH /* that is, no *NOR* flash */ +#undef CONFIG_CMD_FLASH /* ditto */ +#undef CONFIG_CMD_IMLS /* really! */ + +#define CONFIG_CRC32_VERIFY +#define CONFIG_MX_CYCLIC + +/* U-Boot general configuration */ +#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ +#define CONFIG_MISC_INIT_R +#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_SYS_PROMPT "DM355 EVM # " /* Monitor Command Prompt */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ +#define CONFIG_SYS_PBSIZE /* Print buffer size */ \ + (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_CONSOLE_INFO_QUIET + +#define CONFIG_ENV_SIZE SZ_16K + +/*#define CONFIG_BOOTDELAY 5 */ +#define CONFIG_BOOTCOMMAND \ + "dhcp;bootm" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200n8 " \ + "root=/dev/mmcblk0p1 rootwait rootfstype=ext3 ro" + +#define CONFIG_CMDLINE_EDITING +#define CONFIG_VERSION_VARIABLE +#define CONFIG_TIMESTAMP + +#define CONFIG_NET_RETRY_COUNT 10 + +/* U-Boot memory configuration */ +#define CONFIG_STACKSIZE SZ_256K /* regular stack */ +#define CONFIG_SYS_MALLOC_LEN SZ_512K /* malloc() arena */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */ +#define CONFIG_SYS_MEMTEST_START 0x87000000 /* physical address */ +#define CONFIG_SYS_MEMTEST_END 0x88000000 /* test 16MB RAM */ + +/* Linux interfacing */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_SYS_BARGSIZE 1024 /* Boot Argument Buffer Size */ +#define CONFIG_SYS_LOAD_ADDR 0x80700000 /* kernel load address */ + + +/* NAND configuration ... socketed with two chipselects. It normally comes + * with a 2GByte SLC part with 2KB pages (and 128KB erase blocks); other + * 2GByte parts may have 4KB pages, 256KB erase blocks, and use MLC. (MLC + * pretty much demands the 4-bit ECC support. + * + * We handle (at compile time) two types of socketed chips: small page, + * with one chipselect; and large page, with two chipselects. + * + * This presents a single read-only partition for all bootloader stuff. + * UBL (1+ block), U-Boot (256KB+), U-Boot environment (one block), and + * extra space to help cope with bad blocks in that data. Linux shouldn't + * care about its detailed layout. It's easy to override this default + * "safe" partitioning. + */ +#ifdef CONFIG_SYS_NAND_SMALLPAGE +/* Assume one chipselect is used, and 16K erase blocks. */ +#define MTDIDS_DEFAULT "nand0=davinci_nand.0" +#define MTDPARTS_DEFAULT_2 "" +#define PART_BOOT "512k(bootloader)ro," +#endif + +#ifdef CONFIG_SYS_NAND_LARGEPAGE +/* Assume both chipselects are used. Use same layout for 128K/256K blocks. */ +#define MTDIDS_DEFAULT "nand0=davinci_nand.0,nand1=davinci_nand.1" +#define MTDPARTS_DEFAULT_2 ";davinci_nand.1:-(filesystem2)" +#define PART_BOOT "1m(bootloader)ro," +/* + * FIXME Make UBI combine most of that 2GB area into one filesystem. + * + * FIXME for 2GB parts, this should appear as *one* composite chip, + * just like it does in Linux... + */ +#endif + +#define PART_KERNEL "4m(kernel)," /* kernel + initramfs */ +#define PART_REST "-(filesystem1)" + +#define MTDPARTS_DEFAULT_1 \ + "mtdparts=davinci_nand.0:" PART_BOOT PART_KERNEL PART_REST + +#define MTDPARTS_DEFAULT \ + MTDPARTS_DEFAULT_1 MTDPARTS_DEFAULT_2 + +#endif /* __CONFIG_H */

2 4

[U-Boot] [PATCH v5] ARM DaVinci Adding DM357 Support
by s-paulraj＠ti.com 09 May '09

09 May '09

Patch adds Support for DaVinci DM357. It boots of a small page NAND on the EVM. It does not have NOR support. This patch has been tested on the DM357 EVM. The patch does not have Ethernet Support yet. Ethernet Support will be added soon Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- Makefile | 3 + board/davinci/dm357_evm/Makefile | 50 +++++++++++ board/davinci/dm357_evm/config.mk | 39 +++++++++ board/davinci/dm357_evm/dm357_evm.c | 69 ++++++++++++++++ include/configs/davinci_dm357_evm.h | 155 +++++++++++++++++++++++++++++++++++ 5 files changed, 316 insertions(+), 0 deletions(-) create mode 100644 board/davinci/dm357_evm/Makefile create mode 100644 board/davinci/dm357_evm/config.mk create mode 100644 board/davinci/dm357_evm/dm357_evm.c create mode 100644 include/configs/davinci_dm357_evm.h diff --git a/Makefile b/Makefile index 137c88f..6ee0562 100644 --- a/Makefile +++ b/Makefile @@ -2790,6 +2790,9 @@ davinci_sffsdr_config : unconfig davinci_sonata_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci +davinci_dm357_evm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm357_evm davinci davinci + lpd7a400_config \ lpd7a404_config: unconfig @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x diff --git a/board/davinci/dm357_evm/Makefile b/board/davinci/dm357_evm/Makefile new file mode 100644 index 0000000..b10da38 --- /dev/null +++ b/board/davinci/dm357_evm/Makefile @@ -0,0 +1,50 @@ +# +# (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 := dm357_evm.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(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/dm357_evm/config.mk b/board/davinci/dm357_evm/config.mk new file mode 100644 index 0000000..aa89d0e --- /dev/null +++ b/board/davinci/dm357_evm/config.mk @@ -0,0 +1,39 @@ +# +# (C) Copyright 2002 +# Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> +# David Mueller, ELSOFT AG, <d.mueller(a)elsoft.ch> +# +# (C) Copyright 2003 +# Texas Instruments, <www.ti.com> +# Swaminathan <swami.iyer(a)ti.com> +# +# Davinci EVM board (ARM925EJS) cpu +# see http://www.ti.com/ for more information on Texas Instruments +# +# Davinci EVM has 1 bank of 256 MB DDR RAM +# Physical Address: +# 8000'0000 to 9000'0000 +# +# Copyright (C) 2007 Sergey Kubushyn <ksi(a)koi8.net> +# +# Visioneering Corp. Sonata board (ARM926EJS) cpu +# +# Sonata board has 1 bank of 128 MB DDR RAM +# Physical Address: +# 8000'0000 to 8800'0000 +# +# Razorstream, LLC. SCHMOOGIE board (ARM926EJS) cpu +# +# Schmoogie board has 1 bank of 128 MB DDR RAM +# Physical Address: +# 8000'0000 to 8800'0000 +# +# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 +# (mem base + reserved) +# +# we load ourself to 8108 '0000 +# +# + +#Provide at least 16MB spacing between us and the Linux Kernel image +TEXT_BASE = 0x81080000 diff --git a/board/davinci/dm357_evm/dm357_evm.c b/board/davinci/dm357_evm/dm357_evm.c new file mode 100644 index 0000000..d769b74 --- /dev/null +++ b/board/davinci/dm357_evm/dm357_evm.c @@ -0,0 +1,69 @@ +/* + * + * Copyright (C) 2009 Texas Instruments. + * + * ---------------------------------------------------------------------------- + * 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 <i2c.h> +#include <asm/arch/hardware.h> +#include "../common/psc.h" +#include "../common/misc.h" + +DECLARE_GLOBAL_DATA_PTR; + +int board_init(void) +{ + /* arch number of the board */ + gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_DM357_EVM; + + /* address of boot parameters */ + gd->bd->bi_boot_params = (DAVINCI_DDR_BASE + 0x100); + + davinci_errata_workarounds(); + + /* Power on required peripherals */ + lpsc_on(DAVINCI_LPSC_GPIO); + lpsc_on(DAVINCI_LPSC_USB); + + davinci_enable_uart0(); + davinci_enable_emac(); + davinci_enable_i2c(); + + lpsc_on(DAVINCI_LPSC_TIMER1); + + return 0; +} + +int misc_init_r(void) +{ + uint8_t video_mode; + + /* DM357 EVM has a jumper to decide between + * NTSC and PAL modes. This jumper is read + * and the value stored in videostd + * This can then be used in the bootargs to pass + * information to the driver + */ + i2c_read(0x39, 0x00, 1, &video_mode, 1); + + setenv("videostd", ((video_mode & 0x80) ? "pal" : "ntsc")); + + return 0; +} + diff --git a/include/configs/davinci_dm357_evm.h b/include/configs/davinci_dm357_evm.h new file mode 100644 index 0000000..96a7bda --- /dev/null +++ b/include/configs/davinci_dm357_evm.h @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2009 Texas Instruments + * + * 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/hardware.h> + +/* + * + */ +#define DM357_EVM +#define CONFIG_SYS_NAND_SMALLPAGE +#define CONFIG_SYS_USE_NAND +/* + * SoC Configuration + */ +#define CONFIG_ARM926EJS /* arm926ejs CPU core */ +#define CONFIG_SYS_CLK_FREQ 270000000 +#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE +#define CONFIG_SYS_HZ_CLOCK 27000000 /* timer frequency */ +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SOC_DM644X +/* + * definitions for EEPROM on DM357 EVM + */ +#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 0x30000 +#define CONFIG_SYS_GBL_DATA_SIZE 128 +#define CONFIG_SYS_MEMTEST_START DAVINCI_DDR_BASE +#define CONFIG_SYS_MEMTEST_END (DAVINCI_DDR_BASE + 0x1000000) +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_STACKSIZE 0x40000 +#define PHYS_SDRAM_1 DAVINCI_DDR_BASE +#define PHYS_SDRAM_1_SIZE (DAVINCI_DDR_BASE + 0x10000000) +#define DDR_8BANKS +/* + * Serial Driver info + */ +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE -4 +#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE +#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_HZ_CLOCK +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SOC_DM644X +/* + * definitions for EEPROM on DM357 EVM + */ +#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 0x30000 +#define CONFIG_SYS_GBL_DATA_SIZE 128 +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ +#define CONFIG_STACKSIZE /* Input clock */ +#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 80000 +#define CONFIG_SYS_I2C_SLAVE 10 +/* + * Flash & Environment + */ +#ifdef CONFIG_SYS_USE_NAND +#define CONFIG_NAND_DAVINCI +#undef CONFIG_ENV_IS_IN_FLASH +#define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ +#ifdef CONFIG_SYS_NAND_SMALLPAGE +#define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_16K +#else +#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_128K +#endif +#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ +#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE0_BASE +#define CONFIG_SYS_NAND_HW_ECC +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_ENV_OFFSET 0x0 +#endif +/* + * U-Boot general configuration + */ +#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ +#define CONFIG_MISC_INIT_R +#undef CONFIG_BOOTDELAY +#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_SYS_PROMPT "DM357 EVM > " /* Command Prompt */ +#define CONFIG_SYS_CBSIZE 1024 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#define CONFIG_SYS_LOAD_ADDR 0x80700000 +#define CONFIG_VERSION_VARIABLE +#define CONFIG_CMDLINE_EDITING +/* + * Linux Information + */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +/* + * U-Boot commands + */ +#include <config_cmd_default.h> +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_SAVES +#define CONFIG_CMD_EEPROM +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS +#define CONFIG_CMD_NAND +#define CONFIG_CMD_JFFS2 +#endif /* __CONFIG_H */ -- 1.6.0.4

1 0

[U-Boot] [PATCH v4] ARM DaVinci Adding DM357 Support
by s-paulraj＠ti.com 09 May '09

09 May '09

Patch adds Support for DaVinci DM357. It boots of a small page NAND on the EVM. It does not have NOR support. This patch has been tested on the DM357 EVM. The patch does not have Ethernet Support yet. Ethernet Support will be added soon Signed-off-by: Sandeep Paulraj <s-paulraj(a)ti.com> --- Makefile | 3 + board/davinci/dm357_evm/Makefile | 50 ++++++++++++ board/davinci/dm357_evm/config.mk | 39 +++++++++ board/davinci/dm357_evm/dm357_evm.c | 69 ++++++++++++++++ include/configs/davinci_dm357_evm.h | 146 +++++++++++++++++++++++++++++++++++ 5 files changed, 307 insertions(+), 0 deletions(-) create mode 100644 board/davinci/dm357_evm/Makefile create mode 100644 board/davinci/dm357_evm/config.mk create mode 100644 board/davinci/dm357_evm/dm357_evm.c create mode 100644 include/configs/davinci_dm357_evm.h diff --git a/Makefile b/Makefile index 137c88f..6ee0562 100644 --- a/Makefile +++ b/Makefile @@ -2790,6 +2790,9 @@ davinci_sffsdr_config : unconfig davinci_sonata_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci +davinci_dm357_evm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm357_evm davinci davinci + lpd7a400_config \ lpd7a404_config: unconfig @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x diff --git a/board/davinci/dm357_evm/Makefile b/board/davinci/dm357_evm/Makefile new file mode 100644 index 0000000..b10da38 --- /dev/null +++ b/board/davinci/dm357_evm/Makefile @@ -0,0 +1,50 @@ +# +# (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 := dm357_evm.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(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/dm357_evm/config.mk b/board/davinci/dm357_evm/config.mk new file mode 100644 index 0000000..aa89d0e --- /dev/null +++ b/board/davinci/dm357_evm/config.mk @@ -0,0 +1,39 @@ +# +# (C) Copyright 2002 +# Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> +# David Mueller, ELSOFT AG, <d.mueller(a)elsoft.ch> +# +# (C) Copyright 2003 +# Texas Instruments, <www.ti.com> +# Swaminathan <swami.iyer(a)ti.com> +# +# Davinci EVM board (ARM925EJS) cpu +# see http://www.ti.com/ for more information on Texas Instruments +# +# Davinci EVM has 1 bank of 256 MB DDR RAM +# Physical Address: +# 8000'0000 to 9000'0000 +# +# Copyright (C) 2007 Sergey Kubushyn <ksi(a)koi8.net> +# +# Visioneering Corp. Sonata board (ARM926EJS) cpu +# +# Sonata board has 1 bank of 128 MB DDR RAM +# Physical Address: +# 8000'0000 to 8800'0000 +# +# Razorstream, LLC. SCHMOOGIE board (ARM926EJS) cpu +# +# Schmoogie board has 1 bank of 128 MB DDR RAM +# Physical Address: +# 8000'0000 to 8800'0000 +# +# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 +# (mem base + reserved) +# +# we load ourself to 8108 '0000 +# +# + +#Provide at least 16MB spacing between us and the Linux Kernel image +TEXT_BASE = 0x81080000 diff --git a/board/davinci/dm357_evm/dm357_evm.c b/board/davinci/dm357_evm/dm357_evm.c new file mode 100644 index 0000000..0d2f715 --- /dev/null +++ b/board/davinci/dm357_evm/dm357_evm.c @@ -0,0 +1,69 @@ +/* + * + * Copyright (C) 2009 Texas Instruments. + * + * ---------------------------------------------------------------------------- + * 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 <i2c.h> +#include <asm/arch/hardware.h> +#include "../common/psc.h" +#include "../common/misc.h" + +DECLARE_GLOBAL_DATA_PTR; + +int board_init(void) +{ + /* arch number of the board */ + gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_DM357_EVM; + + /* address of boot parameters */ + gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100); + + davinci_errata_workarounds(); + + /* Power on required peripherals */ + lpsc_on(DAVINCI_LPSC_GPIO); + lpsc_on(DAVINCI_LPSC_USB); + + davinci_enable_uart0(); + davinci_enable_emac(); + davinci_enable_i2c(); + + lpsc_on(DAVINCI_LPSC_TIMER1); + + return 0; +} + +int misc_init_r(void) +{ + uint8_t video_mode; + + /* DM357 EVM has a jumper to decide between + * NTSC and PAL modes. This jumper is read + * and the value stored in videostd + * This can then be used in the bootargs to pass + * information to the driver + */ + i2c_read(0x39, 0x00, 1, &video_mode, 1); + + setenv("videostd", ((video_mode & 0x80) ? "pal" : "ntsc")); + + return 0; +} + diff --git a/include/configs/davinci_dm357_evm.h b/include/configs/davinci_dm357_evm.h new file mode 100644 index 0000000..32c3b90 --- /dev/null +++ b/include/configs/davinci_dm357_evm.h @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2009 Texas Instruments + * + * 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> + +/* + * + */ +#define DM357_EVM +#define CONFIG_SYS_NAND_SMALLPAGE +#define CONFIG_SYS_USE_NAND +/* + * SoC Configuration + */ +#define CONFIG_ARM926EJS /* arm926ejs CPU core */ +#define CONFIG_SYS_CLK_FREQ 270000000 /* Arm Clock frequency */ +#define CONFIG_SYS_TIMERBASE 0x01c21400 /* use timer 0 */ +#define CONFIG_SYS_HZ_CLOCK 27000000 /* timer frequency */ +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SOC_DM644X +/* + * definitions for EEPROM on DM357 EVM + */ +#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 (0x10000 + 128 * 1024) +#define CONFIG_SYS_GBL_DATA_SIZE 128 +#define CONFIG_SYS_MEMTEST_START 0x80000000 /* memtest start */ +#define CONFIG_SYS_MEMTEST_END 0x81000000 /* 16MB RAM test */ +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ +#define CONFIG_STACKSIZE (256 * 1024) /* regular stack */ +#define PHYS_SDRAM_1 0x80000000 /* DDR Start */ +#define PHYS_SDRAM_1_SIZE 0x10000000 /* DDR size 256MB */ +#define DDR_8BANKS /* 8-bank DDR2 (256MB) */ +/* + * 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 /* Base address of UART0 */ +#define CONFIG_SYS_NS16550_CLK 27000000 /* Input clock */ +#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 80000 +#define CONFIG_SYS_I2C_SLAVE 10 +/* + * Flash & Environment + */ +#ifdef CONFIG_SYS_USE_NAND +#define CONFIG_NAND_DAVINCI +#undef CONFIG_ENV_IS_IN_FLASH +#define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ +#ifdef CONFIG_SYS_NAND_SMALLPAGE +#define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_16K +#else +#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ +#define CONFIG_ENV_SIZE SZ_128K +#endif +#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ +#define CONFIG_SYS_NAND_BASE 0x02000000 +#define CONFIG_SYS_NAND_HW_ECC +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_ENV_OFFSET 0x0 +#endif +/* + * U-Boot general configuration + */ +#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ +#define CONFIG_MISC_INIT_R +#undef CONFIG_BOOTDELAY +#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_SYS_PROMPT "DM357 EVM > " /* Command Prompt */ +#define CONFIG_SYS_CBSIZE 1024 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#define CONFIG_SYS_LOAD_ADDR 0x80700000 +#define CONFIG_VERSION_VARIABLE +#define CONFIG_CMDLINE_EDITING +/* + * Linux Information + */ +#define LINUX_BOOT_PARAM_ADDR 0x80000100 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +/* + * U-Boot commands + */ +#include <config_cmd_default.h> +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_SAVES +#define CONFIG_CMD_EEPROM +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS +#define CONFIG_CMD_NAND +#define CONFIG_CMD_JFFS2 +/* + * KGDB support (if any) + */ +#ifdef CONFIG_CMD_KGDB +#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ +#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ +#endif +#endif /* __CONFIG_H */ -- 1.6.0.4

3 2

[U-Boot] TICKET NO: 1110008342
by Dell Mailing Headquarter 09 May '09

09 May '09

-- Get back to us for a lump sum pay out of £750,000 pounds sterlings.Provide us with your:Name:Address:Sex for more details:(uk_dell@btinternet.com)

1 0

[U-Boot] [PATCH 3/6] OMAP3 Port kernel omap gpio interface.
by Tom Rix 09 May '09

09 May '09

Port version 2.6.27 of the linux kernel's omap gpio interface to u-boot. The orignal source is in linux/arch/arm/plat-omap/gpio.c See doc/README.omap3 for instructions on use. Signed-off-by: Tom Rix <Tom.Rix(a)windriver.com> --- cpu/arm_cortexa8/omap3/Makefile | 1 + cpu/arm_cortexa8/omap3/gpio.c | 185 +++++++++++++++++++++++++++++++++++++ doc/README.omap3 | 32 +++++++ include/asm-arm/arch-omap3/gpio.h | 86 +++++++++++++++++ 4 files changed, 304 insertions(+), 0 deletions(-) create mode 100644 cpu/arm_cortexa8/omap3/gpio.c create mode 100644 include/asm-arm/arch-omap3/gpio.h diff --git a/cpu/arm_cortexa8/omap3/Makefile b/cpu/arm_cortexa8/omap3/Makefile index edf5cb2..50176ee 100644 --- a/cpu/arm_cortexa8/omap3/Makefile +++ b/cpu/arm_cortexa8/omap3/Makefile @@ -29,6 +29,7 @@ SOBJS := lowlevel_init.o COBJS += board.o COBJS += clock.o +COBJS += gpio.o COBJS += mem.o COBJS += syslib.o COBJS += sys_info.o diff --git a/cpu/arm_cortexa8/omap3/gpio.c b/cpu/arm_cortexa8/omap3/gpio.c new file mode 100644 index 0000000..aeb6066 --- /dev/null +++ b/cpu/arm_cortexa8/omap3/gpio.c @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2009 Wind River Systems, Inc. + * Tom Rix <Tom.Rix(a)windriver.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 + * + * This work is derived from the linux 2.6.27 kernel source + * To fetch, use the kernel repository + * git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git + * Use the v2.6.27 tag. + * + * Below is the original's header including its copyright + * + * linux/arch/arm/plat-omap/gpio.c + * + * Support functions for OMAP GPIO + * + * Copyright (C) 2003-2005 Nokia Corporation + * Written by Juha Yrjölä <juha.yrjola(a)nokia.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include <common.h> +#include <asm/arch/gpio.h> +#include <asm/io.h> +#include <asm/errno.h> + +static struct gpio_bank gpio_bank_34xx[6] = { + { (void *)OMAP34XX_GPIO1_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP34XX_GPIO2_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP34XX_GPIO3_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP34XX_GPIO4_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP34XX_GPIO5_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP34XX_GPIO6_BASE, METHOD_GPIO_24XX }, +}; + +static struct gpio_bank *gpio_bank = &gpio_bank_34xx[0]; + +static inline struct gpio_bank *get_gpio_bank(int gpio) +{ + return &gpio_bank[gpio >> 5]; +} + +static inline int get_gpio_index(int gpio) +{ + return gpio & 0x1f; +} + +static inline int gpio_valid(int gpio) +{ + if (gpio < 0) + return -1; + if (gpio < 192) + return 0; + return -1; +} + +static int check_gpio(int gpio) +{ + if (gpio_valid(gpio) < 0) { + printf("ERROR : check_gpio: invalid GPIO %d\n", gpio); + return -1; + } + return 0; +} + +static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input) +{ + void *reg = bank->base; + u32 l; + + switch (bank->method) { + case METHOD_GPIO_24XX: + reg += OMAP24XX_GPIO_OE; + break; + default: + return; + } + l = __raw_readl(reg); + if (is_input) + l |= 1 << gpio; + else + l &= ~(1 << gpio); + __raw_writel(l, reg); +} + +void omap_set_gpio_direction(int gpio, int is_input) +{ + struct gpio_bank *bank; + + if (check_gpio(gpio) < 0) + return; + bank = get_gpio_bank(gpio); + _set_gpio_direction(bank, get_gpio_index(gpio), is_input); +} + +static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) +{ + void *reg = bank->base; + u32 l = 0; + + switch (bank->method) { + case METHOD_GPIO_24XX: + if (enable) + reg += OMAP24XX_GPIO_SETDATAOUT; + else + reg += OMAP24XX_GPIO_CLEARDATAOUT; + l = 1 << gpio; + break; + default: + printf("omap3-gpio unknown bank method %s %d\n", + __FILE__, __LINE__); + return; + } + __raw_writel(l, reg); +} + +void omap_set_gpio_dataout(int gpio, int enable) +{ + struct gpio_bank *bank; + + if (check_gpio(gpio) < 0) + return; + bank = get_gpio_bank(gpio); + _set_gpio_dataout(bank, get_gpio_index(gpio), enable); +} + +int omap_get_gpio_datain(int gpio) +{ + struct gpio_bank *bank; + void *reg; + + if (check_gpio(gpio) < 0) + return -EINVAL; + bank = get_gpio_bank(gpio); + reg = bank->base; + switch (bank->method) { + case METHOD_GPIO_24XX: + reg += OMAP24XX_GPIO_DATAIN; + break; + default: + return -EINVAL; + } + return (__raw_readl(reg) + & (1 << get_gpio_index(gpio))) != 0; +} + +static void _reset_gpio(struct gpio_bank *bank, int gpio) +{ + _set_gpio_direction(bank, get_gpio_index(gpio), 1); +} + +int omap_request_gpio(int gpio) +{ + if (check_gpio(gpio) < 0) + return -EINVAL; + + return 0; +} + +void omap_free_gpio(int gpio) +{ + struct gpio_bank *bank; + + if (check_gpio(gpio) < 0) + return; + bank = get_gpio_bank(gpio); + + _reset_gpio(bank, gpio); +} diff --git a/doc/README.omap3 b/doc/README.omap3 index 9ab0979..e05e816 100644 --- a/doc/README.omap3 +++ b/doc/README.omap3 @@ -84,6 +84,38 @@ For all other commands see help +Interfaces +========== + +gpio + +To set a bit : + + if (!omap_request_gpio(N)) { + omap_set_gpio_direction(N, 0); + omap_set_gpio_dataout(N, 1); + } + +To clear a bit : + + if (!omap_request_gpio(N)) { + omap_set_gpio_direction(N, 0); + omap_set_gpio_dataout(N, 0); + } + +To read a bit : + + if (!omap_request_gpio(N)) { + omap_set_gpio_direction(NULL, 1); + val = omap_get_gpio_datain(N); + omap_free_gpio(N); + } + if (val) + printf("GPIO N is set\n"); + else + printf("GPIO N is clear\n"); + + Acknowledgements ================ diff --git a/include/asm-arm/arch-omap3/gpio.h b/include/asm-arm/arch-omap3/gpio.h new file mode 100644 index 0000000..30f633c --- /dev/null +++ b/include/asm-arm/arch-omap3/gpio.h @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2009 Wind River Systems, Inc. + * Tom Rix <Tom.Rix(a)windriver.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 + * + * This work is derived from the linux 2.6.27 kernel source + * To fetch, use the kernel repository + * git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git + * Use the v2.6.27 tag. + * + * Below is the original's header including its copyright + * + * linux/arch/arm/plat-omap/gpio.c + * + * Support functions for OMAP GPIO + * + * Copyright (C) 2003-2005 Nokia Corporation + * Written by Juha Yrjölä <juha.yrjola(a)nokia.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef _GPIO_H +#define _GPIO_H + +#define OMAP24XX_GPIO_REVISION 0x0000 +#define OMAP24XX_GPIO_SYSCONFIG 0x0010 +#define OMAP24XX_GPIO_SYSSTATUS 0x0014 +#define OMAP24XX_GPIO_IRQSTATUS1 0x0018 +#define OMAP24XX_GPIO_IRQSTATUS2 0x0028 +#define OMAP24XX_GPIO_IRQENABLE2 0x002c +#define OMAP24XX_GPIO_IRQENABLE1 0x001c +#define OMAP24XX_GPIO_WAKE_EN 0x0020 +#define OMAP24XX_GPIO_CTRL 0x0030 +#define OMAP24XX_GPIO_OE 0x0034 +#define OMAP24XX_GPIO_DATAIN 0x0038 +#define OMAP24XX_GPIO_DATAOUT 0x003c +#define OMAP24XX_GPIO_LEVELDETECT0 0x0040 +#define OMAP24XX_GPIO_LEVELDETECT1 0x0044 +#define OMAP24XX_GPIO_RISINGDETECT 0x0048 +#define OMAP24XX_GPIO_FALLINGDETECT 0x004c +#define OMAP24XX_GPIO_DEBOUNCE_EN 0x0050 +#define OMAP24XX_GPIO_DEBOUNCE_VAL 0x0054 +#define OMAP24XX_GPIO_CLEARIRQENABLE1 0x0060 +#define OMAP24XX_GPIO_SETIRQENABLE1 0x0064 +#define OMAP24XX_GPIO_CLEARWKUENA 0x0080 +#define OMAP24XX_GPIO_SETWKUENA 0x0084 +#define OMAP24XX_GPIO_CLEARDATAOUT 0x0090 +#define OMAP24XX_GPIO_SETDATAOUT 0x0094 + +struct gpio_bank { + void *base; + int method; +}; + +#define METHOD_GPIO_24XX 4 + +/* This is the interface */ + +/* Request a gpio before using it */ +int omap_request_gpio(int gpio); +/* Reset and free a gpio after using it */ +void omap_free_gpio(int gpio); +/* Sets the gpio as input or output */ +void omap_set_gpio_direction(int gpio, int is_input); +/* Set or clear a gpio output */ +void omap_set_gpio_dataout(int gpio, int enable); +/* Get the value of a gpio input */ +int omap_get_gpio_datain(int gpio); + +#endif /* _GPIO_H_ */ -- 1.6.0.5

2 1

[U-Boot] [PATCH] arm: unify lds
by Jean-Christophe PLAGNIOL-VILLARD 09 May '09

09 May '09

all arm boards except a few use the same cpu lds so move it to cpu/$(CPU) that could be overwrite in following order SOC BOARD via the corresponding config.mk Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- Due to ML limitation I've reduce the content of the patch to show only the Copyright of the removed file btw all copyrights have been respected and now merged in the final lds Best Regards, J. arm_config.mk | 2 + board/actux1/config.mk | 2 + board/actux2/config.mk | 2 + board/actux3/config.mk | 2 + board/actux4/u-boot.lds | 66 ---------------------- board/armadillo/u-boot.lds | 55 ------------------ board/armltd/integratorap/config.mk | 6 -- board/armltd/integratorap/split_by_variant.sh | 4 - board/armltd/integratorap/u-boot.lds.template | 53 ----------------- board/armltd/integratorcp/config.mk | 6 -- board/armltd/integratorcp/split_by_variant.sh | 4 - board/armltd/integratorcp/u-boot.lds.template | 53 ----------------- board/armltd/versatile/u-boot.lds | 51 ----------------- board/atmel/at91rm9200dk/u-boot.lds | 57 ------------------- board/atmel/at91rm9200ek/u-boot.lds | 56 ------------------ board/cerf250/u-boot.lds | 56 ------------------ board/cm4008/u-boot.lds | 56 ------------------ board/cm41xx/u-boot.lds | 56 ------------------ board/cmc_pu2/u-boot.lds | 57 ------------------- board/cradle/u-boot.lds | 56 ------------------ board/csb226/u-boot.lds | 56 ------------------ board/csb637/u-boot.lds | 56 ------------------ board/dave/B2/u-boot.lds | 58 ------------------- board/davedenx/qong/u-boot.lds | 58 ------------------- board/delta/u-boot.lds | 56 ------------------ board/dnp1110/u-boot.lds | 56 ------------------ board/ep7312/u-boot.lds | 56 ------------------ board/evb4510/u-boot.lds | 69 ----------------------- board/freescale/mx31ads/config.mk | 2 + board/gcplus/u-boot.lds | 58 ------------------- board/impa7/u-boot.lds | 56 ------------------ board/imx31_litekit/u-boot.lds | 59 ------------------- board/imx31_phycore/u-boot.lds | 59 ------------------- board/innokom/u-boot.lds | 56 ------------------ board/kb9202/u-boot.lds | 56 ------------------ board/lart/u-boot.lds | 56 ------------------ board/logodl/u-boot.lds | 56 ------------------ board/lpc2292sodimm/u-boot.lds | 55 ------------------ board/lubbock/u-boot.lds | 56 ------------------ board/m501sk/u-boot.lds | 55 ------------------ board/modnet50/u-boot.lds | 69 ----------------------- board/mp2usb/u-boot.lds | 56 ------------------ board/mpl/vcma9/u-boot.lds | 57 ------------------- board/mx1ads/u-boot.lds | 58 ------------------- board/netstar/u-boot.lds | 55 ------------------ board/ns9750dev/u-boot.lds | 59 ------------------- board/omap1510inn/u-boot.lds | 57 ------------------- board/omap2420h4/u-boot.lds | 59 ------------------- board/pleb2/u-boot.lds | 56 ------------------ board/prodrive/pdnb3/u-boot.lds | 56 ------------------ board/samsung/smdk2400/u-boot.lds | 57 ------------------- board/samsung/smdk2410/u-boot.lds | 57 ------------------- board/samsung/smdk6400/config.mk | 2 + board/sbc2410x/u-boot.lds | 56 ------------------ board/shannon/u-boot.lds | 56 ------------------ board/siemens/SMN42/u-boot.lds | 55 ------------------ board/sx1/u-boot.lds | 57 ------------------- board/trab/config.mk | 2 + board/trizepsiv/u-boot.lds | 56 ------------------ board/voiceblue/u-boot.lds | 56 ------------------ board/wepep250/u-boot.lds | 56 ------------------ board/xaeniax/u-boot.lds | 56 ------------------ board/xsengine/u-boot.lds | 56 ------------------ board/zylonite/u-boot.lds | 56 ------------------ {board/apollon => cpu/arm1136}/u-boot.lds | 5 +- {board/omap5912osk => cpu/arm1176}/u-boot.lds | 10 ++- {board/scb9328 => cpu/arm720t}/u-boot.lds | 7 +- {board/xm250 => cpu/arm920t}/u-boot.lds | 14 ++++- {board/lpd7a40x => cpu/arm925t}/u-boot.lds | 10 ++- cpu/arm926ejs/at91/config.mk | 1 - cpu/arm926ejs/at91/u-boot.lds | 57 ------------------- cpu/arm926ejs/davinci/config.mk | 2 - {board/st/nmdk8815 => cpu/arm926ejs}/u-boot.lds | 9 ++- cpu/{arm926ejs/davinci => arm946es}/u-boot.lds | 10 ++- cpu/arm_cortexa8/omap3/config.mk | 2 - cpu/arm_cortexa8/{omap3 => }/u-boot.lds | 0 {board/omap1610inn => cpu/arm_intcm}/u-boot.lds | 10 ++- {board/ixdp425 => cpu/ixp}/u-boot.lds | 8 +- {board/omap730p2 => cpu/lh7a40x}/u-boot.lds | 10 ++- {board/pxa255_idp => cpu/pxa}/u-boot.lds | 6 +- {board/mx1fs2 => cpu/s3c44b0}/u-boot.lds | 5 +- {board/assabet => cpu/sa1100}/u-boot.lds | 7 +- 82 files changed, 85 insertions(+), 3137 deletions(-) delete mode 100644 board/actux4/u-boot.lds delete mode 100644 board/armadillo/u-boot.lds delete mode 100644 board/armltd/integratorap/u-boot.lds.template delete mode 100644 board/armltd/integratorcp/u-boot.lds.template delete mode 100644 board/armltd/versatile/u-boot.lds delete mode 100644 board/atmel/at91rm9200dk/u-boot.lds delete mode 100644 board/atmel/at91rm9200ek/u-boot.lds delete mode 100644 board/cerf250/u-boot.lds delete mode 100644 board/cm4008/u-boot.lds delete mode 100644 board/cm41xx/u-boot.lds delete mode 100644 board/cmc_pu2/u-boot.lds delete mode 100644 board/cradle/u-boot.lds delete mode 100644 board/csb226/u-boot.lds delete mode 100644 board/csb637/u-boot.lds delete mode 100644 board/dave/B2/u-boot.lds delete mode 100644 board/davedenx/qong/u-boot.lds delete mode 100644 board/delta/u-boot.lds delete mode 100644 board/dnp1110/u-boot.lds delete mode 100644 board/ep7312/u-boot.lds delete mode 100644 board/evb4510/u-boot.lds delete mode 100644 board/gcplus/u-boot.lds delete mode 100644 board/impa7/u-boot.lds delete mode 100644 board/imx31_litekit/u-boot.lds delete mode 100644 board/imx31_phycore/u-boot.lds delete mode 100644 board/innokom/u-boot.lds delete mode 100644 board/kb9202/u-boot.lds delete mode 100644 board/lart/u-boot.lds delete mode 100644 board/logodl/u-boot.lds delete mode 100644 board/lpc2292sodimm/u-boot.lds delete mode 100644 board/lubbock/u-boot.lds delete mode 100644 board/m501sk/u-boot.lds delete mode 100644 board/modnet50/u-boot.lds delete mode 100644 board/mp2usb/u-boot.lds delete mode 100644 board/mpl/vcma9/u-boot.lds delete mode 100644 board/mx1ads/u-boot.lds delete mode 100644 board/netstar/u-boot.lds delete mode 100644 board/ns9750dev/u-boot.lds delete mode 100644 board/omap1510inn/u-boot.lds delete mode 100644 board/omap2420h4/u-boot.lds delete mode 100644 board/pleb2/u-boot.lds delete mode 100644 board/prodrive/pdnb3/u-boot.lds delete mode 100644 board/samsung/smdk2400/u-boot.lds delete mode 100644 board/samsung/smdk2410/u-boot.lds delete mode 100644 board/sbc2410x/u-boot.lds delete mode 100644 board/shannon/u-boot.lds delete mode 100644 board/siemens/SMN42/u-boot.lds delete mode 100644 board/sx1/u-boot.lds delete mode 100644 board/trizepsiv/u-boot.lds delete mode 100644 board/voiceblue/u-boot.lds delete mode 100644 board/wepep250/u-boot.lds delete mode 100644 board/xaeniax/u-boot.lds delete mode 100644 board/xsengine/u-boot.lds delete mode 100644 board/zylonite/u-boot.lds rename {board/apollon => cpu/arm1136}/u-boot.lds (94%) rename {board/omap5912osk => cpu/arm1176}/u-boot.lds (96%) rename {board/scb9328 => cpu/arm720t}/u-boot.lds (92%) rename {board/xm250 => cpu/arm920t}/u-boot.lds (84%) rename {board/lpd7a40x => cpu/arm925t}/u-boot.lds (91%) delete mode 100644 cpu/arm926ejs/at91/u-boot.lds rename {board/st/nmdk8815 => cpu/arm926ejs}/u-boot.lds (96%) rename cpu/{arm926ejs/davinci => arm946es}/u-boot.lds (96%) rename cpu/arm_cortexa8/{omap3 => }/u-boot.lds (100%) rename {board/omap1610inn => cpu/arm_intcm}/u-boot.lds (96%) rename {board/ixdp425 => cpu/ixp}/u-boot.lds (94%) rename {board/omap730p2 => cpu/lh7a40x}/u-boot.lds (96%) rename {board/pxa255_idp => cpu/pxa}/u-boot.lds (96%) rename {board/mx1fs2 => cpu/s3c44b0}/u-boot.lds (96%) rename {board/assabet => cpu/sa1100}/u-boot.lds (95%) diff --git a/arm_config.mk b/arm_config.mk index 73d9625..c4cf99d 100644 --- a/arm_config.mk +++ b/arm_config.mk @@ -22,3 +22,5 @@ # PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ + +LDSCRIPT := $(SRCTREE)/cpu/$(CPU)/u-boot.lds diff --git a/board/actux1/config.mk b/board/actux1/config.mk index 9a634cd..119140d 100644 --- a/board/actux1/config.mk +++ b/board/actux1/config.mk @@ -2,3 +2,5 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a + +LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux2/config.mk b/board/actux2/config.mk index 9a634cd..119140d 100644 --- a/board/actux2/config.mk +++ b/board/actux2/config.mk @@ -2,3 +2,5 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a + +LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux3/config.mk b/board/actux3/config.mk index 9a634cd..119140d 100644 --- a/board/actux3/config.mk +++ b/board/actux3/config.mk @@ -2,3 +2,5 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a + +LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux4/u-boot.lds b/board/actux4/u-boot.lds deleted file mode 100644 index 10a5da9..0000000 --- a/board/actux4/u-boot.lds +++ /dev/null @@ -1,66 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/armadillo/u-boot.lds b/board/armadillo/u-boot.lds deleted file mode 100644 index cb5a3ba..0000000 --- a/board/armadillo/u-boot.lds +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/armltd/integratorap/config.mk b/board/armltd/integratorap/config.mk index e4c5c3b..25b79b3 100644 --- a/board/armltd/integratorap/config.mk +++ b/board/armltd/integratorap/config.mk @@ -3,9 +3,3 @@ # TEXT_BASE = 0x01000000 - -ifneq ($(OBJTREE),$(SRCTREE)) -# We are building u-boot in a separate directory, use generated -# .lds script from OBJTREE directory. -LDSCRIPT := $(OBJTREE)/board/$(BOARDDIR)/u-boot.lds -endif diff --git a/board/armltd/integratorap/split_by_variant.sh b/board/armltd/integratorap/split_by_variant.sh index 2c9fe2e..2f86b52 100755 --- a/board/armltd/integratorap/split_by_variant.sh +++ b/board/armltd/integratorap/split_by_variant.sh @@ -120,10 +120,6 @@ mkdir -p ${obj}include mkdir -p ${obj}board/armltd/integratorap mv tmp.fil ${obj}include/config.h # --------------------------------------------------------- -# Ensure correct core object loaded first in U-Boot image -# --------------------------------------------------------- -sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/armltd/integratorap/u-boot.lds.template > ${obj}board/armltd/integratorap/u-boot.lds -# --------------------------------------------------------- # Complete the configuration # --------------------------------------------------------- $MKCONFIG -a integratorap arm $cpu integratorap armltd; diff --git a/board/armltd/integratorap/u-boot.lds.template b/board/armltd/integratorap/u-boot.lds.template deleted file mode 100644 index 0ec8087..0000000 --- a/board/armltd/integratorap/u-boot.lds.template +++ /dev/null @@ -1,53 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/armltd/integratorcp/config.mk b/board/armltd/integratorcp/config.mk index e4c5c3b..25b79b3 100644 --- a/board/armltd/integratorcp/config.mk +++ b/board/armltd/integratorcp/config.mk @@ -3,9 +3,3 @@ # TEXT_BASE = 0x01000000 - -ifneq ($(OBJTREE),$(SRCTREE)) -# We are building u-boot in a separate directory, use generated -# .lds script from OBJTREE directory. -LDSCRIPT := $(OBJTREE)/board/$(BOARDDIR)/u-boot.lds -endif diff --git a/board/armltd/integratorcp/split_by_variant.sh b/board/armltd/integratorcp/split_by_variant.sh index 34422fd..13effef 100755 --- a/board/armltd/integratorcp/split_by_variant.sh +++ b/board/armltd/integratorcp/split_by_variant.sh @@ -103,10 +103,6 @@ mkdir -p ${obj}include mkdir -p ${obj}board/armltd/integratorcp mv tmp.fil ${obj}include/config.h # --------------------------------------------------------- -# Ensure correct core object loaded first in U-Boot image -# --------------------------------------------------------- -sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/armltd/integratorcp/u-boot.lds.template > ${obj}board/armltd/integratorcp/u-boot.lds -# --------------------------------------------------------- # Complete the configuration # --------------------------------------------------------- $MKCONFIG -a integratorcp arm $cpu integratorcp armltd; diff --git a/board/armltd/integratorcp/u-boot.lds.template b/board/armltd/integratorcp/u-boot.lds.template deleted file mode 100644 index 0ec8087..0000000 --- a/board/armltd/integratorcp/u-boot.lds.template +++ /dev/null @@ -1,53 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/armltd/versatile/u-boot.lds b/board/armltd/versatile/u-boot.lds deleted file mode 100644 index 48c2613..0000000 --- a/board/armltd/versatile/u-boot.lds +++ /dev/null @@ -1,51 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/atmel/at91rm9200dk/u-boot.lds b/board/atmel/at91rm9200dk/u-boot.lds deleted file mode 100644 index 33363c2..0000000 --- a/board/atmel/at91rm9200dk/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/atmel/at91rm9200ek/u-boot.lds b/board/atmel/at91rm9200ek/u-boot.lds deleted file mode 100644 index 045e849..0000000 --- a/board/atmel/at91rm9200ek/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/cerf250/u-boot.lds b/board/cerf250/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/cerf250/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/cm4008/u-boot.lds b/board/cm4008/u-boot.lds deleted file mode 100644 index e96c45f..0000000 --- a/board/cm4008/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/cm41xx/u-boot.lds b/board/cm41xx/u-boot.lds deleted file mode 100644 index e96c45f..0000000 --- a/board/cm41xx/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/cmc_pu2/u-boot.lds b/board/cmc_pu2/u-boot.lds deleted file mode 100644 index 33363c2..0000000 --- a/board/cmc_pu2/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/cradle/u-boot.lds b/board/cradle/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/cradle/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/csb226/u-boot.lds b/board/csb226/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/csb226/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/csb637/u-boot.lds b/board/csb637/u-boot.lds deleted file mode 100644 index 3eae0e2..0000000 --- a/board/csb637/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/dave/B2/u-boot.lds b/board/dave/B2/u-boot.lds deleted file mode 100644 index 1690b6e..0000000 --- a/board/dave/B2/u-boot.lds +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/davedenx/qong/u-boot.lds b/board/davedenx/qong/u-boot.lds deleted file mode 100644 index 04e0642..0000000 --- a/board/davedenx/qong/u-boot.lds +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (C) Copyright 2009 - * Ilya Yanok, Emcraft Systems Ltd, <yanok(a)emcraft.com> - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * diff --git a/board/delta/u-boot.lds b/board/delta/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/delta/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/dnp1110/u-boot.lds b/board/dnp1110/u-boot.lds deleted file mode 100644 index 13b7bb7..0000000 --- a/board/dnp1110/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/ep7312/u-boot.lds b/board/ep7312/u-boot.lds deleted file mode 100644 index 8c9f624..0000000 --- a/board/ep7312/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/evb4510/u-boot.lds b/board/evb4510/u-boot.lds deleted file mode 100644 index b72e126..0000000 --- a/board/evb4510/u-boot.lds +++ /dev/null @@ -1,69 +0,0 @@ -/* - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/freescale/mx31ads/config.mk b/board/freescale/mx31ads/config.mk index d34dc02..7ec0fe2 100644 --- a/board/freescale/mx31ads/config.mk +++ b/board/freescale/mx31ads/config.mk @@ -1 +1,3 @@ TEXT_BASE = 0x87f00000 + +LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/gcplus/u-boot.lds b/board/gcplus/u-boot.lds deleted file mode 100644 index 65b8167..0000000 --- a/board/gcplus/u-boot.lds +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * 2003 (c) MontaVista Software, Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/impa7/u-boot.lds b/board/impa7/u-boot.lds deleted file mode 100644 index 8c9f624..0000000 --- a/board/impa7/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/imx31_litekit/u-boot.lds b/board/imx31_litekit/u-boot.lds deleted file mode 100644 index f840017..0000000 --- a/board/imx31_litekit/u-boot.lds +++ /dev/null @@ -1,59 +0,0 @@ -/* - * January 2004 - Changed to support H4 device - * Copyright (c) 2004 Texas Instruments - * - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/imx31_phycore/u-boot.lds b/board/imx31_phycore/u-boot.lds deleted file mode 100644 index f840017..0000000 --- a/board/imx31_phycore/u-boot.lds +++ /dev/null @@ -1,59 +0,0 @@ -/* - * January 2004 - Changed to support H4 device - * Copyright (c) 2004 Texas Instruments - * - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/innokom/u-boot.lds b/board/innokom/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/innokom/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/kb9202/u-boot.lds b/board/kb9202/u-boot.lds deleted file mode 100644 index 3eae0e2..0000000 --- a/board/kb9202/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/lart/u-boot.lds b/board/lart/u-boot.lds deleted file mode 100644 index 13b7bb7..0000000 --- a/board/lart/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/logodl/u-boot.lds b/board/logodl/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/logodl/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/lpc2292sodimm/u-boot.lds b/board/lpc2292sodimm/u-boot.lds deleted file mode 100644 index cb5a3ba..0000000 --- a/board/lpc2292sodimm/u-boot.lds +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/lubbock/u-boot.lds b/board/lubbock/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/lubbock/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/m501sk/u-boot.lds b/board/m501sk/u-boot.lds deleted file mode 100644 index 2247c37..0000000 --- a/board/m501sk/u-boot.lds +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/modnet50/u-boot.lds b/board/modnet50/u-boot.lds deleted file mode 100644 index b72e126..0000000 --- a/board/modnet50/u-boot.lds +++ /dev/null @@ -1,69 +0,0 @@ -/* - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/mp2usb/u-boot.lds b/board/mp2usb/u-boot.lds deleted file mode 100644 index 3eae0e2..0000000 --- a/board/mp2usb/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/mpl/vcma9/u-boot.lds b/board/mpl/vcma9/u-boot.lds deleted file mode 100644 index 33363c2..0000000 --- a/board/mpl/vcma9/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/mx1ads/u-boot.lds b/board/mx1ads/u-boot.lds deleted file mode 100644 index 1c710cb..0000000 --- a/board/mx1ads/u-boot.lds +++ /dev/null @@ -1,58 +0,0 @@ -/* - * board/mx1ads/u-boot.lds - * - * (c) Copyright 2004 - * Techware Information Technology, Inc. - * http://www.techware.com.tw/ - * - * Ming-Len Wu <minglen_wu(a)techware.com.tw> - * - * 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. - * diff --git a/board/netstar/u-boot.lds b/board/netstar/u-boot.lds deleted file mode 100644 index 6a5510a..0000000 --- a/board/netstar/u-boot.lds +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/ns9750dev/u-boot.lds b/board/ns9750dev/u-boot.lds deleted file mode 100644 index b7fc19c..0000000 --- a/board/ns9750dev/u-boot.lds +++ /dev/null @@ -1,59 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/omap1510inn/u-boot.lds b/board/omap1510inn/u-boot.lds deleted file mode 100644 index 13b3643..0000000 --- a/board/omap1510inn/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/omap2420h4/u-boot.lds b/board/omap2420h4/u-boot.lds deleted file mode 100644 index 46535dd..0000000 --- a/board/omap2420h4/u-boot.lds +++ /dev/null @@ -1,59 +0,0 @@ -/* - * January 2004 - Changed to support H4 device - * Copyright (c) 2004 Texas Instruments - * - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/pleb2/u-boot.lds b/board/pleb2/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/pleb2/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/prodrive/pdnb3/u-boot.lds b/board/prodrive/pdnb3/u-boot.lds deleted file mode 100644 index 6324436..0000000 --- a/board/prodrive/pdnb3/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2006 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/samsung/smdk2400/u-boot.lds b/board/samsung/smdk2400/u-boot.lds deleted file mode 100644 index 33363c2..0000000 --- a/board/samsung/smdk2400/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/samsung/smdk2410/u-boot.lds b/board/samsung/smdk2410/u-boot.lds deleted file mode 100644 index 33363c2..0000000 --- a/board/samsung/smdk2410/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/samsung/smdk6400/config.mk b/board/samsung/smdk6400/config.mk index 298d387..705d121 100644 --- a/board/samsung/smdk6400/config.mk +++ b/board/samsung/smdk6400/config.mk @@ -28,3 +28,5 @@ TEXT_BASE = $(RAM_TEXT) else TEXT_BASE = 0 endif + +LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot-nand.lds diff --git a/board/sbc2410x/u-boot.lds b/board/sbc2410x/u-boot.lds deleted file mode 100644 index 3eae0e2..0000000 --- a/board/sbc2410x/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/shannon/u-boot.lds b/board/shannon/u-boot.lds deleted file mode 100644 index 13b7bb7..0000000 --- a/board/shannon/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/siemens/SMN42/u-boot.lds b/board/siemens/SMN42/u-boot.lds deleted file mode 100644 index cb5a3ba..0000000 --- a/board/siemens/SMN42/u-boot.lds +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/sx1/u-boot.lds b/board/sx1/u-boot.lds deleted file mode 100644 index af0b4d0..0000000 --- a/board/sx1/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2004 - * Wolfgang Denk, DENX Software Engineering, <wg(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/trab/config.mk b/board/trab/config.mk index 800cc28..d2d9465 100644 --- a/board/trab/config.mk +++ b/board/trab/config.mk @@ -24,3 +24,5 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE TEXT_BASE = 0x0DF40000 endif + +LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/trizepsiv/u-boot.lds b/board/trizepsiv/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/trizepsiv/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/voiceblue/u-boot.lds b/board/voiceblue/u-boot.lds deleted file mode 100644 index 97fcef3..0000000 --- a/board/voiceblue/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/wepep250/u-boot.lds b/board/wepep250/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/wepep250/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/xaeniax/u-boot.lds b/board/xaeniax/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/xaeniax/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/xsengine/u-boot.lds b/board/xsengine/u-boot.lds deleted file mode 100644 index 8af5001..0000000 --- a/board/xsengine/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/zylonite/u-boot.lds b/board/zylonite/u-boot.lds deleted file mode 100644 index a077bc5..0000000 --- a/board/zylonite/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/board/apollon/u-boot.lds b/cpu/arm1136/u-boot.lds similarity index 94% rename from board/apollon/u-boot.lds rename to cpu/arm1136/u-boot.lds index 7fb7e04..830aaa8 100644 --- a/board/apollon/u-boot.lds +++ b/cpu/arm1136/u-boot.lds @@ -1,9 +1,10 @@ /* + * (C) Copyright 2009 + * Ilya Yanok, Emcraft Systems Ltd, <yanok(a)emcraft.com> * * Copyright (C) 2005-2007 Samsung Electronics * Kyungin Park <kyugnmin.park(a)samsung.com> * - * January 2004 - Changed to support H4 device * Copyright (c) 2004 Texas Instruments * * (C) Copyright 2002 @@ -36,7 +37,7 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { cpu/arm1136/start.o (.text) *(.text) diff --git a/board/omap5912osk/u-boot.lds b/cpu/arm1176/u-boot.lds similarity index 96% rename from board/omap5912osk/u-boot.lds rename to cpu/arm1176/u-boot.lds index 3132b9a..2dafb09 100644 --- a/board/omap5912osk/u-boot.lds +++ b/cpu/arm1176/u-boot.lds @@ -27,16 +27,20 @@ ENTRY(_start) SECTIONS { . = 0x00000000; + . = ALIGN(4); - .text : + .text : { - cpu/arm926ejs/start.o (.text) - *(.text) + cpu/arm1176/start.o (.text) + *(.text) } + . = ALIGN(4); .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + . = ALIGN(4); .data : { *(.data) } + . = ALIGN(4); .got : { *(.got) } diff --git a/board/scb9328/u-boot.lds b/cpu/arm720t/u-boot.lds similarity index 92% rename from board/scb9328/u-boot.lds rename to cpu/arm720t/u-boot.lds index d912d93..111c3f5 100644 --- a/board/scb9328/u-boot.lds +++ b/cpu/arm720t/u-boot.lds @@ -12,14 +12,13 @@ * * 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 + * 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-littlearm", "elf32-littlearm", "elf32-littlearm") @@ -30,9 +29,9 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { - cpu/arm920t/start.o (.text) + cpu/arm720t/start.o (.text) *(.text) } diff --git a/board/xm250/u-boot.lds b/cpu/arm920t/u-boot.lds similarity index 84% rename from board/xm250/u-boot.lds rename to cpu/arm920t/u-boot.lds index 8af5001..d9bfbee 100644 --- a/board/xm250/u-boot.lds +++ b/cpu/arm920t/u-boot.lds @@ -1,7 +1,14 @@ /* + * (c) Copyright 2004 + * Techware Information Technology, Inc. + * Ming-Len Wu <minglen_wu(a)techware.com.tw> + * * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. * + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> + * * See file CREDITS for list of people who contributed to this * project. * @@ -19,6 +26,7 @@ * 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-littlearm", "elf32-littlearm", "elf32-littlearm") @@ -29,10 +37,10 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { - cpu/pxa/start.o (.text) - *(.text) + cpu/arm920t/start.o (.text) + *(.text) } . = ALIGN(4); diff --git a/board/lpd7a40x/u-boot.lds b/cpu/arm925t/u-boot.lds similarity index 91% rename from board/lpd7a40x/u-boot.lds rename to cpu/arm925t/u-boot.lds index b98ed95..fc1c890 100644 --- a/board/lpd7a40x/u-boot.lds +++ b/cpu/arm925t/u-boot.lds @@ -1,4 +1,7 @@ /* + * (C) Copyright 2004 + * Wolfgang Denk, DENX Software Engineering, <wg(a)denx.de> + * * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> * @@ -22,7 +25,6 @@ */ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS @@ -30,10 +32,10 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { - cpu/lh7a40x/start.o (.text) - *(.text) + cpu/arm925t/start.o (.text) + *(.text) } . = ALIGN(4); diff --git a/cpu/arm926ejs/at91/config.mk b/cpu/arm926ejs/at91/config.mk index 06177e6..19296fd 100644 --- a/cpu/arm926ejs/at91/config.mk +++ b/cpu/arm926ejs/at91/config.mk @@ -1,2 +1 @@ PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,) -LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds diff --git a/cpu/arm926ejs/at91/u-boot.lds b/cpu/arm926ejs/at91/u-boot.lds deleted file mode 100644 index 62a3e95..0000000 --- a/cpu/arm926ejs/at91/u-boot.lds +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * diff --git a/cpu/arm926ejs/davinci/config.mk b/cpu/arm926ejs/davinci/config.mk index 5221444..a57d03a 100644 --- a/cpu/arm926ejs/davinci/config.mk +++ b/cpu/arm926ejs/davinci/config.mk @@ -33,5 +33,3 @@ PLATFORM_CPPFLAGS += -march=armv5te PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,) PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) - -LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/davinci/u-boot.lds diff --git a/board/st/nmdk8815/u-boot.lds b/cpu/arm926ejs/u-boot.lds similarity index 96% rename from board/st/nmdk8815/u-boot.lds rename to cpu/arm926ejs/u-boot.lds index c2adbab..ee5eeb5 100644 --- a/board/st/nmdk8815/u-boot.lds +++ b/cpu/arm926ejs/u-boot.lds @@ -1,5 +1,5 @@ /* - * (C) Copyright 2002 + * (C) Copyright 2002-2004 * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> * * See file CREDITS for list of people who contributed to this @@ -27,19 +27,24 @@ ENTRY(_start) SECTIONS { . = 0x00000000; + . = ALIGN(4); - .text : + .text : { cpu/arm926ejs/start.o (.text) *(.text) } + . = ALIGN(4); .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + . = ALIGN(4); .data : { *(.data) } + . = ALIGN(4); .got : { *(.got) } + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; diff --git a/cpu/arm926ejs/davinci/u-boot.lds b/cpu/arm946es/u-boot.lds similarity index 96% rename from cpu/arm926ejs/davinci/u-boot.lds rename to cpu/arm946es/u-boot.lds index 4d50f2c..04831ed 100644 --- a/cpu/arm926ejs/davinci/u-boot.lds +++ b/cpu/arm946es/u-boot.lds @@ -27,16 +27,20 @@ ENTRY(_start) SECTIONS { . = 0x00000000; + . = ALIGN(4); - .text : + .text : { - cpu/arm926ejs/start.o (.text) - *(.text) + cpu/arm946es/start.o (.text) + *(.text) } + . = ALIGN(4); .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + . = ALIGN(4); .data : { *(.data) } + . = ALIGN(4); .got : { *(.got) } diff --git a/cpu/arm_cortexa8/omap3/config.mk b/cpu/arm_cortexa8/omap3/config.mk index 7fd364e..fbb753e 100644 --- a/cpu/arm_cortexa8/omap3/config.mk +++ b/cpu/arm_cortexa8/omap3/config.mk @@ -34,5 +34,3 @@ PLATFORM_CPPFLAGS +=$(call cc-option) PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,) PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,\ $(call cc-option,-malignment-traps,)) - -LDSCRIPT := $(SRCTREE)/cpu/arm_cortexa8/omap3/u-boot.lds diff --git a/cpu/arm_cortexa8/omap3/u-boot.lds b/cpu/arm_cortexa8/u-boot.lds similarity index 100% rename from cpu/arm_cortexa8/omap3/u-boot.lds rename to cpu/arm_cortexa8/u-boot.lds diff --git a/board/omap1610inn/u-boot.lds b/cpu/arm_intcm/u-boot.lds similarity index 96% rename from board/omap1610inn/u-boot.lds rename to cpu/arm_intcm/u-boot.lds index 4d50f2c..55c9a38 100644 --- a/board/omap1610inn/u-boot.lds +++ b/cpu/arm_intcm/u-boot.lds @@ -27,16 +27,20 @@ ENTRY(_start) SECTIONS { . = 0x00000000; + . = ALIGN(4); - .text : + .text : { - cpu/arm926ejs/start.o (.text) - *(.text) + cpu/arm_intcm/start.o (.text) + *(.text) } + . = ALIGN(4); .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + . = ALIGN(4); .data : { *(.data) } + . = ALIGN(4); .got : { *(.got) } diff --git a/board/ixdp425/u-boot.lds b/cpu/ixp/u-boot.lds similarity index 94% rename from board/ixdp425/u-boot.lds rename to cpu/ixp/u-boot.lds index 7c287e1..85209ca 100644 --- a/board/ixdp425/u-boot.lds +++ b/cpu/ixp/u-boot.lds @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000 + * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. * * See file CREDITS for list of people who contributed to this @@ -29,10 +29,10 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { - cpu/ixp/start.o (.text) - *(.text) + cpu/ixp/start.o(.text) + *(.text) } . = ALIGN(4); diff --git a/board/omap730p2/u-boot.lds b/cpu/lh7a40x/u-boot.lds similarity index 96% rename from board/omap730p2/u-boot.lds rename to cpu/lh7a40x/u-boot.lds index 4d50f2c..a3bf530 100644 --- a/board/omap730p2/u-boot.lds +++ b/cpu/lh7a40x/u-boot.lds @@ -27,16 +27,20 @@ ENTRY(_start) SECTIONS { . = 0x00000000; + . = ALIGN(4); - .text : + .text : { - cpu/arm926ejs/start.o (.text) - *(.text) + cpu/lh7a40x/start.o (.text) + *(.text) } + . = ALIGN(4); .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + . = ALIGN(4); .data : { *(.data) } + . = ALIGN(4); .got : { *(.got) } diff --git a/board/pxa255_idp/u-boot.lds b/cpu/pxa/u-boot.lds similarity index 96% rename from board/pxa255_idp/u-boot.lds rename to cpu/pxa/u-boot.lds index fb4358b..77ab3c9 100644 --- a/board/pxa255_idp/u-boot.lds +++ b/cpu/pxa/u-boot.lds @@ -29,10 +29,10 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { - cpu/pxa/start.o (.text) - *(.text) + cpu/pxa/start.o (.text) + *(.text) } . = ALIGN(4); diff --git a/board/mx1fs2/u-boot.lds b/cpu/s3c44b0/u-boot.lds similarity index 96% rename from board/mx1fs2/u-boot.lds rename to cpu/s3c44b0/u-boot.lds index d912d93..41ca3b4 100644 --- a/board/mx1fs2/u-boot.lds +++ b/cpu/s3c44b0/u-boot.lds @@ -19,7 +19,6 @@ * 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-littlearm", "elf32-littlearm", "elf32-littlearm") @@ -30,9 +29,9 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { - cpu/arm920t/start.o (.text) + cpu/s3c44b0/start.o (.text) *(.text) } diff --git a/board/assabet/u-boot.lds b/cpu/sa1100/u-boot.lds similarity index 95% rename from board/assabet/u-boot.lds rename to cpu/sa1100/u-boot.lds index bd97436..0c02e76 100644 --- a/board/assabet/u-boot.lds +++ b/cpu/sa1100/u-boot.lds @@ -1,7 +1,9 @@ /* + * (C) Copyright 2003-2004 + * MontaVista Software, Inc. + * * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. - * 2004 (c) MontaVista Software, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -30,7 +32,7 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { cpu/sa1100/start.o (.text) *(.text) @@ -45,7 +47,6 @@ SECTIONS . = ALIGN(4); .got : { *(.got) } - . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } -- 1.6.1.3

2 2

Re: [U-Boot] usbtty Support on AT91SAM9XXX chipsets
by Daniel Sherwood 09 May '09

09 May '09

Remy > > There are indeed 2 routes: > 1. If you need a serial console, you can still use it with the older > usbtty code. > 2. Adapt the new CDC layer such that it becomes suitable for console > purposes as well. I would be happy integrating patches for this in the > USB branch. That would allow us to migrate to 1 usb-gadget layer in > the future which can be kept close to the linux development. > If we were to take option 1 then what do you propose would be the easiest way of integrating the current usbtty implementation with the AT91 USB device. Is a 'wrapper' between the two frameworks practical or would we be better off writing a new UDC implementation for AT91 that matches the other implementations. For option 2, I think we need to take serial.c and u_serial.c from Linux and then make them work with the uBoot console framework. Is this correct? > > Also, if this is the > > way to go, could someone confirm which version of the Linux Gadget > > framework ether.c and friends are based on. It appears to be completely > > different to the latest version. > > It is a port from Linux 2.6.27 to U-boot. > Latest kernel changes are not integrated yet. But the port was kept > quite close to the original code to make it easier to upgrade later > on. OK, we'll have a look at that version as a starting point. I presume you mean the original 2.6.27, not any of the 2.6.27.x series. > > Kind Regards, > > Remy The information in this email is confidential. It is intended solely for the addressee. Access to this email by anyone else is unauthorised. If you are not the intended recipient, any disclosure, copying, or distribution is prohibited and may be unlawful. If you have received this email in error please delete it immediately and contact commercial(a)sepura.com. Sepura plc. Registered Office: Radio House, St Andrew’s Road, Cambridge, CB4 1GR, England. Registered in England and Wales. Registration Number 4353801

2 1

[U-Boot] Unable to debug UBOOT
by Vivek DALAL 09 May '09

09 May '09

Hello guys I am newbie in bootloader. I am trying to port latest uboot on omap2430(poseidon board). Currently support for omap2430 is not present in uboot; so I made changes accordingly. I am putting it in RAM using Trace 32 debugger. But unable to get prompt. Code hangs but giving message *"DRAM: 64MB" ...* Please suggest me different ways of debugging uboot. I tried using Trace 32(LAUTERBACH JTAG debugger). Loaded uboot elf file(u-boot) into RAM. I am getting symbols and function names. But unable to put breakpoints. Also C code is not visible even after changing mode. Please suggest me ways to debug uboot. -- Cheers Vivek Dalal === He who angers you conquers you ===

5 5

[U-Boot] [PATCH 0/2 v2] OMAP3: Minor code clean up, no functional change
by Dirk Behme 09 May '09

09 May '09

This patch series contains only minor code clean up, no functional changes. Complete patch series boot tested on OMAP3 BeagleBoard and compile tested with ./MAKEALL ARM_CORTEX_A8. Note: The third patch [3] is removed from this series, as Jean-Christophe wants to do the rename interrupts.c -> timer.c and the Makefile fix for this in an overall patch. Best regards Dirk [1] http://lists.denx.de/pipermail/u-boot/2009-May/052127.html

1 2

[U-Boot] usbtty Support on AT91SAM9XXX chipsets
by Daniel Sherwood 08 May '09

08 May '09

Hi I am interested in getting usbtty support running on an AT91SAM9G20 board. I have picked up the latest code on the CDC head on the u-boot-usb GIT tree and am currently attempting to get the CDC-Ether support up and running (merging various changes from the 9261 board to the 9260). However in order to support our factory processes (which are currently set up to use serial ports) we need to use the usbtty framework. I have had a quick go at replacing CONFIG_USG_ETHER with CONFIG_USB_TTY in the config file but it doesn't work. Digging around a bit I think this is due to the following points: 1. usbtty.c uses a global function call based UDC framework (udc_init, udc_endpoint_read|write etc) 2. This framework is implemented on the older UDC devices (omap1510_udc.c, pxa27x_udh.c & mpc8xx_udc.c) but is not implemented on at91_udc.c. 3. drivers/usb/gadget/ether.c uses a new (Linux derived?) USB gadget framework based on registering function tables and accessing via helper functions in gadget.h. 4. at91_udc.c is implemented to this framework. Hence omap1510, pxa27x & mpc8xx support USB TTY operation and at91 supports ethernet operation but other combinations are not currently possible. Please could someone advise on the best way forward, initially I can think of a couple of options as follows: 1. create a wrapper that implements the old framework functions (udc_init, udc_endpoint_read|write etc) and simply maps them on to the new framework. 2. import the appropriate TTY gadget implementation from Linux (as for ether.c) and get it working and registered as a proper device. I suspect 2 is the better option and the way that the project was moving, but I thought I'd check if this was the way to go and whether anyone else had made any progress in this area. Also, if this is the way to go, could someone confirm which version of the Linux Gadget framework ether.c and friends are based on. It appears to be completely different to the latest version. Cheers Daniel Sherwood Software Engineer Sepura PLC Radio House, St Andrew's Road Cambridge, CB4 1GR, UK T: +44 (0) 1223 694637 F: +44 (0) 1223 879000 www.sepura.com <http://www.sepura.com> The information in this email is confidential. It is intended solely for the addressee. Access to this email by anyone else is unauthorised. If you are not the intended recipient, any disclosure, copying, or distribution is prohibited and may be unlawful. If you have received this email in error please delete it immediately and contact commercial(a)sepura.com. Sepura plc. Registered Office: Radio House, St Andrew’s Road, Cambridge, CB4 1GR, England. Registered in England and Wales. Registration Number 4353801

2 1