David Brownell [Fri, 17 Jul 2009 01:40:55 +0000 (18:40 -0700)]
rm9200 lowevel_init: don't touch reserved/readonly registers
For some reason the AT91rm9200 lowlevel init writes to a bunch of
reserved or read-only addresses. All the boards seem to define the
value-to-be-written values as zero ... but they shouldn't actually
be writing *anything* there.
No documented erratum justifies these accesses. It looks like maybe
some pre-release BDI-2000 setup code has been carried along by cargo
cult programming since at least late 2004 (per GIT history).
Here's a patch disabling what seems to be bogosity. Tested on a
csb337; there were no behavioral changes.
Signed-off-by: David Brownell <david-b@pacbell.net>
on RM9200ek
Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
David Hunter [Thu, 30 Jul 2009 21:32:49 +0000 (14:32 -0700)]
pxa: Fix typo in GCDR(x)
Fix a typo in the GCDR(x) macro. It's a good thing no one was using it.
Signed-off-by: David Hunter <hunterd42@gmail.com>
Eric Benard [Sat, 18 Jul 2009 21:45:15 +0000 (23:45 +0200)]
Add AT91SAM9260 to at91's lowlevel_init.S
Needed for AT91SAM9260 NOR Boot on Eukrea's CPU9260.
Signed-off-by: Eric Benard <eric@eukrea.com>
Dirk Eibach [Thu, 30 Jul 2009 07:36:33 +0000 (09:36 +0200)]
ppc4xx: Remove check for PPC460EX from CompactCenter
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 29 Jul 2009 06:46:10 +0000 (08:46 +0200)]
ppc4xx: Add support for PPC460EX/460GT rev B chip to AMCC Canyonlands
This patch is based on a diff created by Phong Vo from AMCC.
Signed-off-by: Phong Vo <pvo@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Wed, 29 Jul 2009 06:45:27 +0000 (08:45 +0200)]
ppc4xx: Add basic support for AMCC PPC460EX/460GT rev B chips
This patch is based on a diff created by Phong Vo from AMCC.
Signed-off-by: Phong Vo <pvo@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Tue, 28 Jul 2009 13:12:04 +0000 (15:12 +0200)]
ppc4xx: Canyonlands-NAND-boot: Support 2 Crucial 512MByte SODIMM's
Some Canyonlands boards are equipped with different SODIMM's. This is no
problem with the "normal" NOR booting Canyonlands U-Boot, since it
automatically detects the SODIMM's via SPD data and correctly configures
them. But the NAND booting version is different. Here we only have 4k
of image size to completely setup the hardware, including DDR2 setup.
So we need to use a fixed DDR2 setup here. This doesn't work for different
SODIMM's right now.
Currently only this Crucial SODIMM is support:
CT6464AC667.8FB (dual ranked)
Now some boards are shipped with this SODIMM:
CT6464AC667.4FE (single ranked)
This patch now supports both SODIMM's by configuring first for the dual
ranked DIMM. A quick shows, if this module is really installed. If this test
fails, the DDR2 controller is re-configured for the single
ranked SODIMM.
Tested with those SODIMM's:
CT6464AC667.8FB (dual ranked)
CT6464AC667.4FE (single ranked)
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Tue, 28 Jul 2009 08:56:03 +0000 (10:56 +0200)]
ppc4xx: amcc: Move "kernel_addr_r" etc to higher locations (> 16MB)
This patch moves the load addresses for kernel, fdt and ramdisk to higher
addresses (>= 16MB). This enables booting of bigger kernel images (e.g.
lockdep enabled).
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Tue, 28 Jul 2009 08:50:32 +0000 (10:50 +0200)]
ppc4xx: amcc: Set CONFIG_SYS_BOOTMAPSZ to 16MB for big kernels
This patch changes CONFIG_SYS_BOOTMAPSZ from 8MB to 16MB which is the
initial TLB on 40x PPC's in the Linux kernel. With this change even bigger
Linux kernels (> 8MB) can be booted.
This patch also sets CONFIG_SYS_BOOTM_LEN to 16MB (default 8MB) to enable
decompression of bigger images.
Signed-off-by: Stefan Roese <sr@denx.de>
Wolfgang Denk [Wed, 29 Jul 2009 22:36:25 +0000 (00:36 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Kumar Gala [Wed, 29 Jul 2009 02:49:52 +0000 (21:49 -0500)]
Update Freescale copyrights to remove "All Rights Reserved"
"All Rights Reserved" conflicts with the GPL.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Alessandro Rubini [Fri, 24 Jul 2009 09:27:14 +0000 (11:27 +0200)]
arm nomadik: add i2c
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Alessandro Rubini [Fri, 24 Jul 2009 09:27:03 +0000 (11:27 +0200)]
arm nomadik: add gpio support
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Tom Rix [Sun, 28 Jun 2009 17:52:32 +0000 (12:52 -0500)]
OMAP3 Remove twl4030 defines
These defines have been subplanted by the equivelent defines in
include/twl4030.h
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Heiko Schocher <hs@denx.de>
Tom Rix [Sun, 28 Jun 2009 17:52:31 +0000 (12:52 -0500)]
OMAP3 Move twl4030 mmc function
Because twl4030 now has its own device files, move and rename
twl4030_mmc_config.
twl4030_mmc_config initializes the twl4030 power setting to
the mmc device. Because it is in the twl4030 power domain, move
it out of drivers/mmc/omap3_mmc.c and into drivers/power/twl4030.c.
The function was renamed to twl4030_power_mmc_init because all
the functions in this file are to have the format
twl4030_power_<device>_<action>
In this case the suffix is mmc_init so
device : mmc
action : init
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Heiko Schocher <hs@denx.de>
Tom Rix [Sun, 28 Jun 2009 17:52:30 +0000 (12:52 -0500)]
OMAP3 Move twl4030 power and led functions
Because twl4030 now has its own device files, move exiting
omap3 power_init_r to a new location.
power_init_r is the only function in board/omap3/common.
It initializes the twl4030 power for the board and enables
the led.
The power part of the the function is moved to twl4030_power_init in
drivers/power/twl4030.c The power compilation is conditional on the
existing config variable CONFIG_TWL4030_POWER.
The led part is moved to twl4030_led_init in the new file
drivers/misc/twl4030_led.c The led compilation is conditional on
the new config variable CONFIG_TWL4030_LED
The directory board/omap3/common was removed because power_init_r
was the only function in it.
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Heiko Schocher <hs@denx.de>
Wolfgang Denk [Wed, 29 Jul 2009 07:25:52 +0000 (09:25 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 29 Jul 2009 07:15:36 +0000 (09:15 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Tue, 28 Jul 2009 20:13:52 +0000 (22:13 +0200)]
TQM8xx* boards: set larger SMC Rx buffer len
Commit
2b3f12c2 added support for configurable SMC Rx buffer length on
8xx systems. Enable this feature on TQM8xx* based boards.
This fixes the problem that pasting text in the middle of a line
(i. e. inserting in edit mode) did not work - only the first two
characters got inserted, the rest was lost.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Tue, 28 Jul 2009 20:07:37 +0000 (22:07 +0200)]
Fix ext2load return code
Make the ext2load command return 0 on success (instead of the file
length).
Also fix output format (get rid of random newlines) and some coding
style issues (long lines etc.).
Signed-off-by: Wolfgang Denk <wd@denx.de>
Weirich, Bernhard [Wed, 10 Jun 2009 12:00:37 +0000 (14:00 +0200)]
ext2: fix inode size and calculations
Signed-off-by: unsik Kim <donari75@gmail.com>
Signed-off-by: Bernhard Weirich <bernhard.weirich@riedel.net>
Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Wolfgang Denk <wd@denx.de>
Tom Rix [Sun, 28 Jun 2009 17:52:29 +0000 (12:52 -0500)]
TWL4030 Add power reset button
The Zoom2 power reset button is on the top right side of the
main board. Press and hold for about to 8 seconds to completely
reset the board.
Some of the beta boards have a hardware problem that prevents
using this feature. If is difficult to further characterize the
boards that fail. So disable resetting for all beta boards.
The Zoom1 reset button is the red circle on the top right,
front of the board. Press and hold the button for 8 seconds to
completely reset the board.
After analyzing beagle, it was determined that other boards
that use the twl4030 for power managment can also make use
this function.
The resetting is done by the power management part of the twl4030.
Since there is no existing drivers/power, add one.
The compilation of power/twl4030.h is controlled by the config
variable CONFIG_TWL4030_POWER
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Heiko Schocher <hs@denx.de>
Tom Rix [Sun, 28 Jun 2009 17:52:28 +0000 (12:52 -0500)]
TWL4030 Add initial support
The TWL4030 supplies many peripherals for OMAP3 boards. These include
power management, usb and, keyboard.
The product description is found here:
http://focus.ti.com/docs/prod/folders/print/tps65950.html
Product reference document, tps65950.pdf, is found here:
http://www.ti.com/lit/gpn/tps65950
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Heiko Schocher <hs@denx.de>
Tom Rix [Sun, 28 Jun 2009 17:52:27 +0000 (12:52 -0500)]
OMAP I2C Fix the sampling clock.
This problem is seen on Zoom1 and Zoom2 in the startup and
when i2c probe is used
Before :
In: serial
Out: serial
Err: serial
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_pin: I2C_STAT=1000
I2C read: I/O error
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_bb: I2C_STAT=1000
Die ID #
327c00020000000004013ddd05026013
Hit any key to stop autoboot: 0
OMAP3 Zoom1# i2c probe
Valid chip addresses:timed out in wait_for_bb: I2C_STAT=1000
02 03 04 05 06 07 08 09 0A 0B 0C 0D <snip>
After :
In: serial
Out: serial
Err: serial
Die ID #
327c00020000000004013ddd05026013
Hit any key to stop autoboot: 0
OMAP3 Zoom1# i2c probe
Valid chip addresses: 48 49 4A 4B
The addresses are for the twl4030.
The prescalar that converts the function clock to the sampling
clock is hardcoded to 0. The reference manual recommends 7
if the function clock is 96MHz.
Instead of just changing the hardcoded values, the prescalar
is calculated from the value I2C_IP_CLK.
The i2c #defines are in kHz. The speed passed into the
i2c init routine is in Hz. To be consistent, change the
defines to be in Hz.
The timing calculations are based on what is done in the
linux 2.6.30 kernel in drivers/i2c/buses/i2c_omap.c as
apposed to what is done in TRM.
The major variables in the timing caculations are
specified as #defines that can be overriden as required.
The variables and their defaults are
I2C_IP_CLK SYSTEM_CLOCK_96
I2C_INTERNAL_SAMPLING_CLK
19200000
I2C_FASTSPEED_SCLL_TRIM 6
I2C_FASTSPEED_SCLH_TRIM 6
I2C_HIGHSPEED_PHASE_ONE_SCLL_TRIM I2C_FASTSPEED_SCLL_TRIM
I2C_HIGHSPEED_PHASE_ONE_SCLH_TRIM I2C_FASTSPEED_SCLH_TRIM
I2C_HIGHSPEED_PHASE_TWO_SCLL_TRIM I2C_FASTSPEED_SCLL_TRIM
I2C_HIGHSPEED_PHASE_TWO_SCLH I2C_FASTSPEED_SCLH_TRIM
This was runtime verified on Zoom1, Zoom2, Beagle and Overo.
The 400kHz and 3.4M cases were verifed on test Zoom1,
Zoom2, Beagle and Overo configurations.
Testing for omap2 will be done in a second step as Nishanth
and Jean-Christophe commented.
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Heiko Schocher <hs@denx.de>
Heiko Schocher [Mon, 20 Jul 2009 07:59:37 +0000 (09:59 +0200)]
arm, i2c: added support for the TWSI I2C Interface
Signed-off-by: Heiko Schocher <hs@denx.de>
Stefan Roese [Mon, 27 Jul 2009 07:13:38 +0000 (09:13 +0200)]
ppc4xx: Fix problem with NOR range assignment in Canyonlands ft_board_setup
This patch fixes the problem, that the current fdt board fixup code only
set's one range, the one for NOR. By this it's overwriting the already
correctly configured values done in __ft_board_setup(). Just remove this
now unneeded NOR fixup and all the ranges are correctly defined.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: Felix Radensky <felix@embedded-sol.com>
Stefan Roese [Mon, 27 Jul 2009 05:42:48 +0000 (07:42 +0200)]
ppc4xx: Add some NAND-booting bootstrap entries to Kilauea chip_config cmd
This patch adds some I2C bootstrap setting for NAND booting to the Kilauea
chip_config command ("533-nand" and "600-nand").
Additionally some incorrectly indented lines are fixed.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Mon, 27 Jul 2009 05:42:37 +0000 (07:42 +0200)]
ppc4xx: Kilauea: Fix SDRAM init in NAND booting version
DDR2 Auto-calibration needs to be disabled on the NAND booting PPC4xx
targets. Otherwise the configured fixed init values for some DDR2
controller registers (e.g. RQDC) are not initialized at all resulting
in a non working SDRAM.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Mon, 27 Jul 2009 08:53:43 +0000 (10:53 +0200)]
ppc4xx: Fix Arches DDR2 initialization
Testing on AMCC Arches with the latest U-Boot version yielded that DDR2
initialization is currently broken. U-Boot hangs upon relocation to SDRAM
or crashes with random traps. This patch fixes this problem. Arches now
uses a different WRDTR and CLKTR default setting than Canyonlands/Glacier.
Signed-off-by: Stefan Roese <sr@denx.de>
Dirk Eibach [Mon, 27 Jul 2009 06:49:48 +0000 (08:49 +0200)]
ppc4xx: Add GDsys CompactCenter board support.
Board support for the Guntermann & Drunck CompactCenter and
DevCon-Center.
Based on the AMCC Canyonlands board support by Stefan Roese.
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Reinhard Arlt [Sat, 25 Jul 2009 04:19:12 +0000 (06:19 +0200)]
mpc83xx: Add esd VME8349 board support
This patch adds support for the esd VME8349 board equipped with the
MPC8349. It's a VME PMC carrier board equipped with the Tundra
TSI148 VME-bridge.
Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Paul Gortmaker [Thu, 23 Jul 2009 21:10:55 +0000 (17:10 -0400)]
sbc8349: combine HRCW flash and u-boot image flash
Up to this point in time, the sbc8349 board was storing the u-boot
image in flash 2x. One for the HRCW value at the beginning of
flash (0xff80_0000), and once close to the end of flash (0xfff8_0000)
for the actual image that got executed.
This moves the TEXT_BASE to be the beginning of flash, which makes
the second copy of the image redundant, and frees up the flash
from the end of the environment storage to the end of the flash
device itself.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Kim Phillips [Thu, 23 Jul 2009 19:09:38 +0000 (14:09 -0500)]
mpc83xx: CONFIG_83XX_GENERIC_PCI is now synonymous with CONFIG_PCI; remove the former
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Wolfgang Denk [Mon, 27 Jul 2009 08:37:37 +0000 (10:37 +0200)]
Prepare 2009.08-rc1 (again, after fixing last minute issues).
Update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Mon, 27 Jul 2009 08:06:39 +0000 (10:06 +0200)]
cpu/arm920t/start.S: include <common.h> to have ROUND() defined
Commit
fcd3c87e made include/common.h usable by assembler code but
failed to update cpu/arm920t/start.S
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Mon, 27 Jul 2009 08:01:11 +0000 (10:01 +0200)]
at91cap9adk: fix #ifdef/#endif pairing (2nd try)
Commit
7024aa14 was supposed to fix the #ifdef/#endif pairing in
include/configs/at91cap9adk.h, but did not cate all problems.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Mon, 27 Jul 2009 07:58:14 +0000 (09:58 +0200)]
Fix include/common.h for boards with CONFIG_STATUS_LED
The reordering of include/common.h by commit
fcd3c87e495f3c48 broke
boards with status LED support, resulting in
error: #error Status LED configuration missing
errors. Undo this reordering to avoid this issue.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Mon, 27 Jul 2009 07:19:15 +0000 (09:19 +0200)]
ABI: fix build problems due to now needed div64 routine.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Mon, 27 Jul 2009 06:50:59 +0000 (08:50 +0200)]
PMC405DE: fix out of tree building
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 26 Jul 2009 22:24:55 +0000 (00:24 +0200)]
Prepare 2009.08-rc1
Update CHANGELOG, minor coding style fix.
Signed-off-by: Wolfgang Denk <wd@denx.de>
rhabarber1848@web.de [Fri, 24 Jul 2009 06:16:30 +0000 (08:16 +0200)]
add WATCHDOG_RESET to allow LZMA kernel decompression on slow machines
Signed-off-by: rhabarber1848@web.de
Niklaus Giger [Thu, 23 Jul 2009 21:31:58 +0000 (23:31 +0200)]
Less verbose output when loading vxworks 6.x images
Loading vxWorks 5.x images resulted just into 3 or 4 lines of output.
With vxWorks 6.x and the new GCC it emits about 30 lines, which is
far too noisy in my opinion.
Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
Wolfgang Denk [Thu, 23 Jul 2009 22:17:48 +0000 (00:17 +0200)]
Make include/common.h usable by assembler code
Commit
70ebf316 factored out the ROUND() macro into include/common.h,
not realizing that the primary use of this macro on AT91 systems was
in start.S where common.h was not included, and could not be included
because it contains a lot of C code which the assembler doesn't
understand.
This patch wraps such code in common.h in a "#ifndef __ASSEMBLY__"
construct, and then adds an include to cpu/arm926ejs/start.S thus
solving the problem.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Heiko Schocher [Thu, 23 Jul 2009 11:27:04 +0000 (13:27 +0200)]
arm: add _lshrdi3.S
Signed-off-by: Heiko Schocher <hs@denx.de>
Wolfgang Denk [Thu, 23 Jul 2009 11:15:59 +0000 (13:15 +0200)]
Make linking against libgcc configurable
Many (especially ARM) tool chains seem to come with broken or
otherwise unusable (for the purposes of builing U-Boot) run-time
support libraries `libgcc.a'. By using the "USE_PRIVATE_LIBGCC"
setting we allow to use alternative libraries instead.
"USE_PRIVATE_LIBGCC" can either be set as an environment variable in
the shell, or as a command line argument when running "make", i. e.
$ make USE_PRIVATE_LIBGCC=yes
or
$ USE_PRIVATE_LIBGCC=yes
$ export USE_PRIVATE_LIBGCC
$ make
The value of "USE_PRIVATE_LIBGCC" is the name of the directory which
contains the alternative run-time support library `libgcc.a'. The
special value "yes" selects the directory $(OBJTREE)/lib_$(ARCH) .
Note that not all architectures provide an alternative `libgcc.a' in
their lib_$(ARCH) directories - so far, only ARM does.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Stefan Roese <sr@denx.de>
Dirk Behme [Wed, 22 Jul 2009 15:51:56 +0000 (17:51 +0200)]
Use do_div from div64.h for vsprintf
Use do_div from div64.h for vsprintf in case of 64bit division.
For 32bit division, do_div from div64.h can't be used as it
needs a 64bit parameter.
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Acked-by: Stefan Roese <sr@denx.de>
CC: Simon Kagstrom <simon.kagstrom@netinsight.net>
Kyungmin Park [Mon, 20 Jul 2009 00:47:47 +0000 (09:47 +0900)]
Fix compiler warnings after loff_t change
Now 'env_addr' type is loff_t so use correct field type.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Wolfgang Denk [Sun, 26 Jul 2009 21:28:02 +0000 (23:28 +0200)]
Revert "ppc: Unlock cache-as-ram in a consistent manner"
This reverts commit
982adfc610669482a32127282fe489857a92cfe3.
This patch causes problems on MPC83xx boards - flash recognition stops
working.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Sun, 26 Jul 2009 21:15:57 +0000 (23:15 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Sun, 26 Jul 2009 20:57:11 +0000 (22:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sun, 26 Jul 2009 20:54:23 +0000 (22:54 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Sun, 26 Jul 2009 20:44:27 +0000 (22:44 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb
Jens Scharsig [Fri, 24 Jul 2009 08:31:48 +0000 (10:31 +0200)]
update the EB+MCF-EV123 board support
This patch updates the support for EB+MCF-EV123 board and needs
the [PATCH 1/2 V3] new video driver for bus vcxk framebuffers
* remove the board framebuffer driver
* use the common bus_vcxk framebuffer driver
* adds bmp support
* adds splashimage support
* fix serveral cosmetical errors
Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
[agust@denx.de: fixed some style issues before applying]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Anatolij Gustschin [Sun, 26 Jul 2009 10:05:25 +0000 (12:05 +0200)]
video: bus_vcxk.c: fix style issues added by
50217dee
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Jens Scharsig [Fri, 24 Jul 2009 08:09:02 +0000 (10:09 +0200)]
new video driver for bus vcxk framebuffers
This patch adds a new video driver
* adds common bus_vcxk framebuffer driver
Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
[agust@denx.de: fixed lots of style issues before applying]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Alessandro Rubini [Tue, 21 Jul 2009 12:09:45 +0000 (14:09 +0200)]
lcd.h: define extern vidinfo_t for all cases
include/lcd.h has different vidinfo for different platforms,
and several extern declaration, but one for the default case was
missing. This makes them a single extern declaration for everyone.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Anatolij Gustschin [Sun, 26 Jul 2009 09:04:59 +0000 (11:04 +0200)]
mimc200.c: fix too long lines added by
f68378d6
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Mark Jackson [Tue, 21 Jul 2009 10:35:22 +0000 (11:35 +0100)]
Add LCD support to MIMC200 board
This patch updates the MIMC200 files to enable the LCD.
Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
Mark Jackson [Tue, 21 Jul 2009 10:18:44 +0000 (11:18 +0100)]
Add 16bit colour support in lcd.h
This patch adds support for LCD_COLOR16 in include/lcd.h.
Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
Anatolij Gustschin [Sun, 26 Jul 2009 08:34:58 +0000 (10:34 +0200)]
lib_avr32/board.c: fix too long line added by
716ece1d
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Mark Jackson [Tue, 21 Jul 2009 10:11:37 +0000 (11:11 +0100)]
Add AVR32 LCD support
This patch adds support for the AVR32 LCD controller. This patch is
based off the latest u-boot-video.
A quick summary of what's going on:-
Enable LCDC pixel clock
Enable LCDC port pins
Add framebuffer pointer to global_data struct
Allocate framebuffer
To use the new code, update your board config to include something like
this:-
#define CONFIG_LCD 1
#if defined(CONFIG_LCD)
#define CONFIG_CMD_BMP
#define CONFIG_ATMEL_LCD 1
#define LCD_BPP LCD_COLOR16
#define CONFIG_BMP_16BPP 1
#define CONFIG_FB_ADDR 0x10600000
#define CONFIG_WHITE_ON_BLACK 1
#define CONFIG_VIDEO_BMP_GZIP 1
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE 262144
#define CONFIG_ATMEL_LCD_BGR555 1
#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
#define CONFIG_SPLASH_SCREEN 1
#endif
The standard U-Boot BMP and Splash-screen features should just work.
Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
[agust@denx.de: fixed some style issues]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Alessandro Rubini [Sun, 19 Jul 2009 15:52:27 +0000 (17:52 +0200)]
video: move extern declarations from C to headers
This moves some extern declaration from lcd.c to lcd.h, removing
unneeded ifdef around a pair of them. Additionally, since
gunzip_bmp() was declared static in cmd_bmp.c but extern in lcd.c, I
removed the static. The extra "#include <lcd.h>" in cmd_bmp.c is
added to ensure the header is consistent with the source.
This has been compile-tested on both ARM (at91 boards) and PowerPC
(HH405_config, TQM823L_LCD_config, mcc200_config), to test all use
combinations.
Signed-off-by: Alessandro Rubini <rubini@gnudd.it>
[agust@denx.de: removed gunzip_bmp() fixes as commit
c01171ea did it]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Mike Frysinger [Thu, 23 Jul 2009 20:26:58 +0000 (16:26 -0400)]
Blackfin: restore EVT1 handling in linker script
Sadly, the Blackfin linker script unification lost a small #ifdef logic
needed on older parts. Restore that CONFIG_BFIN_BOOTROM_USES_EVT1 logic.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Wolfgang Denk [Fri, 24 Jul 2009 12:24:07 +0000 (14:24 +0200)]
Revert "zlib: updated to v.1.2.3"
This reverts commit
b201171f2b4d509f3ad510b214bee70ff902e3d6.
The commit caused problems for example when unpacking kernel images:
Uncompressing Kernel Image ... Error: inflate() returned -2
GUNZIP: uncompress, out-of-mem or overwrite error - must
RESET board to recover
Conflicts:
include/u-boot/zlib.h
lib_generic/zlib.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Stefan Roese [Tue, 21 Jul 2009 12:06:29 +0000 (14:06 +0200)]
ppc4xx: Add chip_config command to AMCC Kilauea eval board
This patch removes the "alterpll" command and replaces it with the now
ppc4xx standard "chip_config" command to configure the I2C bootstrap
EEPROM.
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Tue, 21 Jul 2009 12:33:52 +0000 (14:33 +0200)]
ppc4xx: Fix EEPROM configuration on Kilauea
Kilauea has an AT24C02 EEPROM which has an 8 byte page. Without defining
CONFIG_SYS_EEPROM_PAGE_WRITE_BITS to 3 the "eeprom" command doesn't
work correctly.
Additionally the page write delay (CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS)
is set to a more defensive value of 10ms.
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Wed, 22 Jul 2009 11:56:21 +0000 (13:56 +0200)]
ppc4xx: Add 405EP based PMC405DE board
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Mon, 20 Jul 2009 10:15:38 +0000 (12:15 +0200)]
ppc4xx: Add struct for 4xx GPIO controller registers
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Wed, 22 Jul 2009 15:27:56 +0000 (17:27 +0200)]
ppc4xx: Replace 4xx lowercase SPR references
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Mon, 20 Jul 2009 04:57:27 +0000 (06:57 +0200)]
Add "chip_config" command for PPC4xx bootstrap configuration
This patch adds a generic command for programming I2C bootstrap
eeproms on PPC4xx. An implementation for Canyonlands board is
included.
The command name is intentionally chosen not to be PPC4xx specific.
This way other CPU's/SoC's can implement a similar command under
the same name, perhaps with a different syntax.
Usage on Canyonlands:
=> chip_config
Available configurations (I2C address 0x52):
600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100
600-nand - NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100
800-nor - NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100
800-nand - NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100
1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100
1000-nand - NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100
1066-nor - NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88 ***
1066-nand - NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88
=> chip_config 600-nor
Using configuration:
600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100
done (dump via 'i2c md 52 0.1 10')
Reset the board for the changes to take effect
Other 4xx boards will be migrated to use this command soon
as well.
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Peter Tyser [Sat, 18 Jul 2009 00:01:16 +0000 (19:01 -0500)]
xpedite1k: Move to X-ES vendor directory
The XPedite1000 is an X-ES product thus it can be put in board/xes along
with other X-ES boards. Along with the move, the board was renamed to
XPedite1000 from XPedite1K to fit X-ES's standard naming convention.
Maintainership was also transfered to Peter Tyser.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:15 +0000 (19:01 -0500)]
xpedite1k: Sync checkboard() with other X-ES boards
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:14 +0000 (19:01 -0500)]
xpedite1k: Sync up board config options with other X-ES boards
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:13 +0000 (19:01 -0500)]
xpedite1k: Sync organization of board config with other X-ES boards
This change should have no functional effect
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:12 +0000 (19:01 -0500)]
xpedite1k: Sync up commands and environment with other X-ES boards
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:11 +0000 (19:01 -0500)]
xpedite1k: Disable unused ethernet port 1
The XPedite1000 only has 2 available ethernet ports:
ppc_4xx_eth2 (EMAC2) and ppc_4xx_eth3 (EMAC3)
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:10 +0000 (19:01 -0500)]
xpedite1k: Store environment in flash
Previously an I2C EEPROM was used. The EEPROM had size, reliability,
and access issues which are resolved by storing the environment in
flash.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:09 +0000 (19:01 -0500)]
xpedite1k: Add support for additional GPIO pins
Enable GPIO pins for an I2C EEPROM write protect, a system reset pin,
and a PMC #MONARCH pin. These pins are not currently used in U-Boot,
but are used in OSes and may be used in U-Boot in the future.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:08 +0000 (19:01 -0500)]
xpedite1k: Add support for optional flashes
The XPedite1000 can be built with 4 total flashes:
- 512KB AMD socketed
- 16MB Intel soldered
- 2 x 32MB AMD MirrorBit flashes
Add support for the optional 2 32MB CFI-compliant AMD flashes
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:07 +0000 (19:01 -0500)]
xpedite1k: Cleanup coding style
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:06 +0000 (19:01 -0500)]
xpedite1k: Remove support for reading MACs from EEPROM
By default, the XPedite1000 comes installed with xMon, a proprietary
bootloader. xMon stores its MAC address in an onboard EEPROM. Rather
than requiring a non-standard location in the EEPROM to be reserved for
MAC addresses, store the MAC addresses in U-Boot's standard environment.
A U-Boot application or OS application can be used to migrate xMon MAC
addresses to U-Boot's environment if necessary.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:05 +0000 (19:01 -0500)]
xpedite1k: Remove support for fixed SDRAM configuration
All XPedite1000's have SPD EEPROMs present and no fixed configuration
parameters are currently defined or used
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:04 +0000 (19:01 -0500)]
xpedite1k: Remove CONFIG_SYS_DRAM_TEST support
POST or command line tests provide similar functionality
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Peter Tyser [Sat, 18 Jul 2009 00:01:03 +0000 (19:01 -0500)]
xpedite1k: Use standard CFI flash driver
Using the CFI flash driver will allow write access to the 16MB Intel
StrataFlash present on the XPedite1000. The 512KB socketed (non
CFI-compliant flash) will no longer be writable.
The mapping of the 16MB Strata flash was moved to 0xff000000 and the
512KB AMD socketed flash was moved to 0xfe000000.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Thu, 16 Jul 2009 20:13:57 +0000 (22:13 +0200)]
ppc4xx: Cleanup PLU405 board code
Some Coding style cleanup (braces, whitespaces, long lines)
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
Dirk Eibach [Fri, 17 Jul 2009 12:16:40 +0000 (14:16 +0200)]
ppc4xx: Add DL-Vision 405EP board support
Board support for the Guntermann & Drunck DL-Vision.
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Dirk Eibach [Fri, 10 Jul 2009 12:47:32 +0000 (14:47 +0200)]
ppc4xx: Fix missing freqOPB for 405EP
In cpu/ppc4xx/speed.c initialization of sysInfo->freqOPB for 405EP was
left out for no obvious reason.
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Tue, 14 Jul 2009 13:53:08 +0000 (15:53 +0200)]
ppc4xx: Fix TLB reset problem with recent 44x images
Patch
d873133f [ppc4xx: Add Sequoia RAM-booting target] broke "normal"
booting on some 44x platforms. This breakage is only noticed in some
cases while powercycling. As it seems, the code in question in start.S
didn't invalidate TLB #0. This makes sense since this TLB is used for
the bootrom mapping. With the patch mentioned above even TLB #0 got
invalidated resulting in an error later on.
This patch now fixes this issue by only invalidating TLB #0 in the RAM-
booting case.
Tested succesfully on Sequoia and Canyonlands.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Dirk Eibach <Eibach@gdsys.de>
Prafulla Wadaskar [Fri, 17 Jul 2009 14:26:30 +0000 (19:56 +0530)]
usb: bugfix driver/usb/host/ehci-hcd.c function ehci_submit_root
This change is cheked in Linux source and fix found to be in sync.
This patch is tested for USB host interface on Kirkwood based
Sheevaplug platform (ARM little endian board)
Risk: the impact of this patch is not validated on big endian board.
This need to be checked...
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
Wolfgang Denk [Thu, 23 Jul 2009 20:23:23 +0000 (22:23 +0200)]
Coding Style cleanup; update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Mike Frysinger [Wed, 22 Jul 2009 02:59:36 +0000 (22:59 -0400)]
autoconf.mk: include before config.mk for top level files
By including autoconf.mk before config.mk, all top level files can use any
config options it sets up (like <arch>_config.mk) or the Makefile itself
without being forced to use lazy evaluation.
Mark Jackson [Tue, 21 Jul 2009 10:30:53 +0000 (11:30 +0100)]
Remove static declaration from gunzip_bmp()
This patch removes the static declaration from gunzip_bmp()
Without it, the gunzip_bmp() function is not visible to
common/lcd.c and fails to compile with an error.
Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
Peter Tyser [Tue, 21 Jul 2009 02:51:38 +0000 (21:51 -0500)]
cmd_tsi148: General cleanup
- Fix command help message
- Disable DEBUG by default
- Fix whitespace issues
- Fix lines > 80 characters
Signed-off-by: Peter Tyser <ptyser@gmail.com>
Acked-by: Stefan Roese <sr@denx.de>
Mike Frysinger [Sun, 19 Jul 2009 19:17:03 +0000 (15:17 -0400)]
unify HOST_CFLAGS and HOSTCFLAGS
The top build system sets up HOSTCFLAGS a bit and exports it, but other
places use HOST_CFLAGS instead. Unify the two as HOSTCFLAGS so that the
values stay in sync.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Wolfgang Denk [Thu, 23 Jul 2009 19:16:59 +0000 (21:16 +0200)]
Update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
André Schwarz [Fri, 17 Jul 2009 12:50:24 +0000 (14:50 +0200)]
update config for mvBC-P (MPC5200)
This patch adds I2C support for mvBC-P and defines flash layout
matching the shipped product.
Signed-off-by: André Schwarz <andre.schwarz@matrix-vision.de>
Kumar Gala [Mon, 13 Jul 2009 14:24:00 +0000 (09:24 -0500)]
ahci: Fix gcc 4.4 compiler warning
ahci.c: In function 'ata_scsiop_read_capacity10':
ahci.c:616: warning: dereferencing type-punned pointer will break strict-aliasing rules
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala [Mon, 13 Jul 2009 14:23:59 +0000 (09:23 -0500)]
drivers/bios_emulator: Fix gcc 4.4 compiler warning
biosemu.c: In function 'BE_setVGA':
biosemu.c:147: warning: dereferencing type-punned pointer will break strict-aliasing rules
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Detlev Zundel [Mon, 13 Jul 2009 14:01:19 +0000 (16:01 +0200)]
Re-add support for image type 'Standalone Program'
Support for this type was lost during the bootm refactoring.
Signed-off-by: Detlev Zundel <dzu@denx.de>
Detlev Zundel [Mon, 13 Jul 2009 14:01:18 +0000 (16:01 +0200)]
Add error checking for unsupported OS types.
Signed-off-by: Detlev Zundel <dzu@denx.de>