oweals/u-boot.git
16 years agoi.MX31: Make the SPI bus and chip select configurable for MC13783
Magnus Lilja [Fri, 29 Aug 2008 08:36:18 +0000 (10:36 +0200)]
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>
16 years agoi.MX31: Add reset_timer() and modify get_timer_masked().
Magnus Lilja [Fri, 29 Aug 2008 08:36:17 +0000 (10:36 +0200)]
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>
16 years agomuas3001: update BR4 settings
Heiko Schocher [Wed, 10 Sep 2008 09:15:28 +0000 (11:15 +0200)]
muas3001: update BR4 settings

Also set up the port pins for using I2C.

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agoautoscr: Fix one-character lines and non-newline terminated scripts
Petri Lehtinen [Wed, 10 Sep 2008 06:43:49 +0000 (09:43 +0300)]
autoscr: Fix one-character lines and non-newline terminated scripts

When not using hush, the autoscr command now executes lines that are
only one character long. It also runs the last line of scripts even if
it does not end in a newline.

Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi>
16 years agoppc4xx: Allow DTT_I2C_DEV_CODE configured by CFG_I2C_DTT_ADDR
Victor Gallardo [Tue, 9 Sep 2008 22:13:29 +0000 (15:13 -0700)]
ppc4xx: Allow DTT_I2C_DEV_CODE configured by CFG_I2C_DTT_ADDR

On AMCC Arches board DTT_I2C_DEV_CODE is different then canyonlands
and glacier.

Signed-off-by: Victor Gallardo <vgallardo@amcc.com>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Wed, 10 Sep 2008 09:07:35 +0000 (11:07 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

16 years agomuas3001: added support for the LM75 sensor.
Heiko Schocher [Mon, 8 Sep 2008 08:21:11 +0000 (10:21 +0200)]
muas3001: added support for the LM75 sensor.

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agomuas3001: activate WDT for the muas3001 board.
Heiko Schocher [Mon, 8 Sep 2008 08:20:19 +0000 (10:20 +0200)]
muas3001: activate WDT for the muas3001 board.

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agomuas3001: added 64MB SDRAM autodetection.
Heiko Schocher [Mon, 8 Sep 2008 08:19:36 +0000 (10:19 +0200)]
muas3001: added 64MB SDRAM autodetection.

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agoFix printf errors under -DDEBUG
Andrew Klossner [Thu, 21 Aug 2008 14:12:26 +0000 (07:12 -0700)]
Fix printf errors under -DDEBUG

Fix printf format-string/arg mismatches under -DDEBUG.

These warnings occur with DEBUG defined for a platform using
cpu/mpc85xx.  Users of other architectures can unearth similar
problems by adding the line "CFLAGS += -DDEBUG=1" in config.mk right
after "CFLAGS += $(call cc-option,-fno-stack-protector)".

Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoMerge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Tue, 9 Sep 2008 21:59:11 +0000 (23:59 +0200)]
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agoUpdate CHANGELOG, prepare 2008-10-rc1 release v2008.10-rc1
Wolfgang Denk [Tue, 9 Sep 2008 21:55:18 +0000 (23:55 +0200)]
Update CHANGELOG, prepare 2008-10-rc1 release

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years ago85xx: Ensure timebase is zero on secondary cores
Kumar Gala [Mon, 8 Sep 2008 13:51:29 +0000 (08:51 -0500)]
85xx: Ensure timebase is zero on secondary cores

The e500um says the timebase is volatile out of reset.  To ensure
TB sync works we need to make sure its zero.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agobootm_load_os: fix load_end debug message
Jean-Christophe PLAGNIOL-VILLARD [Tue, 9 Sep 2008 20:18:24 +0000 (22:18 +0200)]
bootm_load_os: fix load_end debug message

print load_end value not pointer

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agobootm: enable fdt support only on ppc, m68k and sparc
Jean-Christophe PLAGNIOL-VILLARD [Tue, 9 Sep 2008 20:18:23 +0000 (22:18 +0200)]
bootm: enable fdt support only on ppc, m68k and sparc

...as done in image.c

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agocommon/cmd_mem.c: remove nested #if defined(CONFIG_CMD_MEMORY)
Markus Heidelberg [Tue, 9 Sep 2008 16:51:05 +0000 (18:51 +0200)]
common/cmd_mem.c: remove nested #if defined(CONFIG_CMD_MEMORY)

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
16 years agogitignore: add tags files and Vim swap file
Markus Heidelberg [Tue, 9 Sep 2008 15:31:46 +0000 (17:31 +0200)]
gitignore: add tags files and Vim swap file

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
16 years agoadd board_eth_init() for sh7785lcr board
Yoshihiro Shimoda [Tue, 9 Sep 2008 08:52:47 +0000 (17:52 +0900)]
add board_eth_init() for sh7785lcr board

