summaryrefslogtreecommitdiff
Commit message (Expand)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
| | * bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' labelJean-Christophe PLAGNIOL-VILLARD2008-09-10-5/+3
| | * rename CFG_ENV macros to CONFIG_ENVJean-Christophe PLAGNIOL-VILLARD2008-09-10-2795/+2795
| | * nvedit: rename error comment to CONFIG_ENV_IS_IN_Jean-Christophe PLAGNIOL-VILLARD2008-09-10-1/+1
| | * cmd_mem: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-5/+1
| | * move cmd_get_data_size to command.cJean-Christophe PLAGNIOL-VILLARD2008-09-10-38/+33
| | * env_flash: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | * rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-591/+591
| | * cleanup use of CFG_ENV_IS_IN_FLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-27/+27
| | * rename environment.c in env_embedded.c to reflect is functionalityJean-Christophe PLAGNIOL-VILLARD2008-09-10-226/+226
| | * env_nowhere: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | * rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHEREJean-Christophe PLAGNIOL-VILLARD2008-09-10-69/+69
| | * env_sf: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | * rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+6
| | * env_onenand: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | * rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENANDJean-Christophe PLAGNIOL-VILLARD2008-09-10-4/+4
| | * env_nvram: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-8/+3
| | * rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAMJean-Christophe PLAGNIOL-VILLARD2008-09-10-93/+93
| | * env_nand: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | * rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NANDJean-Christophe PLAGNIOL-VILLARD2008-09-10-34/+34
| | * env_dataflash: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | * rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASHJean-Christophe PLAGNIOL-VILLARD2008-09-10-17/+17
| | * cmd_eeprom: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-7/+2
| | * env_eeprom: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-6/+1
| | * rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROMJean-Christophe PLAGNIOL-VILLARD2008-09-10-127/+127
| | * cmd_mac: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-11/+8
| | * cmd_fdc: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-13/+1
| | * common/Makefile: add core command sectionJean-Christophe PLAGNIOL-VILLARD2008-09-10-3/+5
| | * cmd_vfd: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-09-10-3/+1
* | | 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
| | * | ppc4xx: Fix SDRAM inititialization of multiple 405 based board portsStefan Roese2008-09-12-98/+10
| | * | ppc4xx: Add .gitignore file to xilinx-ppc440 boardsRicardo Ribalda Delgado2008-09-12-0/+3
| | * | ppc4xx: Fix compilation of v5fx30teval_flashRicardo Ribalda Delgado2008-09-12-2/+2
| | * | ppc4xx: Fix in-tree build for ppc440-generic boardsRicardo Ribalda Delgado2008-09-12-1/+1
| | |/
| * | ARM: synchronize mach-types.h with linux 2.6.27-rc6Jean-Christophe PLAGNIOL-VILLARD2008-09-12-127/+3518
| * | at91rm9200: fix errors with CONFIG_CMD_I2C_TREEJens Scharsig2008-09-12-0/+10
| * | ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.cHugo Villeneuve2008-09-12-20/+7
| * | make: Remove redundant __ARM__ addition when cross-compiling on *BSDShinya Kuribayashi2008-09-12-9/+0
| * | Fix MACH_TYPE for the AT91RM9200DK board.Claudio Scordino2008-09-12-1/+1
| * | i.mx change get_timer(base) to return time since baseAndrew Dyer2008-09-12-1/+1
| * | i.MX use u-boot baud rate and don't assume UART master clockAndrew Dyer2008-09-12-15/+41
| * | arm920t fix constant error in start.SAndrew Dyer2008-09-12-2/+4
| * | ARM OMAP : Correct Invalid Timer Register Field Declaration in omap1510.h & o...Gururaja Hebbar K R2008-09-12-2/+2
| * | Set up SD/MMC OCR as comment describes. i.e. 3.2-3.4v.Adrian Filipi2008-09-12-2/+2
| * | i.MX31: document timer precision optionGuennadi Liakhovetski2008-09-12-0/+13
| * | i.MX31: Make the SPI bus and chip select configurable for MC13783Magnus Lilja2008-09-12-2/+29