kernel/u-boot.git
13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 1 Jun 2011 19:59:27 +0000 (21:59 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  cmd_nand: fix help of nand erase subcommand
  env_nand: zero-initialize variable nand_erase_options

13 years agoMove wepep250,delta,xsengine to scrapyard
Marek Vasut [Fri, 20 May 2011 23:48:25 +0000 (01:48 +0200)]
Move wepep250,delta,xsengine to scrapyard

Drop wepep250 board from MAINTAINERS and add all these three boards to
doc/README.scrapyard

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
13 years agocmd_nand: fix help of nand erase subcommand
Daniel Hobi [Thu, 19 May 2011 17:28:54 +0000 (19:28 +0200)]
cmd_nand: fix help of nand erase subcommand

Since commit 30486322 (nand erase: .spread, .part, .chip subcommands)
the arguments off and size are no longer optional.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agoenv_nand: zero-initialize variable nand_erase_options
Daniel Hobi [Wed, 18 May 2011 13:21:08 +0000 (15:21 +0200)]
env_nand: zero-initialize variable nand_erase_options

Commit 30486322 (nand erase: .spread, .part, .chip subcommands)
added a new field to struct nand_erase_options, but forgot to
update common/env_nand.c.

Depending on the stack state and bad block distribution, saveenv()
can thus erase more than CONFIG_ENV_RANGE bytes which may corrupt
the following NAND sectors/partitions.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years ago.gitignore: update list of u-boot.* files and add *.bin
ecc [Fri, 20 May 2011 15:33:47 +0000 (15:33 +0000)]
.gitignore: update list of u-boot.* files and add *.bin

This patch adds additional u-boot.* files mentioned in Makefile,
and adds *.bin since these are deleted as part of "make clean".

Signed-off-by: Eric Cooper <ecc@cmu.edu>
13 years agoMPC8xx: Make SPD823TS board build again
Wolfgang Denk [Fri, 20 May 2011 23:13:14 +0000 (23:13 +0000)]
MPC8xx: Make SPD823TS board build again

Commit e59e356 "TFTP: net/tftp.c: add server mode receive" caused the
size of some object files to grow which breaks the manually optimized
linking for the SPD823TS board.  Adjust linker script as needed.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoPrepare v2011.06-rc1 v2011.06-rc1
Wolfgang Denk [Thu, 19 May 2011 20:23:50 +0000 (22:23 +0200)]
Prepare v2011.06-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoMinor coding style cleanup.
Wolfgang Denk [Thu, 19 May 2011 20:21:41 +0000 (22:21 +0200)]
Minor coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: fix typo
Luca Ceresoli [Tue, 17 May 2011 00:03:41 +0000 (00:03 +0000)]
net/tftp.c: fix typo

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agoTFTP: add tftpsrv command
Luca Ceresoli [Tue, 17 May 2011 00:03:40 +0000 (00:03 +0000)]
TFTP: add tftpsrv command

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agoTFTP: net/tftp.c: add server mode receive
Luca Ceresoli [Tue, 17 May 2011 00:03:39 +0000 (00:03 +0000)]
TFTP: net/tftp.c: add server mode receive

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agoTFTP: rename STATE_RRQ to STATE_SEND_RRQ
Luca Ceresoli [Tue, 17 May 2011 00:03:38 +0000 (00:03 +0000)]
TFTP: rename STATE_RRQ to STATE_SEND_RRQ

With the upcoming TFTP server implementation, requests can be either
outgoing or incoming, so avoid ambiguities.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agoTFTP: replace "server" with "remote" in local variable names
Luca Ceresoli [Tue, 17 May 2011 00:03:37 +0000 (00:03 +0000)]
TFTP: replace "server" with "remote" in local variable names

With the upcoming TFTP server implementation, the remote node can be
either a client or a server, so avoid ambiguities.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agonet/tftp.c: cosmetic: do not initialise statics to 0 or NULL
Luca Ceresoli [Sat, 14 May 2011 05:50:03 +0000 (05:50 +0000)]
net/tftp.c: cosmetic: do not initialise statics to 0 or NULL

This removes the following checkpatch issue:
 - ERROR: do not initialise statics to 0 or NULL

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: cosmetic: fix indentation
Luca Ceresoli [Sat, 14 May 2011 05:50:02 +0000 (05:50 +0000)]
net/tftp.c: cosmetic: fix indentation

This removes the following checkpatch issue:
 - WARNING: suspect code indent for conditional statements

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: cosmetic: trailing statements should be on next line
Luca Ceresoli [Sat, 14 May 2011 05:50:01 +0000 (05:50 +0000)]
net/tftp.c: cosmetic: trailing statements should be on next line

This removes the following checkpatch issue:
 - ERROR: trailing statements should be on next line

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: cosmetic: fix brace issues
Luca Ceresoli [Sat, 14 May 2011 05:50:00 +0000 (05:50 +0000)]
net/tftp.c: cosmetic: fix brace issues

This removes the following checkpatch issues:
 - WARNING: braces {} are not necessary for single statement blocks
 - WARNING: braces {} are not necessary for any arm of this statement

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: cosmetic: do not use assignment in if condition
Luca Ceresoli [Sat, 14 May 2011 05:49:59 +0000 (05:49 +0000)]
net/tftp.c: cosmetic: do not use assignment in if condition

This removes the following checkpatch issue:
 - ERROR: do not use assignment in if condition.

There is one such error left:

  ERROR: do not use assignment in if condition
  #239: FILE: tftp.c:239:
  + if (!ProhibitMcast
  +  && (Bitmap = malloc(Mapsize))
  +  && eth_get_dev()->mcast) {

which would require an additional nested if to be fixed, resulting in longer
and less readable code.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: cosmetic: fix pointer syntax issues
Luca Ceresoli [Sat, 14 May 2011 05:49:58 +0000 (05:49 +0000)]
net/tftp.c: cosmetic: fix pointer syntax issues

This removes the following checkpatch issues:
 - ERROR: "foo * bar" should be "foo *bar"
 - ERROR: "(foo*)" should be "(foo *)"

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: cosmetic: fix whitespace issues
Luca Ceresoli [Sat, 14 May 2011 05:49:57 +0000 (05:49 +0000)]
net/tftp.c: cosmetic: fix whitespace issues

This removes the following checkpatch issues:
 - ERROR: space prohibited before that close parenthesis ')'
 - ERROR: space required after that ';' (ctx:BxV)
 - ERROR: space required after that ',' (ctx:VxV)
 - ERROR: space required after that ';' (ctx:VxV)
 - ERROR: spaces required around that '<<=' (ctx:VxV)
 - ERROR: spaces required around that '<' (ctx:VxV)
 - ERROR: spaces required around that '=' (ctx:VxV)
 - ERROR: spaces required around that '+=' (ctx:VxV)
 - ERROR: spaces required around that '=' (ctx:VxW)
 - WARNING: please, no spaces at the start of a line
 - WARNING: space prohibited between function name and open parenthesis '('

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agonet/tftp.c: cosmetic: fix lines over 80 characters
Luca Ceresoli [Sat, 14 May 2011 05:49:56 +0000 (05:49 +0000)]
net/tftp.c: cosmetic: fix lines over 80 characters

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Thu, 19 May 2011 19:30:22 +0000 (21:30 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/85xx: add support for env in MMC/SPI on corenet ds boards
  powerpc/85xx: Enable eSPI support on corenet ds boards

13 years agokm/common: add pnvramsize to default environment
Holger Brunck [Thu, 12 May 2011 19:59:24 +0000 (19:59 +0000)]
km/common: add pnvramsize to default environment

The pnvram size was used later from start scripts in linux. Therefore
it was added to the default environment.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>

13 years agokm/common: simplify default environment
Holger Brunck [Wed, 4 May 2011 01:47:34 +0000 (01:47 +0000)]
km/common: simplify default environment

This is a first step to simplify the default environment. Move all
the environment variables which are only needed for debugging
purpose to textfiles in the scripts directory. In case of debugging
these files can be loaded via tftp into RAM and set via the env import
command. Other variables are identified as obsolete and were removed.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>

13 years agokm/common: implement boardId HWkey checks as u-boot cmd
Thomas Herzmann [Thu, 12 May 2011 19:59:22 +0000 (19:59 +0000)]
km/common: implement boardId HWkey checks as u-boot cmd

BoardId and HWKey are used to identify the HW class of a given board.
The correct values are stored in the inventory eeprom. During creation
time of a boot package the boardId and HWkey for the SW is stored in
the default environment and burned into the flash. During boottime
the values in the inventory and in the environment are compared to
avoid starting of a SW which is not authorized for this board.

Some bootpackages are allowed to run on a set of different boardId
hwKey. In this case the environment variable boardIdListHex was added
to the default environment. In this case the command iterates over the
pair values and compares them with the values read from the inventory
eeprom.

The syntax of such a boardIdListHex value is e.g.: 158_1 159_1 159_2

Signed-off-by: Thomas Herzmann <thomas.herzmann@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>

13 years agoMMC: omap_hsmmc.c: Add missing prototype header
Dirk Behme [Sun, 15 May 2011 09:04:47 +0000 (09:04 +0000)]
MMC: omap_hsmmc.c: Add missing prototype header

Add missing header file to fix compilation warning

omap_hsmmc.c: In function 'omap_mmc_init':
omap_hsmmc.c:474: warning: implicit declaration of function 'get_cpu_family'
omap_hsmmc.c:474: warning: implicit declaration of function 'get_cpu_rev'

introduced by commit "MMC: omap_hsmmc.c: disable
multiblock rw on old rev omap34xx silicon"
(4ca9244d74f146a0605f5bee28a66e39aae88d3e)

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: Andy Fleming <afleming@freescale.com>
CC: John Rigby <john.rigby@linaro.org>
13 years agofsl_esdhc: Initialize mmc->b_max
Fabio Estevam [Thu, 12 May 2011 09:33:27 +0000 (09:33 +0000)]
fsl_esdhc: Initialize mmc->b_max

commit 262951(MMC: make b_max unconditional) missed to update fsl_esdhc.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
13 years agommc: enable partition switch function for emmc
Lei Wen [Mon, 2 May 2011 16:26:26 +0000 (16:26 +0000)]
mmc: enable partition switch function for emmc

For emmc, it may have up to 7 partitions: two boot partitions, one
user partition, one RPMB partition and four general purpose partitions.
(Refer to JESD84-A44.pdf/page 154)

As bootloader may need to read out or reflashing images on those

different partitions, it is better to enable the partition switch with
console command support.

Also for partition would be restore to user partition(part 0) when CMD0
is used, so change mmc_init routine to perform normal initialization
only once for each slot, unless use the rescan command to force init
again.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agocmd_mmc: eliminate device num in the mmc command
Lei Wen [Mon, 2 May 2011 16:26:25 +0000 (16:26 +0000)]
cmd_mmc: eliminate device num in the mmc command

mmc command applied device, like ide and usb...

Signed-off-by: Lei Wen <leiwen@marvell.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agommc_spi: generate response for send status command
Thomas Chou [Tue, 19 Apr 2011 03:48:32 +0000 (03:48 +0000)]
mmc_spi: generate response for send status command

A "send status" command is added with the commit "mmc: checking
status after commands with R1b response". But the status register
returned from send status command of SPI protocol is different from
that of MMC/SD protocol. We do a simple test and generate a response
in stead of full bit-by-bit translation.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
13 years agopowerpc/85xx: add support for env in MMC/SPI on corenet ds boards
Shaohui Xie [Thu, 12 May 2011 10:46:40 +0000 (18:46 +0800)]
powerpc/85xx: add support for env in MMC/SPI on corenet ds boards

Signed-off-by: Shaohui Xie <b21989@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Enable eSPI support on corenet ds boards
Shaohui Xie [Thu, 12 May 2011 10:46:14 +0000 (18:46 +0800)]
powerpc/85xx: Enable eSPI support on corenet ds boards

Signed-off-by: Shaohui Xie <b21989@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 18 May 2011 12:31:56 +0000 (14:31 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm: (40 commits)
  avr32: add ATAG_BOARDINFO
  at91: reworked support for otc570 board
  at91: reworked support for meesc board
  hammerhead: move CONFIG_SYS_TEXT_BASE to header
  mimc200: move CONFIG_SYS_TEXT_BASE to header
  favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
  atstk100x: move CONFIG_SYS_TEXT_BASE to header
  atngw100: move CONFIG_SYS_TEXT_BASE to header
  mimc200: fix "#define XXXX 1"
  hammerhead: fix "#define XXXX 1"
  favr-32-ezkit: fix "#define XXXX 1"
  atstk1006: fix "#define XXXX 1"
  atstk1004: fix "#define XXXX 1"
  atstk1003: fix "#define XXXX 1"
  atstk1002: fix "#define XXXX 1"
  atngw100: fix "#define XXXX 1"
  avr32: use single linker script
  avr32/config.mk: simplify PLATFORM_RELFLAGS
  avr32: fix linking
  Add support for Bluewater Systems Snapper 9260 and 9G20 modules
  ...

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Wed, 18 May 2011 12:30:31 +0000 (14:30 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

* 'master' of git://git.denx.de/u-boot-nand-flash:
  nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance

13 years agoavr32: add ATAG_BOARDINFO
Andreas Bießmann [Tue, 12 Apr 2011 23:25:41 +0000 (23:25 +0000)]
avr32: add ATAG_BOARDINFO

This patch adds a new ATAG_BORADINFO to U-Boot. This tag is intended to hand
over the bd->bi_board_number to the linux kernel for early stage board
information like a board revision or other kind of board specific decisions
necessary before the linux peripherial drivers are up.

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoat91: reworked support for otc570 board
Daniel Gorsulowski [Mon, 18 Apr 2011 04:15:02 +0000 (04:15 +0000)]
at91: reworked support for otc570 board

The otc570 board support was broken. Within this opportunity, I completely
reworked the board files.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
13 years agoat91: reworked support for meesc board
Daniel Gorsulowski [Mon, 18 Apr 2011 04:15:01 +0000 (04:15 +0000)]
at91: reworked support for meesc board

The meesc board support was broken. Within this opportunity, I completely
reworked the board files.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
13 years agohammerhead: move CONFIG_SYS_TEXT_BASE to header
Andreas Bießmann [Mon, 18 Apr 2011 04:12:47 +0000 (04:12 +0000)]
hammerhead: move CONFIG_SYS_TEXT_BASE to header

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agomimc200: move CONFIG_SYS_TEXT_BASE to header
Andreas Bießmann [Mon, 18 Apr 2011 04:12:46 +0000 (04:12 +0000)]
mimc200: move CONFIG_SYS_TEXT_BASE to header

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agofavr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
Andreas Bießmann [Mon, 18 Apr 2011 04:12:45 +0000 (04:12 +0000)]
favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoatstk100x: move CONFIG_SYS_TEXT_BASE to header
Andreas Bießmann [Mon, 18 Apr 2011 04:12:44 +0000 (04:12 +0000)]
atstk100x: move CONFIG_SYS_TEXT_BASE to header

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoatngw100: move CONFIG_SYS_TEXT_BASE to header
Andreas Bießmann [Mon, 18 Apr 2011 04:12:43 +0000 (04:12 +0000)]
atngw100: move CONFIG_SYS_TEXT_BASE to header

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agomimc200: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:42 +0000 (04:12 +0000)]
mimc200: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agohammerhead: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:41 +0000 (04:12 +0000)]
hammerhead: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agofavr-32-ezkit: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:40 +0000 (04:12 +0000)]
favr-32-ezkit: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoatstk1006: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:39 +0000 (04:12 +0000)]
atstk1006: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoatstk1004: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:38 +0000 (04:12 +0000)]
atstk1004: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoatstk1003: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:37 +0000 (04:12 +0000)]
atstk1003: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoatstk1002: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:36 +0000 (04:12 +0000)]
atstk1002: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoatngw100: fix "#define XXXX 1"
Andreas Bießmann [Mon, 18 Apr 2011 04:12:35 +0000 (04:12 +0000)]
atngw100: fix "#define XXXX 1"

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoavr32: use single linker script
Andreas Bießmann [Mon, 18 Apr 2011 04:12:34 +0000 (04:12 +0000)]
avr32: use single linker script