Fix the problem that cannot work RTL8169 on sh7785lcr board.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
16 years agoMerge branch 'denx'
Andy Fleming [Tue, 9 Sep 2008 21:16:20 +0000 (16:16 -0500)]
Merge branch 'denx'

16 years agomtd: SPI Flash: Support the STMicro Flash
TsiChung Liew [Wed, 6 Aug 2008 21:08:41 +0000 (16:08 -0500)]
mtd: SPI Flash: Support the STMicro Flash

Add MTD SPI Flash support for M25P16, M25P20, M25P32,
M25P40, M25P64, M25P80, M25P128.

Signed-off-by: Jason McMullan <mcmullan@netapp.com>
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
16 years agotrab: fix build problem after change to use do_div()
Wolfgang Denk [Tue, 9 Sep 2008 15:55:31 +0000 (17:55 +0200)]
trab: fix build problem after change to use do_div()

We must link with libgeneric now.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCorrect drv_usb_kbd_init function
Ryan CHEN [Wed, 20 Aug 2008 17:00:17 +0000 (13:00 -0400)]
Correct drv_usb_kbd_init function

The patch is that check if usb_get_dev_index() function return valid
pointer. If valid, continue. Otherwise return -1.

Signed-off-by: Ryan Chen <ryan.chen@st.com>
Acked-by: Markus Klotzbuecher <mk@denx.de>
16 years agoMake usb-stop() safe to call multiple times in a row.
Remy Bohmer [Wed, 20 Aug 2008 09:22:02 +0000 (11:22 +0200)]
Make usb-stop() safe to call multiple times in a row.

A recent commit (936897d4d1365452bbbdf8430db5e7769ef08d38)
enabled the usb_stop() command in common/cmd_bootm.c which was
not enabled for some time, because no board did actually set the
CFG_CMD_USB flag. So, now the usb_stop() is executed before
loading the linux kernel.

However, the usb_ohci driver hangs up (at least on AT91SAM) if the
driver is stopped twice (e.g. the peripheral clock is stopped on AT91).
If some other piece of code calls usb_stop() before the bootm command,
this command will hangup the system during boot.
(usb start and stop is typically used while booting from usb memory stick)

But, stopping the usb stack twice is useless anyway, and a flag already
existed that kept track on the usb_init()/usb_stop() calls.
So, we now check if the usb stack is really started before we stop it.

This problem is now fixed in both the upper as low-level layer.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Acked-by: Markus Klotzbuecher <mk@denx.de>
16 years agoMakefile: fix bug introduced by commit 47ffd6c2
Wolfgang Denk [Tue, 9 Sep 2008 14:55:47 +0000 (16:55 +0200)]
Makefile: fix bug introduced by commit 47ffd6c2

16 years agoppc4xx: ppc440-generic-ALL: Fix out of tree build v2
Ricardo Ribalda Delgado [Tue, 9 Sep 2008 14:00:33 +0000 (10:00 -0400)]
ppc4xx: ppc440-generic-ALL: Fix out of tree build v2

This patch solves the problems compiling ml507, v5fx30teval and
ppc440-generic out of tree.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
16 years agoFix dev_print when called from usb_stor_info (usb storage command)
NĂ­colas Carneiro Lebedenco [Thu, 4 Sep 2008 18:35:46 +0000 (15:35 -0300)]
Fix dev_print when called from usb_stor_info (usb storage command)

Fix output of the usb storage command. It was printing "Device 0: not
available" because IF_TYPE_USB was not included into the switch
statement.

Signed-off-by: Nicolas Lebedenco <nicolas.lebedenco@tasksistemas.com.br>
16 years agoFIT: make iminfo check hashes of all images in FIT, return 1 on failed check
Bartlomiej Sieka [Tue, 9 Sep 2008 10:58:16 +0000 (12:58 +0200)]
FIT: make iminfo check hashes of all images in FIT, return 1 on failed check

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
16 years agoFIT: add ability to check hashes of all images in FIT, improve output
Bartlomiej Sieka [Tue, 9 Sep 2008 10:58:15 +0000 (12:58 +0200)]
FIT: add ability to check hashes of all images in FIT, improve output

- add function fit_all_image_check_hashes() that verifies if all
  hashes of all images in the FIT are valid
