summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-09-12-4050/+3978
|\
| * Merge branch 'Makefile-next' of git://git.denx.de/u-boot-armWolfgang Denk2008-09-12-4050/+3978
| |\
| | * ap325rxa: remove duplicate CONFIG_FLASH_CFI_DRIVERJean-Christophe PLAGNIOL-VILLARD2008-09-10-1/+0
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' labelJean-Christophe PLAGNIOL-VILLARD2008-09-10-5/+3
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV macros to CONFIG_ENVJean-Christophe PLAGNIOL-VILLARD2008-09-10-2795/+2795
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * nvedit: rename error comment to CONFIG_ENV_IS_IN_Jean-Christophe PLAGNIOL-VILLARD2008-09-10-1/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * cmd_mem: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-5/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * move cmd_get_data_size to command.cJean-Christophe PLAGNIOL-VILLARD2008-09-10-38/+33
| | | | | | | | | | | | | | | | | | add CMD_DATA_SIZE macro to enable it Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_flash: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-591/+591
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * cleanup use of CFG_ENV_IS_IN_FLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | - #if CFG_ENV_IS_IN_FLASH - #if (CFG_ENV_IS_IN_FLASH == 1) - #define CFG_ENV_IS_IN_FLASH 0 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename environment.c in env_embedded.c to reflect is functionalityJean-Christophe PLAGNIOL-VILLARD2008-09-10-226/+226
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_nowhere: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHEREJean-Christophe PLAGNIOL-VILLARD2008-09-10-69/+69
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_sf: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+6
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_onenand: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENANDJean-Christophe PLAGNIOL-VILLARD2008-09-10-4/+4
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_nvram: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-8/+3
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAMJean-Christophe PLAGNIOL-VILLARD2008-09-10-93/+93
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_nand: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NANDJean-Christophe PLAGNIOL-VILLARD2008-09-10-34/+34
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_dataflash: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-17/+17
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * cmd_eeprom: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-7/+2
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * env_eeprom: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROMJean-Christophe PLAGNIOL-VILLARD2008-09-10-127/+127
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * cmd_mac: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-11/+8
| | | | | | | | | | | | | | | | | | | | | finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM start in commit ad8f8687b78c3e917b173f038926695383c55555 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * cmd_fdc: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-13/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * common/Makefile: add core command sectionJean-Christophe PLAGNIOL-VILLARD2008-09-10-3/+5
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * cmd_vfd: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-3/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-09-12-286/+3670
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2008-09-12-101/+22
| |\ \
| | * | ppc4xx: Enable device tree (FDT) support in zeus board portStefan Roese2008-09-12-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Fix SDRAM inititialization of multiple 405 based board portsStefan Roese2008-09-12-98/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem introdiced with patch bbeff30c [ppc4xx: Remove superfluous dram_init() call or replace it by initdram()]. The boards affected are: - PCI405 - PPChameleonEVB - quad100hd - taihu - zeus Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Add .gitignore file to xilinx-ppc440 boardsRicardo Ribalda Delgado2008-09-12-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Fix compilation of v5fx30teval_flashRicardo Ribalda Delgado2008-09-12-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Fix in-tree build for ppc440-generic boardsRicardo Ribalda Delgado2008-09-12-1/+1
| | |/ | | | | | | | | | | | | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ARM: synchronize mach-types.h with linux 2.6.27-rc6Jean-Christophe PLAGNIOL-VILLARD2008-09-12-127/+3518
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | at91rm9200: fix errors with CONFIG_CMD_I2C_TREEJens Scharsig2008-09-12-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | This patch prevents linker error on AT91RM9200 boards, if CONFIG_CMD_I2_TREE is set. It implements i2c_set_bus_speed and i2c_get_bus_speed as a dummy function. Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
| * | ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.cHugo Villeneuve2008-09-12-20/+7
| | | | | | | | | | | | | | | | | | ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
| * | make: Remove redundant __ARM__ addition when cross-compiling on *BSDShinya Kuribayashi2008-09-12-9/+0
| | | | | | | | | | | | | | | | | | __ARM__ is given by arm_config.mk automatically. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | Fix MACH_TYPE for the AT91RM9200DK board.Claudio Scordino2008-09-12-1/+1
| | | | | | | | | | | | Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
| * | i.mx change get_timer(base) to return time since baseAndrew Dyer2008-09-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes get_timer() for i.MX to return the time since 'base' instead of the time since the counter was at zero. Symptom seen is flash timeout errors when erasing or programming a sector using the common cfi flash code. Signed-off-by: Andrew Dyer <adyer@righthandtech.com>
| * | i.MX use u-boot baud rate and don't assume UART master clockAndrew Dyer2008-09-12-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Change the i.MX serial driver to use the baud rate set in the u-boot environment 2) don't assume a 16MHz value for PERCLK1 in baud rate calculations 3) don't write a 1 to the RDR bit in the USR2 reg. (bit is not "write one to clear" like other status bits in the reg.) Signed-off-by: Andrew Dyer <adyer@righthandtech.com>
| * | arm920t fix constant error in start.SAndrew Dyer2008-09-12-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Code in cpu/arm920t/start.S will die with a compilation error if CONFIG_STACKSIZE + CFG_MALLOC_LEN works out to an invalid constant for the ARM sub instruction. Change the code so that each is subtracted independently to avoid the error. Signed-off-by: Andrew Dyer <adyer@righthandtech.com>
| * | ARM OMAP : Correct Invalid Timer Register Field Declaration in omap1510.h & ↵Gururaja Hebbar K R2008-09-12-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omap730.h - Correct Invalid #define of MPUTIM_PTV_MASK for omap1510 & omap730 register definition MPUTIM_PTV_MASK is defined as #define MPUTIM_PTV_MASK (0x7<<PTV_BIT) while it should have been #define MPUTIM_PTV_MASK (0x7<<MPUTIM_PTV_BIT) - Below Patch corrects the same Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in>
| * | Set up SD/MMC OCR as comment describes. i.e. 3.2-3.4v.Adrian Filipi2008-09-12-2/+2
| | | | | | | | | | | | Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
| * | i.MX31: document timer precision optionGuennadi Liakhovetski2008-09-12-0/+13
| | | | | | | | | | | | Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
| * | i.MX31: Make the SPI bus and chip select configurable for MC13783Magnus Lilja2008-09-12-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i.MX31 has three SPI buses and each bus has several chip selects and the MC13783 chip can be connected to any of these. The current RTC driver for MC13783 is hardcoded for CSPI2/SS2. This patch makes make MC13783 SPI bus and chip select configurable via CONFIG_MC13783_SPI_BUS and CONFIG_MC13783_SPI_CS. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>