This patch move the atstk100x linker script to $(CPUDIR) and delete other
pure copies of this file in each board directory.

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoavr32/config.mk: simplify PLATFORM_RELFLAGS
Andreas Bießmann [Mon, 18 Apr 2011 04:12:33 +0000 (04:12 +0000)]
avr32/config.mk: simplify PLATFORM_RELFLAGS

This patch removes PLATFORM_RELFLAGS from board specific config.mk files and
define them in arch specific config.mk file.

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoavr32: fix linking
Andreas Bießmann [Wed, 9 Feb 2011 04:10:30 +0000 (04:10 +0000)]
avr32: fix linking

This patch fixes following error:

---8<---
avr32-linux-ld: --gc-sections and -r may not be used together
--->8---

Since 8aba9dceebb14144e07d19593111ee3a999c37fc all avr32 boards are broken due
to linking error as seen above.

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoAdd support for Bluewater Systems Snapper 9260 and 9G20 modules
Ryan Mallon [Tue, 1 Feb 2011 16:18:00 +0000 (16:18 +0000)]
Add support for Bluewater Systems Snapper 9260 and 9G20 modules

Add support for Bluewater Systems AT91 based Snapper 9260 and 9G20
single board computer modules. Includes NAND flash and Ethernet
support.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
13 years agoat91: fixed at91sam9263 system file
Daniel Gorsulowski [Thu, 20 Jan 2011 23:12:15 +0000 (23:12 +0000)]
at91: fixed at91sam9263 system file

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
13 years agoremove __attribute__ ((packed)) in at91 headers
Jens Scharsig [Wed, 22 Dec 2010 01:16:47 +0000 (01:16 +0000)]
remove __attribute__ ((packed)) in at91 headers