- improve output of fit_image_check_hashes() when the hash check fails

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
16 years agoqemu_mips: Update linux bootm to support dynamic cmdline
Jean-Christophe PLAGNIOL-VILLARD [Mon, 8 Sep 2008 18:54:39 +0000 (20:54 +0200)]
qemu_mips: Update linux bootm to support dynamic cmdline

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoAdd support for booting of INTEGRITY operating system uImages
Peter Tyser [Mon, 8 Sep 2008 19:56:49 +0000 (14:56 -0500)]
Add support for booting of INTEGRITY operating system uImages

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agomips/bootm: Fix typo in commit c4f9419c, "initrd_start" replaced by "images->rd_start"
Jean-Christophe PLAGNIOL-VILLARD [Mon, 8 Sep 2008 19:01:29 +0000 (21:01 +0200)]
mips/bootm: Fix typo in commit c4f9419c, "initrd_start" replaced by "images->rd_start"

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoRemove support for booting ARTOS images
Kumar Gala [Mon, 8 Sep 2008 18:57:12 +0000 (13:57 -0500)]
Remove support for booting ARTOS images

Pantelis Antoniou stated:
AFAIK, it is still used but the products using PPC are long gone.
Nuke it plz (from orbit).

So remove it since it cleans up a usage of env_get_char outside of
the environment code.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMakefile: compile and link each module just once
Wolfgang Denk [Tue, 9 Sep 2008 13:45:18 +0000 (15:45 +0200)]
Makefile: compile and link each module just once

Several source files need to be compiled and linked when one or more
config options are selected. To allow for easy selection in the
Makefiles yet to avoild multiple compilation (which costs build time)
and especially multiple linking (which causes errors), we use
"COBJS = $(sort COBJS-y)" which eliminates duplicates.

By courtesy of Detlev Zundel who suggested this approach.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMoved conditional compile into Makefile
Andreas Engel [Mon, 8 Sep 2008 12:30:53 +0000 (14:30 +0200)]
Moved conditional compile into Makefile

Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
16 years agoMerged serial_pl010.c and serial_pl011.c.
Andreas Engel [Mon, 8 Sep 2008 08:17:31 +0000 (10:17 +0200)]
Merged serial_pl010.c and serial_pl011.c.

They only differ in the init function.
This also adds the missing watchdog support for the PL011.

Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
16 years agoRemove gap fill in srec object v2
Ricardo Ribalda Delgado [Sun, 7 Sep 2008 21:10:27 +0000 (17:10 -0400)]
Remove gap fill in srec object v2

SREC files do not need gap fill: The load address is specified in the
file. On the other hand, it can't be avoided in a .bin object. It has
no information about memory location.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
16 years agoREADME: fix missing subdirectory in the documentation
Markus Heidelberg [Sun, 7 Sep 2008 18:18:27 +0000 (20:18 +0200)]
README: fix missing subdirectory in the documentation

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
16 years agoUpdate i386 code (sc520_cdp)
Graeme Russ [Sat, 6 Sep 2008 21:08:42 +0000 (07:08 +1000)]
Update i386 code (sc520_cdp)

Attempt to bring i386 / sc520 inline with master

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
16 years agofw_env: add NAND support
Guennadi Liakhovetski [Thu, 4 Sep 2008 11:01:49 +0000 (13:01 +0200)]
fw_env: add NAND support

Add support for environment in NAND with automatic NOR / NAND recognition,
including unaligned environment, bad-block skipping, redundant environment
copy.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
16 years agoppc4xx: Fix out-of-tree building of CPCI405 variants
Matthias Fuchs [Tue, 9 Sep 2008 07:50:24 +0000 (09:50 +0200)]
ppc4xx: Fix out-of-tree building of CPCI405 variants

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Acked-by: Stefan Roese <sr@denx.de>
16 years agoRemoved hardcoded MxMR loop value from upmconfig() for MPC85xx.
Sergei Poselenov [Fri, 15 Aug 2008 13:42:11 +0000 (15:42 +0200)]
Removed hardcoded MxMR loop value from upmconfig() for MPC85xx.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years ago85xx: socrates: Enable Lime support.
Anatolij Gustschin [Fri, 15 Aug 2008 13:42:13 +0000 (15:42 +0200)]
85xx: socrates: Enable Lime support.

This patch adds Lime GDC support together with support for the PWM
backlight control through the w83782d chip.  The reset pin of the
latter is attached to GPIO, so we need to reset it in
early_board_init_r.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years ago85xx: Socrates: Major code update.
Detlev Zundel [Fri, 15 Aug 2008 13:42:12 +0000 (15:42 +0200)]
85xx: Socrates: Major code update.

- Update the local bus ranges in the FDT for Linux for the various
  devices connected to the local bus via chip-select.

