]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
13 years agoPrepare v2010.09 v2010.09
Wolfgang Denk [Tue, 28 Sep 2010 21:20:55 +0000 (23:20 +0200)]
Prepare v2010.09

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agompc512x: fix build issues
Wolfgang Denk [Tue, 28 Sep 2010 21:02:05 +0000 (23:02 +0200)]
mpc512x: fix build issues

Commit 800eb0964 "POST cleanup." removed file
arch/powerpc/cpu/mpc512x/common.c but failed to remove the reference
to it from arch/powerpc/cpu/mpc512x/Makefile which causes somewhat
obscure build errors:

make[1]: *** No rule to make target `/work/wd/tmp-ppc/arch/powerpc/cpu/mpc512x/.depend', needed by `_depend'.  Stop.

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoARMV7: OMAP3: Update Beagle xM pinmux with USB hub and DVI gpio setup
Steve Sakoman [Mon, 20 Sep 2010 16:55:24 +0000 (09:55 -0700)]
ARMV7: OMAP3: Update Beagle xM pinmux with USB hub and DVI gpio setup

This patch adds missing pinmux setup for 4 GPIO signals used on the Beagle xM:
 - USB hub reset (gpio_56)
 - P8 USB hub reset (gpio_63)
 - DVI enable (gpio_129)
 - P8 DVI enable (gpio_170)

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP4: Calculate SDRAM size
Aneesh V [Sun, 12 Sep 2010 05:02:55 +0000 (10:32 +0530)]
ARMV7: OMAP4: Calculate SDRAM size

Calculate the SDRAM size from DMM configuration registers instead of using
hard-coded values. This gives correct values for all different boards.

It's assumed that DMM sections do not overlap memory areas.

Signed-off-by: Aneesh V <aneesh@ti.com>
Tested-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP4: Fix Panda pinmux setting to enable Wifi/BT Module
Steve Sakoman [Wed, 22 Sep 2010 14:30:11 +0000 (07:30 -0700)]
ARMV7: OMAP4: Fix Panda pinmux setting to enable Wifi/BT Module

This patch corrects the pinmux settings to enable proper functioning
of the wifi/bluetooth module.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoixp/npe: Remove duplicated comment
Thomas Weber [Tue, 28 Sep 2010 12:03:32 +0000 (14:03 +0200)]
ixp/npe: Remove duplicated comment

Signed-off-by: Thomas Weber <weber@corscience.de>
13 years agobmw: Remove duplicated include of header file
Thomas Weber [Tue, 28 Sep 2010 12:03:33 +0000 (14:03 +0200)]
bmw: Remove duplicated include of header file

Signed-off-by: Thomas Weber <weber@corscience.de>
13 years agoREADME: Fix description of version numbering scheme
Thomas Weber [Tue, 28 Sep 2010 06:06:25 +0000 (08:06 +0200)]
README: Fix description of version numbering scheme

The version numbering scheme was changed in Oct, 2008.
This patch brings the documentation to the actual level.
The description is taken from:
http://www.denx.de/wiki/U-Boot/ReleaseCycle

Signed-off-by: Thomas Weber <weber@corscience.de>
Changed text slightly.
Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoFix "ubi part" cmd re-entrancy
Karl Beldan [Thu, 23 Sep 2010 08:46:31 +0000 (10:46 +0200)]
Fix "ubi part" cmd re-entrancy