* remove __attribute__ ((packed)) to prevent byte access
  to soc registers in some gcc version

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
13 years agoat91rm9200: fix lowlevel_init() SMRDATA size
Jens Scharsig [Sat, 18 Dec 2010 02:30:04 +0000 (02:30 +0000)]
at91rm9200: fix lowlevel_init() SMRDATA size

* use start/end label for initialization tables instead of fix values

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoAT91: fix timer.c - remove reset_timer()
Reinhard Meyer [Wed, 10 Nov 2010 17:07:56 +0000 (18:07 +0100)]
AT91: fix timer.c - remove reset_timer()

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: fix at91sam_wdt.c to reworked header files
Reinhard Meyer [Fri, 4 Feb 2011 19:17:33 +0000 (20:17 +0100)]
AT91: fix at91sam_wdt.c to reworked header files

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: remove LEGACY from at91_rstc.h
Reinhard Meyer [Wed, 10 Nov 2010 17:08:47 +0000 (18:08 +0100)]
AT91: remove LEGACY from at91_rstc.h

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoATMEL: fix dataflash (dirty) this file should be converted to struct SoC access
Reinhard Meyer [Tue, 9 Nov 2010 16:06:20 +0000 (17:06 +0100)]
ATMEL: fix dataflash (dirty) this file should be converted to struct SoC access

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: change includes from asm/arch/io.h to asm/io.h
Reinhard Meyer [Sun, 7 Nov 2010 12:26:14 +0000 (13:26 +0100)]
AT91: change includes from asm/arch/io.h to asm/io.h