- Set the LCRR_DBYP bit in the LCRR for local bus frequencies
  lower than 66 MHz and uses I/O accessor functions consequently.

- UPM data update.

- Update of default environment and configuration.  Use I2C multibus
  as we do have two I2C buses.  Also enable sdram and ext2 commands.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoUpdate Freescale 85xx boards to sys_eeprom.c
Timur Tabi [Fri, 18 Jul 2008 14:52:23 +0000 (16:52 +0200)]
Update Freescale 85xx boards to sys_eeprom.c

The new sys_eeprom.c supports both the old CCID EEPROM format and the new NXID
format, and so it obsoletes board/freescale/common/cds_eeprom.c.  Freescale
86xx boards already use sys_eeprom.c, so this patch migrates the remaining
Freescale 85xx boards to use it as well.  cds_eeprom.c is deleted.

Signed-off-by: Timur Tabi <timur@freescale.com>
16 years agolib_ppc/interrupts.c: make board_show_activity() a weak function
Wolfgang Denk [Tue, 9 Sep 2008 08:08:02 +0000 (10:08 +0200)]
lib_ppc/interrupts.c: make board_show_activity() a weak function

This allows to use show_activity() without having to
define an empty board_show_activity() function.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agostxxtc: remove empty CONFIG_SHOW_ACTIVITY functions
Wolfgang Denk [Tue, 9 Sep 2008 08:06:44 +0000 (10:06 +0200)]
stxxtc: remove empty CONFIG_SHOW_ACTIVITY functions

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoNETTA2: remove empty CONFIG_SHOW_ACTIVITY functions
Wolfgang Denk [Tue, 9 Sep 2008 08:03:47 +0000 (10:03 +0200)]
NETTA2: remove empty CONFIG_SHOW_ACTIVITY functions

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoRemoved hardcoded MxMR loop value from upmconfig() for MPC85xx.
Sergei Poselenov [Fri, 15 Aug 2008 13:42:11 +0000 (15:42 +0200)]
Removed hardcoded MxMR loop value from upmconfig() for MPC85xx.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years ago85xx: socrates: Enable Lime support.
Anatolij Gustschin [Fri, 15 Aug 2008 13:42:13 +0000 (15:42 +0200)]
85xx: socrates: Enable Lime support.

This patch adds Lime GDC support together with support for the PWM
backlight control through the w83782d chip.  The reset pin of the
latter is attached to GPIO, so we need to reset it in
early_board_init_r.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years ago85xx: Socrates: Major code update.
Detlev Zundel [Fri, 15 Aug 2008 13:42:12 +0000 (15:42 +0200)]
85xx: Socrates: Major code update.

- Update the local bus ranges in the FDT for Linux for the various
  devices connected to the local bus via chip-select.

- Set the LCRR_DBYP bit in the LCRR for local bus frequencies
  lower than 66 MHz and uses I/O accessor functions consequently.

- UPM data update.

