summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-06-01-1/+19
|\ | | | | | | | | * 'master' of git://git.denx.de/u-boot-mpc85xx: powerpc/fsl_pci: Fix device tree fixups for newer platforms
| * powerpc/fsl_pci: Fix device tree fixups for newer platformsKumar Gala2011-05-20-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | We assumed that only a small set of compatiable strings would be needed to find the PCIe device tree nodes to be fixed up. However on newer platforms the simple rules no longer work. We need to allow specifying the PCIe compatiable string for each individual SoC. We introduce CONFIG_SYS_FSL_PCIE_COMPAT for this purpose and set it if the default isn't sufficient. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | cmd_nand: fix help of nand erase subcommandDaniel Hobi2011-05-24-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | env_nand: zero-initialize variable nand_erase_optionsDaniel Hobi2011-05-24-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | .gitignore: update list of u-boot.* files and add *.binecc2011-05-22-3/+5
| | | | | | | | | | | | | | 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>
* | MPC8xx: Make SPD823TS board build againWolfgang Denk2011-05-22-1/+0
|/ | | | | | | | 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>
* Prepare v2011.06-rc1v2011.06-rc1Wolfgang Denk2011-05-19-2/+2
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Minor coding style cleanup.Wolfgang Denk2011-05-19-21/+11
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* net/tftp.c: fix typoLuca Ceresoli2011-05-19-1/+1
| | | | | | Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* TFTP: add tftpsrv commandLuca Ceresoli2011-05-19-2/+26
| | | | | | Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* TFTP: net/tftp.c: add server mode receiveLuca Ceresoli2011-05-19-4/+64
| | | | | | Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* TFTP: rename STATE_RRQ to STATE_SEND_RRQLuca Ceresoli2011-05-19-6/+6
| | | | | | | | | 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>
* TFTP: replace "server" with "remote" in local variable namesLuca Ceresoli2011-05-19-14/+14
| | | | | | | | | 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>
* net/tftp.c: cosmetic: do not initialise statics to 0 or NULLLuca Ceresoli2011-05-19-2/+2
| | | | | | | | 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>
* net/tftp.c: cosmetic: fix indentationLuca Ceresoli2011-05-19-5/+6
| | | | | | | | 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>
* net/tftp.c: cosmetic: trailing statements should be on next lineLuca Ceresoli2011-05-19-3/+6
| | | | | | | | 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>
* net/tftp.c: cosmetic: fix brace issuesLuca Ceresoli2011-05-19-11/+6
| | | | | | | | | 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>
* net/tftp.c: cosmetic: do not use assignment in if conditionLuca Ceresoli2011-05-19-6/+12
| | | | | | | | | | | | | | | | | | | 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>
* net/tftp.c: cosmetic: fix pointer syntax issuesLuca Ceresoli2011-05-19-10/+10
| | | | | | | | | 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>
* net/tftp.c: cosmetic: fix whitespace issuesLuca Ceresoli2011-05-19-95/+97
| | | | | | | | | | | | | | | | | | 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>
* net/tftp.c: cosmetic: fix lines over 80 charactersLuca Ceresoli2011-05-19-24/+42
| | | | | Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-05-19-9/+40
|\ | | | | | | | | | | * '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
| * powerpc/85xx: add support for env in MMC/SPI on corenet ds boardsShaohui Xie2011-05-18-9/+30
| | | | | | | | | | Signed-off-by: Shaohui Xie <b21989@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Enable eSPI support on corenet ds boardsShaohui Xie2011-05-18-0/+10
| | | | | | | | | | Signed-off-by: Shaohui Xie <b21989@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | km/common: add pnvramsize to default environmentHolger Brunck2011-05-18-0/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | km/common: simplify default environmentHolger Brunck2011-05-18-126/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | km/common: implement boardId HWkey checks as u-boot cmdThomas Herzmann2011-05-18-29/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | MMC: omap_hsmmc.c: Add missing prototype headerDirk Behme2011-05-18-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | fsl_esdhc: Initialize mmc->b_maxFabio Estevam2011-05-18-0/+1
| | | | | | | | | | | | | | 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>
* | mmc: enable partition switch function for emmcLei Wen2011-05-18-5/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | cmd_mmc: eliminate device num in the mmc commandLei Wen2011-05-18-88/+116
| | | | | | | | | | | | | | mmc command applied device, like ide and usb... Signed-off-by: Lei Wen <leiwen@marvell.com> Acked-by: Andy Fleming <afleming@freescale.com>
* | mmc_spi: generate response for send status commandThomas Chou2011-05-18-0/+6
|/ | | | | | | | | | 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>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2011-05-18-1696/+1287
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 ...
| * avr32: add ATAG_BOARDINFOAndreas Bießmann2011-05-18-0/+19
| | | | | | | | | | | | | | | | | | 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>
| * at91: reworked support for otc570 boardDaniel Gorsulowski2011-05-18-164/+211
| | | | | | | | | | | | | | The otc570 board support was broken. Within this opportunity, I completely reworked the board files. Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
| * at91: reworked support for meesc boardDaniel Gorsulowski2011-05-18-1/+2
| | | | | | | | | | | | | | The meesc board support was broken. Within this opportunity, I completely reworked the board files. Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
| * hammerhead: move CONFIG_SYS_TEXT_BASE to headerAndreas Bießmann2011-05-18-1/+1
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * mimc200: move CONFIG_SYS_TEXT_BASE to headerAndreas Bießmann2011-05-18-1/+1
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to headerAndreas Bießmann2011-05-18-1/+1
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * atstk100x: move CONFIG_SYS_TEXT_BASE to headerAndreas Bießmann2011-05-18-1/+4
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * atngw100: move CONFIG_SYS_TEXT_BASE to headerAndreas Bießmann2011-05-18-1/+1
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * mimc200: fix "#define XXXX 1"Andreas Bießmann2011-05-18-28/+28
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * hammerhead: fix "#define XXXX 1"Andreas Bießmann2011-05-18-24/+24
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * favr-32-ezkit: fix "#define XXXX 1"Andreas Bießmann2011-05-18-23/+23
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * atstk1006: fix "#define XXXX 1"Andreas Bießmann2011-05-18-24/+24
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * atstk1004: fix "#define XXXX 1"Andreas Bießmann2011-05-18-21/+21
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * atstk1003: fix "#define XXXX 1"Andreas Bießmann2011-05-18-21/+21
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * atstk1002: fix "#define XXXX 1"Andreas Bießmann2011-05-18-24/+24
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * atngw100: fix "#define XXXX 1"Andreas Bießmann2011-05-18-27/+27
| | | | | | | | Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * avr32: use single linker scriptAndreas Bießmann2011-05-18-286/+2
| | | | | | | | | | | | | | 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>
generated by cgit v1.1 at 2024-12-19 08:23:41 +0000