and remove the now unused asm/arch-at91/io.h

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: cleanup at91sam9260_matrix.h to struct SoC access
Reinhard Meyer [Sun, 7 Nov 2010 11:38:43 +0000 (12:38 +0100)]
AT91: cleanup at91sam9260_matrix.h to struct SoC access

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoATMEL: fix related common atmel driver files
Reinhard Meyer [Wed, 3 Nov 2010 15:32:56 +0000 (16:32 +0100)]
ATMEL: fix related common atmel driver files

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: fix related at91 driver files
Reinhard Meyer [Wed, 3 Nov 2010 14:47:20 +0000 (15:47 +0100)]
AT91: fix related at91 driver files

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: fix related at91 system/driver files
Reinhard Meyer [Wed, 3 Nov 2010 14:39:55 +0000 (15:39 +0100)]
AT91: fix related at91 system/driver files

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: fix related arch-at91 header files
Reinhard Meyer [Wed, 3 Nov 2010 14:38:33 +0000 (15:38 +0100)]
AT91: fix related arch-at91 header files

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: cleanup hardware.h, remove memory-map.h
Reinhard Meyer [Wed, 3 Nov 2010 10:30:23 +0000 (11:30 +0100)]
AT91: cleanup hardware.h, remove memory-map.h

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: rework at91sam9g45.h
Reinhard Meyer [Fri, 18 Feb 2011 08:33:51 +0000 (09:33 +0100)]
AT91: rework at91sam9g45.h

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: rework at91sam9263.h
Reinhard Meyer [Fri, 19 Nov 2010 09:05:01 +0000 (10:05 +0100)]
AT91: rework at91sam9263.h

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: rework at91sam9261.h
Reinhard Meyer [Fri, 19 Nov 2010 09:04:37 +0000 (10:04 +0100)]
AT91: rework at91sam9261.h

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: rework at91sam9260.h
Reinhard Meyer [Tue, 2 Nov 2010 10:55:42 +0000 (11:55 +0100)]
AT91: rework at91sam9260.h

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoavr32: fixup definitions to ATMEL_BASE_xxx
Andreas Bießmann [Thu, 4 Nov 2010 23:15:31 +0000 (23:15 +0000)]
avr32: fixup definitions to ATMEL_BASE_xxx

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoavr32: rename memory-map.h -> hardware.h
Andreas Bießmann [Thu, 4 Nov 2010 23:15:30 +0000 (23:15 +0000)]
avr32: rename memory-map.h -> hardware.h

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agonios2: Make STANDALONE_LOAD_ADDR configurable per board
Thomas Chou [Sun, 17 Apr 2011 02:52:46 +0000 (10:52 +0800)]
nios2: Make STANDALONE_LOAD_ADDR configurable per board