- Update of default environment and configuration.  Use I2C multibus
  as we do have two I2C buses.  Also enable sdram and ext2 commands.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Tue, 9 Sep 2008 00:24:51 +0000 (02:24 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

Conflicts:

Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agodisk-on-chip: remove duplicate doc_probe declaration
Jean-Christophe PLAGNIOL-VILLARD [Mon, 8 Sep 2008 23:22:39 +0000 (01:22 +0200)]
disk-on-chip: remove duplicate doc_probe declaration

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoonenand_uboot: fix warning: 'struct mtd_oob_ops' declared inside parameter list
Jean-Christophe PLAGNIOL-VILLARD [Mon, 8 Sep 2008 22:59:40 +0000 (00:59 +0200)]
onenand_uboot: fix warning: 'struct mtd_oob_ops' declared inside parameter list

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agors5c372: fix rtc_set prototype
Jean-Christophe PLAGNIOL-VILLARD [Mon, 8 Sep 2008 22:59:39 +0000 (00:59 +0200)]
rs5c372: fix rtc_set prototype

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoARM: fix warning: target CPU does not support interworking
Sergei Poselenov [Thu, 14 Aug 2008 12:08:28 +0000 (14:08 +0200)]
ARM: fix warning: target CPU does not support interworking

This patch fixes warnings like this:

start.S:0: warning: target CPU does not support interworking

which come from some ARM cross compilers and are caused by hard-coded
(with "--with-cpu=arm9" configuration option) ARM targets (which
support ARM Thumb instructions), while the ARM target selected from
the command line (with "-march=armv4") doesn't support Thumb
instructions.

This warning is issued by the compiler regardless of the real use of
the Thumb instructions in code.

To fix this problem, we use options according to compiler version
being used.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoARM: Use do_div() instead of division for "long long".
Sergei Poselenov [Thu, 14 Aug 2008 12:08:28 +0000 (14:08 +0200)]
ARM: Use do_div() instead of division for "long long".

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoUpdate Freescale 85xx boards to sys_eeprom.c
Timur Tabi [Fri, 18 Jul 2008 14:52:23 +0000 (16:52 +0200)]
Update Freescale 85xx boards to sys_eeprom.c

The new sys_eeprom.c supports both the old CCID EEPROM format and the new NXID
format, and so it obsoletes board/freescale/common/cds_eeprom.c.  Freescale
86xx boards already use sys_eeprom.c, so this patch migrates the remaining
Freescale 85xx boards to use it as well.  cds_eeprom.c is deleted.

Signed-off-by: Timur Tabi <timur@freescale.com>
16 years agolib_arm/bootm.c: fix compile warnings
Wolfgang Denk [Mon, 8 Sep 2008 21:26:22 +0000 (23:26 +0200)]
lib_arm/bootm.c: fix compile warnings

bootm.c:128: warning: label 'error' defined but not used
bootm.c:65: warning: unused variable 'ret'

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoml507: fix out of tree build problem
Wolfgang Denk [Mon, 8 Sep 2008 20:46:42 +0000 (22:46 +0200)]
ml507: fix out of tree build problem

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agocommon/cmd_bootm.c: fix printf() format warnings
Wolfgang Denk [Mon, 8 Sep 2008 20:10:28 +0000 (22:10 +0200)]
common/cmd_bootm.c: fix printf() format warnings

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoBMW, PCIPPC2, PCIPPC6, RBC82: fix compile warnings
Wolfgang Denk [Mon, 8 Sep 2008 20:37:45 +0000 (22:37 +0200)]
BMW, PCIPPC2, PCIPPC6, RBC82: fix compile warnings

missing doc_probe() prototype.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agomk48t59: fix compile problem introduced by commit d1e23194
Wolfgang Denk [Mon, 8 Sep 2008 19:28:14 +0000 (21:28 +0200)]
mk48t59: fix compile problem introduced by commit d1e23194

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Move ppc4xx specific prototypes to ppc4xx header
Stefan Roese [Mon, 8 Sep 2008 12:11:12 +0000 (14:11 +0200)]
ppc4xx: Move ppc4xx specific prototypes to ppc4xx header

This patch moves some 4xx specific prototypes out of include common.h
to a ppc4xx specific header.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMerge branch 'master' of /home/stefan/git/u-boot/u-boot
Stefan Roese [Mon, 8 Sep 2008 08:35:49 +0000 (10:35 +0200)]
Merge branch 'master' of /home/stefan/git/u-boot/u-boot

16 years agoppc4xx: Update CPCI405(AB) configuration
Matthias Fuchs [Fri, 5 Sep 2008 13:34:04 +0000 (15:34 +0200)]
ppc4xx: Update CPCI405(AB) configuration

This patch add FDT support and command line editing capabilities
for CPCI405 and CPCI405AB boards.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Cleanup CPCI405 linker script
Matthias Fuchs [Fri, 5 Sep 2008 13:34:03 +0000 (15:34 +0200)]
ppc4xx: Cleanup CPCI405 linker script

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Update CPCI405 variants handling
Matthias Fuchs [Fri, 5 Sep 2008 13:34:02 +0000 (15:34 +0200)]
ppc4xx: Update CPCI405 variants handling

This patch replaces the BOARD_REVISION variable in include/config.mk
by a using a temporary include file in the platform directory.

The former way does not work anymore and the latter is also used by
some other boards.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Remove CONFIG_CS8952_PHY define
Stefan Roese [Mon, 8 Sep 2008 08:01:48 +0000 (10:01 +0200)]
ppc4xx: Remove CONFIG_CS8952_PHY define

Since this define is only used on one board that was never really in
production, removing this compile time option doesn't hurt and makes
the code more readable.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix compilation warning for PIP405
Stefan Roese [Fri, 5 Sep 2008 12:11:40 +0000 (14:11 +0200)]
ppc4xx: Fix compilation warning for PIP405

This patch fixes a compilation warning for the PIP405 board. It moves the
#ifndef CONFIG_CS8952_PHY define a little so that the warning doesn't
occur anymore. I am a little unsure if this #ifdef is at the correct
place now or if it could be removed completely. This needs to get
tested on the PIP405 board.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix compilation warning for canyonlands & glacier
Stefan Roese [Fri, 5 Sep 2008 12:09:09 +0000 (14:09 +0200)]
ppc4xx: Fix compilation warning for canyonlands & glacier

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoFix compiler warning in mpc8xxx ddr code
Kumar Gala [Fri, 5 Sep 2008 19:40:29 +0000 (14:40 -0500)]
Fix compiler warning in mpc8xxx ddr code

ctrl_regs.c: In function 'compute_fsl_memctl_config_regs':
ctrl_regs.c:523: warning: 'caslat' may be used uninitialized in this function
ctrl_regs.c:523: note: 'caslat' was declared here

Add a warning in DDR1 case if cas_latency isn't a value we know about.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agortc: allow rtc_set to return an error and use it in cmd_date
Jean-Christophe PLAGNIOL-VILLARD [Mon, 1 Sep 2008 21:06:23 +0000 (23:06 +0200)]
rtc: allow rtc_set to return an error and use it in cmd_date

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoap325rxa/favr-32-ezkit: Use CONFIG_FLASH_CFI_DRIVER
Jean-Christophe PLAGNIOL-VILLARD [Sun, 31 Aug 2008 23:16:33 +0000 (01:16 +0200)]
ap325rxa/favr-32-ezkit: Use CONFIG_FLASH_CFI_DRIVER

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoconfig.mk: Move arch-specific condition to $(ARCH)_config.mk
Shinya Kuribayashi [Sat, 30 Aug 2008 20:37:04 +0000 (05:37 +0900)]
config.mk: Move arch-specific condition to $(ARCH)_config.mk

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoPrevent crash if random/invalid ramdisks are passed to bootm
Kumar Gala [Sat, 30 Aug 2008 00:08:29 +0000 (19:08 -0500)]
Prevent crash if random/invalid ramdisks are passed to bootm

Adds returning an error from the ramdisk detection code if
its not a real ramdisk (invalid).  There is no reason we can't
just return back to the console if we detect an invalid
ramdisk or CRC error.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoPrevent crash if random DTB address is passed to bootm
Anatolij Gustschin [Fri, 29 Aug 2008 19:04:45 +0000 (21:04 +0200)]
Prevent crash if random DTB address is passed to bootm

This patch adds bootm_start() return value check. If
error status is returned, we do not proceed further to
prevent board reset or crash as we still can recover
at this point.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years agoclean up some #if !defined() in drivers/video/cfb_console.c
Andrew Dyer [Fri, 29 Aug 2008 17:30:39 +0000 (12:30 -0500)]
clean up some #if !defined() in drivers/video/cfb_console.c

rearrange some #if !defined() / #else / #endif statements to remove
the negative logic.

Signed-off-by: Andrew Dyer <adyer@righthandtech.com>
16 years agoapollon: use the last memory area for u-boot
Kyungmin Park [Fri, 29 Aug 2008 00:02:20 +0000 (09:02 +0900)]
apollon: use the last memory area for u-boot

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
16 years agoTQM8272: move NAND part in seperate File
Heiko Schocher [Thu, 28 Aug 2008 11:50:42 +0000 (13:50 +0200)]
TQM8272: move NAND part in seperate File

I didn't try to use drivers/mtd/nand/fsl_upm.c for the NAND driver,
because I have no longer access to the hardware.

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agoTQM8272: Fix compiling error for the TQM8272 board.
Heiko Schocher [Thu, 28 Aug 2008 11:48:36 +0000 (13:48 +0200)]
TQM8272: Fix compiling error for the TQM8272 board.

Fix compile problems caused by
commit  cfa460adfdefcc30d104e1a9ee44994ee349bb7b

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agoAdd JFFS2 command support on OneNAND
Kyungmin Park [Wed, 27 Aug 2008 05:45:20 +0000 (14:45 +0900)]
Add JFFS2 command support on OneNAND

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
16 years agoAllow console input to be disabled
Mark Jackson [Mon, 25 Aug 2008 18:21:30 +0000 (19:21 +0100)]
Allow console input to be disabled

Added new CONFIG_DISABLE_CONSOLE define and GD_FLG_DISABLE_CONSOLE.

When CONFIG_DISABLE_CONSOLE is defined, setting
GD_FLG_DISABLE_CONSOLE disables all console input and output.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
16 years agoloads: allow negative offsets
Ricardo Ribalda Delgado [Wed, 30 Jul 2008 10:39:29 +0000 (12:39 +0200)]
loads: allow negative offsets

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
16 years agoUSB EHCI: reset root hub
Yuri Tikhonov [Thu, 4 Sep 2008 09:19:05 +0000 (11:19 +0200)]
USB EHCI: reset root hub

Some of multi-function USB controllers (e.g. ISP1562) allow root hub
resetting only via EHCI registers. So, this patch adds the
corresponding kind of reset to OHCI's hc_reset() if the newly
introduced CONFIG_PCI_EHCI_DEVNO option is set (e.g. for Socrates
board).

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
Acked-by: Markus Klotzbuecher <mk@denx.de>
16 years agoRX 8025 RTC: analyze 12/24-hour mode flag in rtc_get().
Yuri Tikhonov [Fri, 15 Aug 2008 13:42:09 +0000 (15:42 +0200)]
RX 8025 RTC: analyze 12/24-hour mode flag in rtc_get().

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoMerge branch 'master' of /home/stefan/git/u-boot/u-boot
Stefan Roese [Fri, 5 Sep 2008 12:16:10 +0000 (14:16 +0200)]
Merge branch 'master' of /home/stefan/git/u-boot/u-boot

16 years agodevices: Use list_add_tail() instead of list_add() to register a device
Stefan Roese [Fri, 5 Sep 2008 08:47:46 +0000 (10:47 +0200)]
devices: Use list_add_tail() instead of list_add() to register a device

This patch fixes a problem spotted on Glacier/Canyonlands (and most
likely lots of other board ports), that no serial output was seen
after console initialization in console_init_r(). This is because the
last added console device was used instead of the first added.

This patch fixes this problem by using list_add_tail() instead of
list_add() to register a device. This way the first added console
is used again.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Add support for GPCS, SGMII and M88E1112 PHY
Victor Gallardo [Fri, 5 Sep 2008 06:49:36 +0000 (23:49 -0700)]
ppc4xx: Add support for GPCS, SGMII and M88E1112 PHY

This patch adds GPCS, SGMII and M88E1112 PHY support
for the AMCC PPC460GT/EX processors.

Signed-off-by: Victor Gallardo <vgallardo@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Update Kilauea to use PPC4xx DDR autocalibration routines
Adam Graham [Wed, 3 Sep 2008 19:26:59 +0000 (12:26 -0700)]
ppc4xx: Update Kilauea to use PPC4xx DDR autocalibration routines

Signed-off-by: Adam Graham <agraham@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: IBM Memory Controller DDR autocalibration routines
Adam Graham [Wed, 3 Sep 2008 19:26:28 +0000 (12:26 -0700)]
ppc4xx: IBM Memory Controller DDR autocalibration routines

Alternate SDRAM DDR autocalibration routine that can be generically used
for any PPC4xx chips that have the IBM SDRAM Controller core allowing for
support of more DIMM/memory chip vendors and gets the DDR autocalibration
values which give the best read latency performance (SDRAM0_RDCC.[RDSS]).

Two alternate SDRAM DDR autocalibration algoritm are provided in this patch,
"Method_A" and "Method_B".  DDR autocalibration Method_A scans the full range
of possible PPC4xx  SDRAM Controller DDR autocalibration values and takes a
lot longer to run than Method_B.  Method_B executes in the same amount of time
as the currently existing DDR autocalibration routine, i.e. 1 second or so.
Normally Method_B is used and it is set as the default method.

The current U-Boot PPC4xx DDR autocalibration code calibrates the IBM SDRAM
Controller registers.[bit-field]:
1)  SDRAM0_RQDC.[RQFD]
2)  SDRAM0_RFDC.[RFFD]

