afbc526336
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
2008-09-12 16:13:12 +02:00
b476b03256
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
2008-09-12 15:23:20 +02:00
b18410e508
ppc4xx: Enable device tree (FDT) support in zeus board port
...
Signed-off-by: Stefan Roese <sr@denx.de>
2008-09-12 07:12:39 +02:00
7bf5ecfa50
ppc4xx: Fix SDRAM inititialization of multiple 405 based board ports
...
This patch fixes a problem introdiced with patch
bbeff30c
2008-09-12 07:12:33 +02:00
61737c59a3
ppc4xx: Add .gitignore file to xilinx-ppc440 boards
...
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Signed-off-by: Stefan Roese <sr@denx.de>
2008-09-12 07:11:48 +02:00
2bec498ed1
ppc4xx: Fix compilation of v5fx30teval_flash
...
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Signed-off-by: Stefan Roese <sr@denx.de>
2008-09-12 07:10:31 +02:00
4bed9deebb
ppc4xx: Fix in-tree build for ppc440-generic boards
...
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Signed-off-by: Stefan Roese <sr@denx.de>
2008-09-12 07:08:08 +02:00
06c4ab50f5
ARM: synchronize mach-types.h with linux 2.6.27-rc6
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-12 02:20:47 +02:00
3ee9f03f58
at91rm9200: fix errors with CONFIG_CMD_I2C_TREE
...
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>
2008-09-12 02:20:47 +02:00
b5b0344957
ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c
...
ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c
Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
2008-09-12 02:20:47 +02:00
03db53335c
make: Remove redundant __ARM__ addition when cross-compiling on *BSD
...
__ARM__ is given by arm_config.mk automatically.
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2008-09-12 02:20:46 +02:00
8cc62a7d9c
Fix MACH_TYPE for the AT91RM9200DK board.
...
Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
2008-09-12 02:20:46 +02:00
274737e5eb
i.mx change get_timer(base) to return time since base
...
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>
2008-09-12 02:20:46 +02:00
48fed40575
i.MX use u-boot baud rate and don't assume UART master clock
...
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>
2008-09-12 02:20:46 +02:00
6e1551a870
arm920t fix constant error in start.S
...
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>
2008-09-12 02:20:46 +02:00
b23253835f
ARM OMAP : Correct Invalid Timer Register Field Declaration in omap1510.h & 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>
2008-09-12 02:20:40 +02:00
c455d07396
Set up SD/MMC OCR as comment describes. i.e. 3.2-3.4v.
...
Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
2008-09-12 01:23:44 +02:00
eb16135df2
i.MX31: document timer precision option
...
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
2008-09-12 01:23:44 +02:00
1a6337b013
i.MX31: Make the SPI bus and chip select configurable for MC13783
...
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>
2008-09-12 01:23:44 +02:00
8c4ebec25b
i.MX31: Add reset_timer() and modify get_timer_masked().
...
This patch adds the reset_timer() function (needed by nand_base.c) and
modifies the get_timer_masked() to work in the same way as the omap24xx
function.
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
2008-09-12 01:23:43 +02:00
deeec4991a
ap325rxa: remove duplicate CONFIG_FLASH_CFI_DRIVER
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:09 +02:00
a3a08c0ced
bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' label
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:09 +02:00
0e8d158664
rename CFG_ENV macros to CONFIG_ENV
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:06 +02:00
1ede78710c
nvedit: rename error comment to CONFIG_ENV_IS_IN_
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:05 +02:00
b64b775e75
cmd_mem: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:05 +02:00
8a40fb148e
move cmd_get_data_size to command.c
...
add CMD_DATA_SIZE macro to enable it
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:05 +02:00
507641d249
env_flash: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:04 +02:00
5a1aceb068
rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:04 +02:00
7d9b5bae5b
cleanup use of CFG_ENV_IS_IN_FLASH
...
- #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>
2008-09-10 22:48:03 +02:00
0cf4fd3cf8
rename environment.c in env_embedded.c to reflect is functionality
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:01 +02:00
c0878af6e3
env_nowhere: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:01 +02:00
93f6d72544
rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:00 +02:00
2556ef7811
env_sf: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:00 +02:00
0b5099a841
rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:00 +02:00
55c5f49910
env_onenand: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:48:00 +02:00
9656138ff1
rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:59 +02:00
957a0e6957
env_nvram: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:59 +02:00
9314cee691
rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:59 +02:00
06f6135439
env_nand: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:59 +02:00
51bfee1920
rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:58 +02:00
d8cc04d0ac
env_dataflash: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:58 +02:00
057c849c45
rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASH
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:58 +02:00
d1034bc8db
cmd_eeprom: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 22:47:52 +02:00
bf5a7710ec
env_eeprom: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 21:09:38 +02:00
bb1f8b4f8b
rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 21:09:38 +02:00
32628c5008
cmd_mac: Move conditional compilation to Makefile
...
finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM
start in commit ad8f8687b7
2008-09-10 21:09:37 +02:00
e5648acab1
cmd_fdc: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 21:09:37 +02:00
2d02d91d53
common/Makefile: add core command section
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 21:09:37 +02:00
0d92d4a699
cmd_vfd: Move conditional compilation to Makefile
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-09-10 21:09:37 +02:00
0b7c563989
muas3001: update BR4 settings
...
Also set up the port pins for using I2C.
Signed-off-by: Heiko Schocher <hs@denx.de>
2008-09-10 11:20:27 +02:00
Wolfgang Denk