Follow commit 8ae86b76c648d8bef97241c78e2fddb1c4f164d3
which changed the variable name.

Fix this error,
nios2-elf-ld: invalid hex number `-o'

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
13 years agonand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance
Stefan Roese [Mon, 16 May 2011 11:04:00 +0000 (13:04 +0200)]
nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance

Remove the last CONFIG_SYS_NAND_READ_DELAY occurance from nand_boot.c.
I missed this one in patch a9c847cb [nand_spl: nand_boot.c: Remove
CONFIG_SYS_NAND_READ_DELAY].

This fixes a compile breakage on kilauea_nand for example.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Sun, 15 May 2011 21:23:36 +0000 (23:23 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sun, 15 May 2011 21:20:10 +0000 (23:20 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

13 years agonand_spl: nand_boot.c: Remove CONFIG_SYS_NAND_READ_DELAY
Stefan Roese [Wed, 4 May 2011 09:44:14 +0000 (11:44 +0200)]
nand_spl: nand_boot.c: Remove CONFIG_SYS_NAND_READ_DELAY

There are multiple reasons why this define should be removed:

First it saves some space and therefore fixes a problem we have on
the canyonlands_nand and glacier_nand targets right now.

Second, the define was hackish and would most likely not work on all
board using nand_boot.c. Boards not providing a real dev_ready()
function should implement a board specific function instead.

I checked and it seems, that all boards using nand_boot.c right now
already implement a board specific dev_ready() function. So this
patch should not break any boards and will result in smaller
NAND_SPL images.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Sughosh Ganu <urwithsughosh@gmail.com>
Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Tested-by: Sughosh Ganu <urwithsughosh@gmail.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agonand_spl: nand_boot.c: Init nand_chip.options to 0
Stefan Roese [Wed, 4 May 2011 09:44:44 +0000 (11:44 +0200)]
nand_spl: nand_boot.c: Init nand_chip.options to 0

Patch 65a9db7b [nand_spl: Fix large page nand_command()] broke
nand booting on canyonlands. "options" has to be initialized to
0. If not, boards might have the NAND_BUSWIDTH_16 bit set,
resulting in wrong offset calculation.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Alex Waterman <awaterman@dawning.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agoDecreases code size of the nand_spl
Alex Waterman [Wed, 4 May 2011 13:10:15 +0000 (09:10 -0400)]
Decreases code size of the nand_spl

The canyonland boards nand_spl size is just under the maximum 4KByte size. This
patch decreases the size of the nand_spl to make a previous commit - commit
65a9db7be0868be91ba81b9b5bf821de82e6d9b0 - fit in the nand_spl.

Signed-off-by: Alex Waterman <awaterman@dawning.com>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agoRevert "Fix building tools alone with host compiler"
Wolfgang Denk [Fri, 13 May 2011 11:36:32 +0000 (13:36 +0200)]
Revert "Fix building tools alone with host compiler"

This reverts commit bbc6353c740064c8e0741b772376a1a67a1c3f01.
It breaks building on many systems:
...
.../common/env_embedded.c:28:20: fatal error: config.h: No such file or directory
compilation terminated.
.../common/image.c:27:20: fatal error: common.h: No such file or directory
compilation terminated.
.../lib/crc32.c:12:20: fatal error: common.h: No such file or directory
compilation terminated.
.../lib/md5.c:28:22: fatal error: compiler.h: No such file or directory
compilation terminated.
.../lib/sha1.c:33:20: fatal error: common.h: No such file or directory
compilation terminated.

13 years agopowerpc/mpc8xxx: reword max tCKmin message
York Sun [Thu, 5 May 2011 23:14:14 +0000 (07:14 +0800)]
powerpc/mpc8xxx: reword max tCKmin message

Reword "The DIMM max tCKmin is ..." to "The DDR clock is faster than the slowest
DIMM(s) can support". Fixed interger type in printf as well.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: fix compatible property for the L2 cache node
Timur Tabi [Fri, 29 Apr 2011 23:08:44 +0000 (18:08 -0500)]
powerpc/85xx: fix compatible property for the L2 cache node

The compatible property for the L2 cache node (on 85xx systems that don't
have a CPC) was using a value for the property length that did not match
the actual length of the property.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agokwbimage: Fix check variable of checksum
Nobuhiro Iwamatsu [Tue, 10 May 2011 17:33:08 +0000 (17:33 +0000)]
kwbimage: Fix check variable of checksum

calc_hdrcsum two times are checked. checksumi of exthdr is not checked.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
CC: Prafulla Wadaskar <prafulla@marvell.com>
13 years agoexamples: add smc911x_eeprom to clean target
Mike Frysinger [Sat, 7 May 2011 12:05:30 +0000 (12:05 +0000)]
examples: add smc911x_eeprom to clean target

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoftpmu010.h: fix some missing declaration in header
Macpaul Lin [Mon, 2 May 2011 01:28:47 +0000 (01:28 +0000)]
ftpmu010.h: fix some missing declaration in header

Fix some missing declaration in header.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoftsmc020: add missing definitions
Macpaul Lin [Sun, 1 May 2011 22:17:31 +0000 (22:17 +0000)]
ftsmc020: add missing definitions

Add missing definitions in header file according to datasheet.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoftsmc020: un-nest the register structure in header
Macpaul Lin [Sun, 1 May 2011 22:17:30 +0000 (22:17 +0000)]
ftsmc020: un-nest the register structure in header

Un-nestted the register structure in ftsmc020.h

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoftsmc020: fix relocation
Macpaul Lin [Sun, 1 May 2011 22:17:29 +0000 (22:17 +0000)]
ftsmc020: fix relocation

Avoid relocation problem by fix global declaration.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoftide020: add faraday ide ahb controller
Macpaul Lin [Sun, 1 May 2011 21:28:56 +0000 (21:28 +0000)]
ftide020: add faraday ide ahb controller

Faraday's ftide020_s is an IDE-AHB controller for SoC design.
This patch add the u-boot driver (PIO) of ftide020 ATA (IDE) driver.
IDE commands include read, info, and other functions has been implemented.

Because this IDE controller support AHB interface only which is differ
from other most IDE controller supports PCI interface. Some registers
access is required during CMD/DATA I/O. Hence a configuration
"CONFIG_IDE_AHB" is required to be defined according to the feature in
cmd_ide.c.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoREADME.arm-relocation: get relocated address in gdb
Ben Gardiner [Thu, 28 Apr 2011 11:03:21 +0000 (11:03 +0000)]
README.arm-relocation: get relocated address in gdb

When your emulator is connected at reset (or is used to load u-boot)
it is possible to get the relocation address from the gd->relocaddr
since gd is always in r8 (on ARM) it is addressable before the
gdb has remapped symbols.

Document this alternate method in-line with the original method
written by Heiko Schocher.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Heiko Schocher <hs@denx.de>
CC: Wolfgang Denk <wd@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
13 years agoREADME.arm-relocation: get relocated address from bdinfo
Ben Gardiner [Thu, 28 Apr 2011 06:49:47 +0000 (06:49 +0000)]
README.arm-relocation: get relocated address from bdinfo

The bdinfo command prints the relocaddr on ARM as it does
on PPC.

Update the debugging instructions for arm relocation to
reflect this fact rather than requiring that the user
rebuild the u-boot image using -DDEBUG.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Wolfgang Denk <wd@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
13 years agocosmetic: cmd_bdinfo.c: clean up by using checkpatch.pl
Macpaul Lin [Wed, 27 Apr 2011 16:28:35 +0000 (16:28 +0000)]
cosmetic: cmd_bdinfo.c: clean up by using checkpatch.pl

cmd_bdinfo.c: clean up with 2.6.38 checkpatch.pl

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agomp2usb: finish the removal
Eric Bénard [Wed, 27 Apr 2011 20:18:24 +0000 (22:18 +0200)]
mp2usb: finish the removal

- remove from boards.cfg
- add to doc/README.scrapyard

Signed-off-by: Eric Bénard <eric@eukrea.com>
13 years agoREADME: Clarify difference of CONFIG_WATCHDOG and CONFIG_HW_WATCHDOG
Detlev Zundel [Wed, 27 Apr 2011 05:25:59 +0000 (05:25 +0000)]
README: Clarify difference of CONFIG_WATCHDOG and CONFIG_HW_WATCHDOG

Now that we have the documentation, the code should be changed to reflect
it ;)

Asd far as I can see, these are the places where HW_WATCHDOG is used
instead of WATCHDOG:

arch/blackfin/cpu/blackfin/watchdog.c
arch/m68k/cpu/mcf547x_8x/cpu.c

The relevant maintainers are on CC.

Signed-off-by: Detlev Zundel <dzu@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
13 years agoftsdmc021: add register definitions of ftsdmc021
Macpaul Lin [Tue, 26 Apr 2011 01:29:47 +0000 (01:29 +0000)]
ftsdmc021: add register definitions of ftsdmc021

Support registers definitions of ftsdmc021 SDRAM controller.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoftahbc020s: Faraday FTAHBC020s AHB Bus Controller
Macpaul Lin [Tue, 26 Apr 2011 00:25:23 +0000 (00:25 +0000)]
ftahbc020s: Faraday FTAHBC020s AHB Bus Controller

ftahbc020s.h provides basic definitions of this controller
to help a SoC which use this AHB Controller could
do scalable software settings in lowlevel_init.S.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoFix a few gcc warnings.
Joakim Tjernlund [Mon, 25 Apr 2011 01:39:43 +0000 (01:39 +0000)]
Fix a few gcc warnings.

Noticed while building all of mpc8xx. Also
constify usage string in timer.c
Warnings fixed are:
timer.c: In function 'timer':
timer.c:189: warning: format not a string literal and no format arguments
timer.c:258: warning: format not a string literal and no format arguments
atm.c: In function 'atmUnload':
atm.c:99: warning: array subscript is above array bounds
atm.c: In function 'atmLoad':
atm.c:65: warning: array subscript is above array bounds
codec.c: In function 'codsp_write_pop_int':
codec.c:678: warning: array subscript is above array bounds
codec.c: In function 'codsp_write_cop_short':
codec.c:585: warning: array subscript is above array bounds
codec.c: In function 'codsp_write_sop_int':
codec.c:512: warning: array subscript is above array bounds

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
13 years agoRemove remnants of obsolete CONFIG_SYS_GBL_DATA_SIZE comments
Michael Jones [Mon, 18 Apr 2011 22:12:33 +0000 (22:12 +0000)]
Remove remnants of obsolete CONFIG_SYS_GBL_DATA_SIZE comments

commit 25ddd1fb0a2281b182529afbc8fda5de2dc16d96 left remnants of
many comments about CONFIG_SYS_GBL_DATA_SIZE.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>