This alternate PPC4xx DDR autocalibration code calibrates the following
IBM SDRAM Controller registers.[bit-field]:

1)  SDRAM0_WRDTR.[WDTR]
2)  SDRAM0_CLKTR.[CKTR]
3)  SDRAM0_RQDC.[RQFD]
4)  SDRAM0_RFDC.[RFFD]

and will also use the calibrated settings of the above four registers that
produce the best "Read Sample Cycle Select" value in the SDRAM0_RDCC.[RDSS]
register.[bit-field].

Signed-off-by: Adam Graham <agraham@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc44x: Unification of virtex5 pp440 boards
Ricardo Ribalda Delgado [Mon, 1 Sep 2008 17:09:39 +0000 (13:09 -0400)]
ppc44x: Unification of virtex5 pp440 boards

This patch provides an unificated way of handling xilinx v5 ppc440 boards.

It unificates 3 different things:

1) Source code
A new board called ppc440-generic has been created. This board includes
a generic tlb initialization (Maps the whole memory into virtual) and
defines board_pre_init, checkboard, initdram and get_sys_info weakly,
so, they can be replaced by specific functions.

If a new board needs to redefine any of the previous functions
(specific initialization) it can create a new directory with the
specific initializations needed. (see the example ml507 board).

2) Configuration file
Common configurations are located under configs/xilinx-ppc440.h, this
header file interpretes the xparameters file generated by EDK and
configurates u-boot in correspondence. Example: if there is a Temac,
allows CMD_CONFIG_NET
Specific configuration are located under specific configuration file.
(see the example ml507 board)