Commit 2ee951ba (UBI: Enable re-initializing of the "ubi part" command)
reset mtd_devs in ubi_exit() but missed ubi_init()'s failure path.

Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Thu, 23 Sep 2010 19:16:32 +0000 (21:16 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

13 years agoppc4xx/fdt/flash: Change fdt_fixup_nor_flash_node() to not rely on cs size
Stefan Roese [Thu, 16 Sep 2010 12:01:53 +0000 (14:01 +0200)]
ppc4xx/fdt/flash: Change fdt_fixup_nor_flash_node() to not rely on cs size

This patch changes the behaviour of the fdt_fixup_nor_flash_node()
function. Now it doesn't patch the size of the "reg" property with the
chip-select size, but with the size returned from the new function
flash_get_bank_size(). This function will return per weak default the
flash size of the bank (bank = chip-select numer) detected by the flash
driver. If this does not fit your needs, this function may be overridden
by a board specific one.

For this the parameters needed to be changed. So I intentionally squashed
the PPC4xx stuff using this routine into this patch. Otherwise it would
not be git-bisectable anymore.

The board specific function for the AMCC/APM Ebony eval board is now
included in this patch version.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Detlev Zundel <dzu@denx.de>
Cc: Gerald Van Baren <vanbaren@cideas.com>
Cc: Wolfgang Denk <wd@denx.de>
13 years agoppc4xx: POST UART: Use in/out_8() io-accessor functions
Stefan Roese [Tue, 14 Sep 2010 07:38:18 +0000 (09:38 +0200)]
ppc4xx: POST UART: Use in/out_8() io-accessor functions

This patch fixes a problem in the PPC4xx POST UART driver. This driver
incorrectly used the in/out8() io-accessor functions. This could lead to
problems since these functions don't guarantee execution ordering. This
patch now replaces these functions with the correct ones.

Additionally the driver is converted to using the NS16550 struct instead
of macros for the register offsets.

And some common code is factored out for better maintainability.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoppc4xx: Fix CATcenter build
Stefan Roese [Fri, 10 Sep 2010 14:29:37 +0000 (16:29 +0200)]
ppc4xx: Fix CATcenter build

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Wed, 22 Sep 2010 20:37:49 +0000 (22:37 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-video

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Wed, 22 Sep 2010 20:36:42 +0000 (22:36 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

13 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Wed, 22 Sep 2010 20:35:44 +0000 (22:35 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master

13 years agoBlackfin: bfin_spi: use same gpio cs define as Linux
Mike Frysinger [Mon, 20 Sep 2010 21:54:09 +0000 (17:54 -0400)]
Blackfin: bfin_spi: use same gpio cs define as Linux

Linux uses an offset of 8 to switch from hardware cs to a gpio cs,
so have u-boot use the same value.  Also make sure it is public
for boards to access.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoBlackfin: update some missed board config.mk files
Mike Frysinger [Mon, 20 Sep 2010 18:17:39 +0000 (14:17 -0400)]
Blackfin: update some missed board config.mk files

Seems these two files were missed during the big lib shuffle.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agovideo: cfb_console: fix definition and usage of CURSOR_xxx macros
Timur Tabi [Fri, 27 Aug 2010 20:45:47 +0000 (15:45 -0500)]
video: cfb_console: fix definition and usage of CURSOR_xxx macros

The CURSOR_ON, CURSOR_OFF, and CURSOR_SET macros are defined incorrectly.  If
cursor support is disabled, then these macros are defined to nothing, but
then they are used like this:

if (console_col < CONSOLE_COLS)
CURSOR_OFF
console_row++;

which was compiled like this:

if (console_col < CONSOLE_COLS)
console_row++;

This is obviously not what was intended.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agoPOST cleanup.
Michael Zaidman [Mon, 20 Sep 2010 06:51:53 +0000 (08:51 +0200)]
POST cleanup.

- Revives POST for blackfin arch;
- Removes redundant code:
     arch/blackfin/lib/post.c
     arch/powerpc/cpu/ppc4xx/commproc.c
     arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.

Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
Tested-by: Anatolij Gustschin <agust@denx.de>
List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <linz@li-pro.net>
Cc: Denis Peter <d.peter@mpl.ch>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Niklaus Giger <niklaus.giger@netstal.com>
Cc: Larry Johnson <lrj@acm.org>
Cc: Feng Kan <fkan@amcc.com>
13 years agocmd_mmc: use common usage function
Mike Frysinger [Thu, 29 Jul 2010 17:40:43 +0000 (13:40 -0400)]
cmd_mmc: use common usage function

Rather than using a custom "Usage:", use the common cmd_usage() function,
and tail into it now that it returns 1 for us.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agosetlocalversion: add some more fallbacks for git describe
Mike Frysinger [Mon, 20 Sep 2010 18:36:18 +0000 (14:36 -0400)]
setlocalversion: add some more fallbacks for git describe

If working out of a custom git tree that lacks annotated tags, the
'git describe' operation spews "fatal: cannot describe" errors all
over the place.  So add some fallback code in case the best naming
was unable to locate something useful.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Tue, 21 Sep 2010 07:34:16 +0000 (09:34 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master

13 years agoPrepare v2010.09-rc2 v2010.09-rc2
Wolfgang Denk [Sun, 19 Sep 2010 15:47:52 +0000 (17:47 +0200)]
Prepare v2010.09-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoSave environment data to mmc.
Terry Lv [Mon, 17 May 2010 02:57:01 +0000 (10:57 +0800)]
Save environment data to mmc.

This patch is to save environment data to mmc card.
It uses interfaces defined in generic mmc.

Signed-off-by: Terry Lv <r65388@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
13 years agosocrates: adjust TEXT_BASE to increase U-Boot image size
Wolfgang Denk [Fri, 10 Sep 2010 21:47:00 +0000 (23:47 +0200)]
socrates: adjust TEXT_BASE to increase U-Boot image size

We need more room for the U-Boot image.
Shift TEXT_BASE as needed.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agommc: fix compiler warnings
Wolfgang Denk [Sat, 18 Sep 2010 23:03:20 +0000 (01:03 +0200)]
mmc: fix compiler warnings

Commit d2bf29e3 caused a number of compiler warnings:

mmc.c: In function 'mmc_bwrite':
mmc.c:97: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
mmc.c:97: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'lbaint_t'
mmc.c: In function 'mmc_bread':
mmc.c:229: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
mmc.c:229: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'lbaint_t'

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Lei Wen <leiwen@marvell.com>
13 years agotools/env: fail on invalid options
Daniel Hobi [Thu, 16 Sep 2010 12:36:09 +0000 (14:36 +0200)]
tools/env: fail on invalid options

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
13 years agotools/env: allow option "-n" for fw_printenv
Daniel Hobi [Wed, 15 Sep 2010 17:46:26 +0000 (19:46 +0200)]
tools/env: allow option "-n" for fw_printenv

In commit bd7b26f8 (Tools: set multiple variable with fw_setenv utility),
the option parsing was changed to getopt_long(3), but option "-n"
of fw_printenv was not included.

This leads to an error message "invalid option -- 'n'" on stderr,
although the output on stdout is correct.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
13 years agoARM: Update ARM mach-types
Thomas Weber [Tue, 14 Sep 2010 14:42:54 +0000 (16:42 +0200)]
ARM: Update ARM mach-types

This patch updates the mach-types.h based on the latest linux kernel

Signed-off-by: Thomas Weber <weber@corscience.de>
13 years agommc: print out partition table
Lei Wen [Mon, 13 Sep 2010 14:07:28 +0000 (22:07 +0800)]
mmc: print out partition table

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agommc: add boundary check for mmc operation
Lei Wen [Mon, 13 Sep 2010 14:07:27 +0000 (22:07 +0800)]
mmc: add boundary check for mmc operation

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agovideo: cfb_console: fix definition and usage of CURSOR_xxx macros
Timur Tabi [Fri, 27 Aug 2010 20:45:47 +0000 (15:45 -0500)]
video: cfb_console: fix definition and usage of CURSOR_xxx macros

The CURSOR_ON, CURSOR_OFF, and CURSOR_SET macros are defined incorrectly.  If
cursor support is disabled, then these macros are defined to nothing, but
then they are used like this:

if (console_col < CONSOLE_COLS)
CURSOR_OFF
console_row++;

which was compiled like this:

if (console_col < CONSOLE_COLS)
console_row++;

This is obviously not what was intended.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Wed, 15 Sep 2010 20:06:32 +0000 (22:06 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-x86
Wolfgang Denk [Wed, 15 Sep 2010 20:04:42 +0000 (22:04 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-x86

13 years agonand/davinci: make sure ECC calculation has really started
Wolfram Sang [Thu, 9 Sep 2010 11:54:41 +0000 (13:54 +0200)]
nand/davinci: make sure ECC calculation has really started

Due to a register glitch (result code <4 might show up right after the
start-calculation-bit was set), make sure the ECC has really started.

See 1c3275b656045aff9a75bb2c9f3251af1043ebb3 in the kernel.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
13 years agodisplay_buffer: fix misaligned buffer
Reinhard Meyer [Wed, 8 Sep 2010 10:25:40 +0000 (12:25 +0200)]
display_buffer: fix misaligned buffer

use a union to cause necessary alignment per architecture

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agox86: Remove Unmaintained Boards
Graeme Russ [Sun, 22 Aug 2010 06:26:00 +0000 (16:26 +1000)]
x86: Remove Unmaintained Boards

The SC520 CDP boards originally implemented by Daniel Engström are now
very broken. Attempts to contact Daniel via the email address on the
copyright notice have failed. Remove these boards from mainline

13 years agox86: Fix x86 Cold Boot
Graeme Russ [Sun, 22 Aug 2010 06:25:59 +0000 (16:25 +1000)]
x86: Fix x86 Cold Boot

Commit 077e1958ca4afe12d88043b123ded058c51b89f7 broke the ability of the
x86 port to boot from a cold-reset by removing the initial IDT. Re-
instate the initial IDT to allow cold-booting of x86 boards

13 years agox86: Add do_bdinfo()
Graeme Russ [Sun, 22 Aug 2010 06:25:58 +0000 (16:25 +1000)]
x86: Add do_bdinfo()

x86 failed to compile with a message "a case for this architecture does
not exist!" - Add do_bdinfo() for this arch

13 years agox86: Fix do_go_exec() - const argv[]
Graeme Russ [Sun, 22 Aug 2010 06:25:58 +0000 (16:25 +1000)]
x86: Fix do_go_exec() - const argv[]

Commit 54841ab50c20d6fa6c9cc3eb826989da3a22d934 made the argv parameter
to do_go_exec() const but did not allow for the fact that argv[-1] is
set to point to the global data structure and relies on argv being non-
const.

With this patch, do_go_exec() creates a new copy of the argv array with
an extra element to store global data pointer rather than simply
clobbering an arbitrary memory location.

13 years agousb: musb: set target address for non-multipoint devices
Bryan Wu [Mon, 9 Aug 2010 22:41:12 +0000 (18:41 -0400)]
usb: musb: set target address for non-multipoint devices

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agousb: musb: setup TXCOUNT for Blackfin musb
Bryan Wu [Mon, 9 Aug 2010 18:57:41 +0000 (14:57 -0400)]
usb: musb: setup TXCOUNT for Blackfin musb

The Blackfin implementation of musb has a TXCOUNT register that needs to
be programmed when transmitting data.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoPrepare v2010.09-rc1 v2010.09-rc1
Wolfgang Denk [Thu, 9 Sep 2010 22:16:19 +0000 (00:16 +0200)]
Prepare v2010.09-rc1

Coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Thu, 9 Sep 2010 19:39:46 +0000 (21:39 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agoMX51: Update responsible for mx51evk
Stefano Babic [Fri, 13 Aug 2010 14:47:17 +0000 (16:47 +0200)]
MX51: Update responsible for mx51evk

Signed-off-by: Stefano Babic <sbabic@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ti
Wolfgang Denk [Thu, 9 Sep 2010 17:55:02 +0000 (19:55 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ti

13 years agobedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.
Wolfgang Denk [Wed, 18 Aug 2010 22:27:33 +0000 (00:27 +0200)]
bedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.

commit 47e26b1b "cmd_usage(): simplify return code handling" caused
the following compile warnings:

bedbug_860.c: In function 'bedbug860_do_break':
bedbug_860.c:73: warning: 'return' with a value, in function returning void
bedbug_860.c:121: warning: 'return' with a value, in function returning void

Fix the return type.

Actually these files could need some cleanup - commands should
return proper error codes, and there are coding style issues.
=> To be fixed later.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoARMV7: Fix pad mux for Panda LEDs
Ricardo Salveti de Araujo [Tue, 7 Sep 2010 23:17:52 +0000 (16:17 -0700)]
ARMV7: Fix pad mux for Panda LEDs

Correctly set PAD1_FREF_CLK4_REQ and PAD0_FREF_CLK4_OUT to enable and
activate both LEDs while setting pad mux.

Since this increases the line length, this patch also adjusts the white
space in this section of code to allign the pad mux signal description
comments.

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Overo: Autodetect presence/absence of transceiver on mmc2
Steve Sakoman [Tue, 24 Aug 2010 17:37:29 +0000 (10:37 -0700)]
ARMV7: OMAP: Overo: Autodetect presence/absence of transceiver on mmc2

An upcoming version of Overo uses a Wifi/BT module with 1.8V signaling,
eliminating the need for an external transceiver to handle the level
shifting.  This patch detects whether an external transceiver is present
and adjusts the pinmux settings as appropriate.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Add support for Beagle xM
Steve Sakoman [Fri, 20 Aug 2010 03:56:11 +0000 (20:56 -0700)]
ARMV7: OMAP3: Add support for Beagle xM

This patch adds support for the Beagle xM.  It uses the board ID
GPIO bits to recognize this revision and perform appropriate setup.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Add CONFIG_SYS_NAND_QUIET_TEST to Beagle and Overo configs
Steve Sakoman [Fri, 20 Aug 2010 03:52:35 +0000 (20:52 -0700)]
ARMV7: OMAP3: Add CONFIG_SYS_NAND_QUIET_TEST to Beagle and Overo configs

Future versions of these boards have options for POP memory with no NAND.
This option prevents display of error messages when no NAND is detected.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agomtd: nand: supress 'unknown NAND' warning if no nand is found
Steve Sakoman [Fri, 20 Aug 2010 03:14:01 +0000 (20:14 -0700)]
mtd: nand: supress 'unknown NAND' warning if no nand is found

This printk was added recently and results in ugly output on systems
with no NAND:

NAND:  nand_get_flash_type: unknown NAND device: Manufacturer ID: 0x00, Chip ID: 0x00 0 MiB

instead of:

NAND:  0 MiB

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Remove erroneous hard coded sdram setup for 128MB/bank
Steve Sakoman [Fri, 20 Aug 2010 03:09:57 +0000 (20:09 -0700)]
ARMV7: OMAP3: Remove erroneous hard coded sdram setup for 128MB/bank

Upcoming Beagle and Overo revisions use POP memory with 256MB or 512MB
per bank.  This patches uses the SDRC settings from x-load or the config
header to set up timing properly.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Fix broken reset command on OMAP36XX/37XX and OMAP4
Steve Sakoman [Wed, 25 Aug 2010 20:22:44 +0000 (13:22 -0700)]
ARMV7: OMAP3: Fix broken reset command on OMAP36XX/37XX and OMAP4

Using the reset command on OMAP36XX/37XX and OMAP4 caused a hang. This
patch uses the reset bit appropriate for each CPU architecture.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Apply Cortex-A8 errata workarounds only on affected revisions
Mans Rullgard [Wed, 14 Apr 2010 15:10:28 +0000 (16:10 +0100)]
ARMV7: OMAP3: Apply Cortex-A8 errata workarounds only on affected revisions

The workarounds for errata 621766 and 725233 should only be applied
on affected Cortex-A8 revisions.  Recent chips use r3px cores where
these have been fixed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Convert setup_auxcr() to pure asm
Mans Rullgard [Wed, 14 Apr 2010 14:49:57 +0000 (15:49 +0100)]
ARMV7: OMAP3: Convert setup_auxcr() to pure asm

This function consists entirely of inline asm statements, so writing
it directly in a .S file is simpler. Additionally, the inline asm is
not safe as is, since registers are not guaranteed to be preserved
between asm() statements.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Fix and clean up L2 cache enable/disable functions
Mans Rullgard [Wed, 14 Apr 2010 10:08:00 +0000 (11:08 +0100)]
ARMV7: OMAP3: Fix and clean up L2 cache enable/disable functions

On OMAP34xx ES1.0, the L2 enable bit can only be set in secure mode,
so an SMC call to the ROM monitor is required.  On later versions,
and on newer devices, this bit is banked and we can set it directly.

The code checked only the ES revision of the chip, and hence incorrectly
used the ROM call on ES1.0 versions of other devices.

This patch adds a check for chip family as well as revision, and also
removes some code duplication between the enable and disable functions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Add clock setup for OMAP36XX/37XX
Steve Sakoman [Wed, 18 Aug 2010 14:34:09 +0000 (07:34 -0700)]
ARMV7: OMAP3: Add clock setup for OMAP36XX/37XX

This patch configures clocks properly when a 36XX/37XX
processor is detected.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Update CPU type detection for AM35XX/OMAP36XX/37XX
Steve Sakoman [Tue, 17 Aug 2010 21:39:34 +0000 (14:39 -0700)]
ARMV7: OMAP3: Update CPU type detection for AM35XX/OMAP36XX/37XX

TI has added new processors to the OMAP3 family.  This patch enhances
the code in sysinfo.c to detect which family member is present.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Configure Overo's second network chip
Steve Sakoman [Fri, 13 Aug 2010 04:07:02 +0000 (21:07 -0700)]
ARMV7: OMAP: Configure Overo's second network chip

Confiures GPMC timings for both chips and also configures pinmux
for GPIO_65, which is used as the interrupt signal for the second chip

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Add detection and support for Beagle C4 revision
Steve Sakoman [Thu, 12 Aug 2010 22:17:37 +0000 (15:17 -0700)]
ARMV7: OMAP: Add detection and support for Beagle C4 revision

This patch enhances the revision detection function and adds
support for the C4 revision.  The board revision is printed
and approriate revision specific setup is done automatically.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Add board revision detection for Overo
Steve Sakoman [Thu, 12 Aug 2010 22:13:02 +0000 (15:13 -0700)]
ARMV7: OMAP: Add board revision detection for Overo

The latest Overo COM modules encode their revision number on
GPIOs 115, 113, and 112.  All boards to date have no pullups on these pins
and hence appear as revision 0.

This patch reads and prints the revision information.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Add mpurate boot arg for Overo and Beagle
Steve Sakoman [Wed, 3 Feb 2010 22:39:14 +0000 (14:39 -0800)]
ARMV7: OMAP: Add mpurate boot arg for Overo and Beagle

Allows one to set the processor clock rate via "setenv mpurate 720" for example

Default is set to a "safe" 500 Mhz.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Enable input driver on Overo's MMC1_CLK and MMC3_CLK pinmux setup
Steve Sakoman [Tue, 16 Feb 2010 18:00:45 +0000 (10:00 -0800)]
ARMV7: OMAP: Enable input driver on Overo's MMC1_CLK and MMC3_CLK pinmux setup

This patch modifies the pinmux setup for MMC1_CLK and MMC3_CLK to enable
the input driver.  MMC2_CLK was already properly configured.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: add convenience function to set TWL4030 regulator voltages
Steve Sakoman [Tue, 10 Aug 2010 19:58:39 +0000 (12:58 -0700)]
ARMV7: OMAP: add convenience function to set TWL4030 regulator voltages

This patch adds a function to allow one to easily set the target
voltage for the TWL4030 regulators.  It also modifies the existing
code to use this new function.  Applicable definitions are moved
out of the driver file and into the header file so that they are
generally accessible

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Move syslib.c to omap-common since it can be shared by OMAP3 and OMAP4
Steve Sakoman [Wed, 4 Aug 2010 16:39:40 +0000 (09:39 -0700)]
ARMV7: OMAP: Move syslib.c to omap-common since it can be shared by OMAP3 and OMAP4

The functions in syslib.c can be shared, so this patch moves it from
cpu/omap3 to cpu/omap-common

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoMerge branch 'avr32' of git://git.denx.de/u-boot-atmel
Wolfgang Denk [Tue, 7 Sep 2010 22:48:27 +0000 (00:48 +0200)]
Merge branch 'avr32' of git://git.denx.de/u-boot-atmel

13 years agoMerge branch 'at91' of git://git.denx.de/u-boot-atmel
Wolfgang Denk [Tue, 7 Sep 2010 22:42:00 +0000 (00:42 +0200)]
Merge branch 'at91' of git://git.denx.de/u-boot-atmel

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-samsung
Wolfgang Denk [Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-samsung

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-marvell
Wolfgang Denk [Tue, 7 Sep 2010 21:20:53 +0000 (23:20 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-marvell

13 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Tue, 7 Sep 2010 20:19:49 +0000 (22:19 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Wolfgang Denk [Tue, 7 Sep 2010 19:55:06 +0000 (21:55 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Tue, 7 Sep 2010 19:52:29 +0000 (21:52 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Tue, 7 Sep 2010 19:49:47 +0000 (21:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

13 years agoMerge branch 'next' of git://git.denx.de/u-boot-nios
Wolfgang Denk [Tue, 7 Sep 2010 19:46:14 +0000 (21:46 +0200)]
Merge branch 'next' of git://git.denx.de/u-boot-nios

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Tue, 7 Sep 2010 19:28:20 +0000 (21:28 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

13 years agoMIPS: update the MIPS u-boot.lds
Xiangfu Liu [Mon, 9 Aug 2010 15:13:43 +0000 (23:13 +0800)]
MIPS: update the MIPS u-boot.lds

From the document, if set all arguments in "OUTPUT_FORMAT" to
"tradbigmips", then even add "-EL" to gcc we still get EB format.

pb1x00 is only used in Little-endian, so its default endian should be
set to LE.

Signed-off-by: Xiangfu Liu <xiangfu@openmobilefree.net>
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agoat91_pit: Fix AT91_PIT_MR_PIV_MASK macro
Alexander Stein [Wed, 4 Aug 2010 09:24:53 +0000 (11:24 +0200)]
at91_pit: Fix AT91_PIT_MR_PIV_MASK macro

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
13 years agoavr32: Add simple paging support
Haavard Skinnemoen [Thu, 12 Aug 2010 06:52:54 +0000 (13:52 +0700)]
avr32: Add simple paging support

Use the MMU hardware to set up 1:1 mappings between physical and virtual
addresses. This allows us to bypass the cache when accessing the flash
without having to do any physical-to-virtual address mapping in the CFI
driver.

The virtual memory mappings are defined at compile time through a sorted
array of virtual memory range objects. When a TLB miss exception
happens, the exception handler does a binary search through the array
until it finds a matching entry and loads it into the TLB. The u-boot
image itself is covered by a fixed TLB entry which is never replaced.

This makes the 'saveenv' command work again on ATNGW100 and other boards
using the CFI driver, hopefully without breaking any rules.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
13 years agoavr32: Use uncached() macro to get an address for SDRAM init
Haavard Skinnemoen [Thu, 12 Aug 2010 06:52:53 +0000 (13:52 +0700)]
avr32: Use uncached() macro to get an address for SDRAM init

The paging system which is required to set up caching properties has not
yet been initialized when the SDRAM is initialized. So when the
map_physmem() function is converted to return the physical address
unchanged, the SDRAM initialization will break on some boards.

The avr32-specific uncached() macro will return an address which will
always cause uncached accessed to be made. Since this happens in the
board code, using avr32-specific features should be ok, and will allow
the SDRAM initialization to keep working.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
13 years agoavr32: Print unrelocated PC on exception
Haavard Skinnemoen [Thu, 12 Aug 2010 06:52:52 +0000 (13:52 +0700)]
avr32: Print unrelocated PC on exception

In addition to the real PC value, also print the value of PC after
subtracting the relocation offset. This value will match the address in
the ELF file so it's much easier to figure out where things went wrong.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
13 years agoAT91: add option to enable pullups in at91sam9260_devices.c
Reinhard Meyer [Wed, 25 Aug 2010 10:32:53 +0000 (12:32 +0200)]
AT91: add option to enable pullups in at91sam9260_devices.c

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91/AVR32: atmel_spi.c: flush RDR before next SPI transaction
Reinhard Meyer [Mon, 9 Aug 2010 11:37:59 +0000 (13:37 +0200)]
AT91/AVR32: atmel_spi.c: flush RDR before next SPI transaction

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: reset.c: fix comments, add option
Reinhard Meyer [Mon, 9 Aug 2010 11:25:37 +0000 (13:25 +0200)]
AT91: reset.c: fix comments, add option

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: fix at91sam9260.h for AT91SAM9XE
Reinhard Meyer [Tue, 24 Aug 2010 09:18:09 +0000 (11:18 +0200)]
AT91: fix at91sam9260.h for AT91SAM9XE

Define the different location of the GPBRs for the 9XE
Define the proper CPU Name

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91SAM9XE: add embedded flash support
Reinhard Meyer [Tue, 27 Jul 2010 13:18:38 +0000 (15:18 +0200)]
AT91SAM9XE: add embedded flash support

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: add RTT and GPBR based RTC
Reinhard Meyer [Tue, 27 Jul 2010 14:22:09 +0000 (16:22 +0200)]
AT91: add RTT and GPBR based RTC

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: MCI: add SD/MMC driver using mmc framework
Reinhard Meyer [Fri, 13 Aug 2010 08:31:06 +0000 (10:31 +0200)]
AT91: MCI: add SD/MMC driver using mmc framework

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoppc4xx: Invalidate d-cache when used as init-ram
Stefan Roese [Tue, 31 Aug 2010 09:27:14 +0000 (11:27 +0200)]
ppc4xx: Invalidate d-cache when used as init-ram

We need to invalidate the data cache after it has been used as init-ram.

This problem was detected on the lwmon5 update.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoppc4xx: Fix 440EPx bug in reconfigure_pll()
Stefan Roese [Thu, 26 Aug 2010 15:14:51 +0000 (17:14 +0200)]
ppc4xx: Fix 440EPx bug in reconfigure_pll()

This patch fixes a bug in reconfigure_pll(), where the detection of
the current bootstrap option is wrong. The ICS bits where incorrectly
shifted. This bug was found on the lwmon5 board, which uses bootstrap
option H (I2C bootstrap EEPROM).

Additionally a bit of code was moved into the if statement, since its
only used after later on. No need to run this code all the time.

Also, a few empty lines are added to make the code better readable.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Rupjyoti Sarmah <rsarmah@amcc.com>
Cc: Victor Gallardo <vgallardo@appliedmicro.com>
13 years agoppc4xx: Fix APC405 board support
Matthias Fuchs [Wed, 25 Aug 2010 15:02:28 +0000 (17:02 +0200)]
ppc4xx: Fix APC405 board support

Opps, after a long time I tested recent u-boot on our
APC405 board. This simple fix makes networking work again.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agopowerpc/8xxx: Fix dma for 36bit addressing
York Sun [Fri, 27 Aug 2010 21:25:50 +0000 (16:25 -0500)]
powerpc/8xxx: Fix dma for 36bit addressing

Use more bits to support 36-bit addressing

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoFix parameters to support RDIMM for P2020DS
York Sun [Fri, 27 Aug 2010 21:25:56 +0000 (16:25 -0500)]
Fix parameters to support RDIMM for P2020DS

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoAT91 Fix: return value of get_tbclk
Jens Scharsig [Sat, 7 Aug 2010 17:49:42 +0000 (19:49 +0200)]
AT91 Fix: return value of get_tbclk

 * Fix: return value of get_tbclk
 * this fixes issue with prematurely restart/retry, if BOOT_RETRY_TIMEOUT is used

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
13 years agoedminiv2: add I2C support using mvtwsi driver
Albert Aribaud [Fri, 27 Aug 2010 16:26:06 +0000 (18:26 +0200)]
edminiv2: add I2C support using mvtwsi driver

Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Acked-by: Prafulla Wadaskar<prafulla@marvell.com>
Acked-by: Heiko Schocher<hs@denx.de>
13 years agoi2c: rewrite mvtwsi, support orion5x and kirkwood
Albert Aribaud [Fri, 27 Aug 2010 16:26:05 +0000 (18:26 +0200)]
i2c: rewrite mvtwsi, support orion5x and kirkwood

This rewrite of the mvtwsi driver is 25% smaller and much
faster and simpler than the previous code.

Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Acked-by: Prafulla Wadaskar<prafulla@marvell.com>
Acked-by: Heiko Schocher<hs@denx.de>
13 years agoi2c: rename kirkwood_i2c to mvtwsi
Albert Aribaud [Fri, 27 Aug 2010 16:26:04 +0000 (18:26 +0200)]
i2c: rename kirkwood_i2c to mvtwsi

This driver is not kirkwood-specific and can also be used
e.g. by orion5x. Rename to a SoC-neutral name.

Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Acked-by: Prafulla Wadaskar<prafulla@marvell.com>
Acked-by: Heiko Schocher<hs@denx.de>
13 years agosuen3: remove CONFIG_HARD_I2C and related defines
Albert Aribaud [Fri, 27 Aug 2010 16:26:03 +0000 (18:26 +0200)]
suen3: remove CONFIG_HARD_I2C and related defines

These are not used on this board, which uses soft I2C instead.

Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Acked-by: Prafulla Wadaskar<prafulla@marvell.com>
Acked-by: Heiko Schocher<hs@denx.de>
13 years agosh: Update lowlevel_init.S of mpr2
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 07:20:08 +0000 (16:20 +0900)]
sh: Update lowlevel_init.S of mpr2

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>