3) Makefile
Some work has been done in order to not duplicate work in the Main
Makefile. Please see the attached code.

In order to support new boards they can be implemented in the next way:

a) Simple Generic Board  (90% of the time)
Using EDK generates a new xparameters.h file, replace
ppc440-generic/xparameters.h  and run make xilinx-ppc440-generic_config
&& make

b) Simple Boards with special u-boot parameters (9 % of the time)
Create a new file under configs for it (use ml507.h as example) and
change your paramaters. Create a new Makefile paragraph and compile

c) Complex boards (1% of the time)
Create a new folder for the board, like the ml507

Finally, it adds support for the Avnet FX30T Evaluation board, following
the new generic structure:

Cheap board by Avnet for evaluating the Virtex5 FX technology.

This patch adds support for:
 - UartLite
 - 16MB Flash
 - 64MB RAM

Prior using U-boot in this board, read carefully the ERRATA by Avnet
to solve some memory initialization issues.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMerge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Wed, 3 Sep 2008 21:44:42 +0000 (23:44 +0200)]
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Wed, 3 Sep 2008 21:44:18 +0000 (23:44 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

16 years agompc83xx: fix mpc8313 in-tree building with NAND
Nick Spence [Tue, 2 Sep 2008 20:21:16 +0000 (15:21 -0500)]
mpc83xx: fix mpc8313 in-tree building with NAND

and add mpc8313 NAND build to MAKEALL

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoMerge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Wed, 3 Sep 2008 21:07:41 +0000 (23:07 +0200)]
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agompc83xx: clean up cache operations and unlock_ram_in_cache() functions
Nick Spence [Thu, 28 Aug 2008 21:09:25 +0000 (14:09 -0700)]
mpc83xx: clean up cache operations and unlock_ram_in_cache() functions

Cleans up some latent issues with the data cache control so that
dcache_enable() and dcache_disable() will work reliably (after
unlock_ram_in_cache() has been called)

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: Store and display Arbiter Event Register values
Nick Spence [Thu, 28 Aug 2008 21:09:19 +0000 (14:09 -0700)]
mpc83xx: Store and display Arbiter Event Register values

Record the Arbiter Event Register values and optionally display them.

The Arbiter Event Register can record the type and effective address of
an arbiter error, even through an HRESET. This patch stores the values in
the global data structure.

Display of the Arbiter Event registers immediately after the RSR value
can be enabled with defines. The Arbiter values will only be displayed
if an arbiter event has occured since the last Power On Reset, and either
of the following defines exist:
 #define CONFIG_DISPLAY_AER_BRIEF - display only the arbiter address and
                                    and type register values
 #define CONFIG_DISPLAY_AER_FULL  - display and interpret the arbiter
                                    event register values

Address Only transactions are one of the trapped events that can register
as an arbiter event. They occur with some cache manipulation instructions
if the HID0_ABE (Address Broadcast Enable) is set and the memory region
has the MEMORY_COHERENCE WIMG bit set. Setting:
 #define CONFIG_MASK_AER_AO - prevents the arbiter from recording address
                              only events, so that it can still capture
                              other real problems.

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: use r4 instead of r2 in lock_ram_in_cache and unlock_ram_in_cache
Nick Spence [Thu, 28 Aug 2008 21:09:11 +0000 (14:09 -0700)]
mpc83xx: use r4 instead of r2 in lock_ram_in_cache and unlock_ram_in_cache

This is needed in unlock_ram_in_cache() because it is called from C and
will corrupt the small data area anchor that is kept in R2.

lock_ram_in_cache() is modified similarly as good coding practice, but
is not called from C.

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoMPC83XX: Fix GPIO configuration - set gpio level before direction
Nick Spence [Sat, 23 Aug 2008 06:52:50 +0000 (23:52 -0700)]
MPC83XX: Fix GPIO configuration - set gpio level before direction

Set DAT value before DIR values to avoid creating glitches on the
GPIO signals.

Set gpio level register before direction register to inhibit
glitches on high level output pins.

Dir and data gets cleared at powerup, so high level output lines see
a short low pulse between setting the direction and level registers.

Issue was seen on a new board with the nReset line of the NOR flash
connected to a GPIO. Setting the direction register puts the NOR flash
in reset so the next instruction to set the level cannot get executed.

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Wolfgang Denk [Wed, 3 Sep 2008 20:59:29 +0000 (22:59 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mips