karo-tx-uboot.git
11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 years agosh: Update lowlevel_init.S of ms7750se
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 07:18:22 +0000 (16:18 +0900)]
sh: Update lowlevel_init.S of ms7750se

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of ms7720se
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 07:14:54 +0000 (16:14 +0900)]
sh: Update lowlevel_init.S of ms7720se

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Add support do_bdinfo function
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 07:05:32 +0000 (16:05 +0900)]
sh: Add support do_bdinfo function

SH did not support do_bdinfo fuction.
This code based avr32 stuff.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of ap325rxa
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 07:04:08 +0000 (16:04 +0900)]
sh: Update lowlevel_init.S of ap325rxa

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of r2dplus
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 06:41:49 +0000 (15:41 +0900)]
sh: Update lowlevel_init.S of r2dplus

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of espt-giga
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 06:33:47 +0000 (15:33 +0900)]
sh: Update lowlevel_init.S of espt-giga

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of sh7763rdp
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 06:29:10 +0000 (15:29 +0900)]
sh: Update lowlevel_init.S of sh7763rdp

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of MigoR
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 06:22:10 +0000 (15:22 +0900)]
sh: Update lowlevel_init.S of MigoR

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of sh7785lcr
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 06:14:35 +0000 (15:14 +0900)]
sh: Update lowlevel_init.S of sh7785lcr

Fix data size.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosh: Update lowlevel_init.S of rsk7203
Nobuhiro Iwamatsu [Thu, 22 Jul 2010 02:19:17 +0000 (11:19 +0900)]
sh: Update lowlevel_init.S of rsk7203

Update data address size and fix typo of register.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agoARMV7: S5P: rename the member of gpio structure
Minkyu Kang [Wed, 25 Aug 2010 04:45:43 +0000 (13:45 +0900)]
ARMV7: S5P: rename the member of gpio structure

Typically we declare the name of gpio structure to "gpio",
so it was duplicated around the name. (e.g: gpio->gpio_a)
This patch modified the naming that is removing "gpio_".

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
11 years agoARMV7: S5P: separate the peripheral clocks
Minkyu Kang [Tue, 24 Aug 2010 06:51:55 +0000 (15:51 +0900)]
ARMV7: S5P: separate the peripheral clocks

Because of peripheral devices can select clock sources,
separate the peripheral clocks. (pwm, uart and so on)
It just return the pclk at s5pc1xx SoC,
but s5pc210 SoC must be calculated by own clock register setting.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
11 years agoorion5x: fix comment-in-comment typo in cpu.h
Albert Aribaud [Fri, 27 Aug 2010 16:11:48 +0000 (21:41 +0530)]
orion5x: fix comment-in-comment typo in cpu.h

Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
11 years agoKirkwood: bugfix: window size (mis)calculation
Prafulla Wadaskar [Thu, 26 Aug 2010 09:13:55 +0000 (14:43 +0530)]
Kirkwood: bugfix: window size (mis)calculation

Fixed kw_winctrl_calcsize() off-by-1 bug which caused mapping
windows size to be cut by half.
This corrected all windows address configuration

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
11 years agoOrion5x: bugfix: window size (mis)calculation
Albert Aribaud [Thu, 26 Aug 2010 08:35:19 +0000 (14:05 +0530)]
Orion5x: bugfix: window size (mis)calculation

Fix orion5x_winctrl_calcsize() off-by-1 bug which caused mapping
windows to be cut by half. This afected all windows including NOR
flash (causing half the flash to be unaccessible) but DRAM was and
still is fine as its size is determined otherwise.

Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
11 years agoARMV7: S5P: fix the macro at samsung_get_base function
Minkyu Kang [Tue, 24 Aug 2010 06:37:57 +0000 (15:37 +0900)]
ARMV7: S5P: fix the macro at samsung_get_base function

New line is unnecessary at last line of macro.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoARMV7: S5P: rename from CONFIG_S5PC1XX to CONFIG_S5P
Minkyu Kang [Mon, 23 Aug 2010 10:52:03 +0000 (19:52 +0900)]
ARMV7: S5P: rename from CONFIG_S5PC1XX to CONFIG_S5P

Use the same configuration around S5P SoCs.
(s5pc100, s5pc110, s5pc210 and so on)

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoCMD_I2C: make alen=0 work
Reinhard Meyer [Wed, 25 Aug 2010 12:41:16 +0000 (14:41 +0200)]
CMD_I2C: make alen=0 work

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
11 years agoS5P: mmc: fix the mmc offset
Minkyu Kang [Fri, 20 Aug 2010 08:57:38 +0000 (17:57 +0900)]
S5P: mmc: fix the mmc offset

This patch fixed the size of mmc structure.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoARMV7: S5P: rename from s5pc1xx to s5p
Minkyu Kang [Thu, 19 Aug 2010 11:41:50 +0000 (20:41 +0900)]
ARMV7: S5P: rename from s5pc1xx to s5p

Because of these are common files around s5p Socs, rename from s5pc1xx to s5p.
And getting cpu_id is SoC specific, so move to SoC's header file.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
11 years agoARMV7: S5P: make s5p-common for sharing the code between s5pc1xx and s5pc2xx
Minkyu Kang [Thu, 19 Aug 2010 04:48:11 +0000 (13:48 +0900)]
ARMV7: S5P: make s5p-common for sharing the code between s5pc1xx and s5pc2xx

This patch adds basic support for s5pc210.
s5p-common will be used by all of s5p SoCs.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
11 years agoomap2: i2c: remove redundant header definitions
Nishanth Menon [Thu, 19 Aug 2010 00:39:09 +0000 (19:39 -0500)]
omap2: i2c: remove redundant header definitions

Remove the register offset and common defines which are
already present in drivers/i2c/omap24xx.h. All of these
defines carry the same value even.

Cc: Steve Sakoman <steve@sakoman.com>
Cc: Heiko <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Wolfang Denk <wd@denx.de>
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Steve Sakoman <steve@sakoman.com>
11 years agoomap2: i2c: add syss offset
Nishanth Menon [Thu, 19 Aug 2010 00:39:08 +0000 (19:39 -0500)]
omap2: i2c: add syss offset

OMAP2420 ES2.3 trm defines syss register offset as 0x10. Add it.

Cc: Steve Sakoman <steve@sakoman.com>
Cc: Heiko <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Wolfang Denk <wd@denx.de>
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Steve Sakoman <steve@sakoman.com>
11 years agoi2c: omap2+: change header guard to be generic
Nishanth Menon [Thu, 19 Aug 2010 00:39:07 +0000 (19:39 -0500)]
i2c: omap2+: change header guard to be generic

Make the header guard to be generic to stop conflicting with
omap2 i2c header file arch/arm/include/asm/arch-omap24xx/i2c.h

Cc: Steve Sakoman <steve@sakoman.com>
Cc: Heiko <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Wolfang Denk <wd@denx.de>
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Steve Sakoman <steve@sakoman.com>
12 years agofdt: call fdt_parent_offset fewer times while translating addresses
Scott Wood [Thu, 12 Aug 2010 23:37:39 +0000 (18:37 -0500)]
fdt: call fdt_parent_offset fewer times while translating addresses

fdt_parent_offset() is an expensive operation, so we'd like to reduce
unnecessary calls to it.

Further, the practice of iterating up to the root if address/size cells
aren't found was apparently done for Linux for compatibility with certain
buggy Open Firmware implementations, and U-Boot inherited the code.  The
compliant behavior is to treat a missing #address-cells as 2, and a missing
#size-cells as 1 -- never looking anywhere but the immediate parent of the
node of interest.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agompx85xx/fdt: Add cpu-release-addr for all cores
Matthew McClintock [Thu, 19 Aug 2010 18:57:48 +0000 (13:57 -0500)]
mpx85xx/fdt: Add cpu-release-addr for all cores

We currently do not add a cpu-release-addr for core 0, this is needed
when we want to reset core 0 and later restart it from Linux

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agonios2: fix out of reach case for do_reset
Thomas Chou [Mon, 16 Aug 2010 02:49:44 +0000 (10:49 +0800)]
nios2: fix out of reach case for do_reset

There is a limitation (or bug?) of nios2 toolchain. The nios2 gcc
didn't generate correct code when the reset vector is passed as a
constant. It just generated a direct "call", which was wrong when
the reset vector was not located in the same 256MB span as u-boot.

The "Nios II Processor Reference Handbook" said,
"call can transfer execution anywhere within the 256 MByte range
determined by PC31..28. The Nios II GNU linker does not automatically
handle cases in which the address is out of this range."

So we have to use registered "callr" instruction to do the job.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
12 years agonios2: fix bootm error on fdt args
Thomas Chou [Fri, 30 Jul 2010 06:12:12 +0000 (14:12 +0800)]
nios2: fix bootm error on fdt args

We should check argv[3] only if there are enough args. Otherwise,
it might cause invalid memory access fault.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
12 years agopowerpc/83xx: Fix build issue with ve8313 board due to lbus changes
Kumar Gala [Thu, 19 Aug 2010 06:48:14 +0000 (01:48 -0500)]
powerpc/83xx: Fix build issue with ve8313 board due to lbus changes

We get two build errors:

fsl_elbc_nand.c: In function 'fsl_elbc_run_command':
fsl_elbc_nand.c:231: error: 'fsl_lbc_t' has no member named 'lsor'
make[1]: *** [/work/wd/tmp-ppc/drivers/mtd/nand/fsl_elbc_nand.o] Error 1

and

ve8313.c: In function 'initdram':
ve8313.c:104: error: expected '=', ',', ';', 'asm' or '__attribute__'
before '*' token
ve8313.c:104: error: 'lbc' undeclared (first use in this function)
ve8313.c:104: error: (Each undeclared identifier is reported only once
ve8313.c:104: error: for each function it appears in.)
ve8313.c:104: error: 'immap_t' has no member named 'lbus'
make[1]: *** [ve8313.o] Error 1
make: *** [board/ve8313/libve8313.a] Error 2

Due to changes to unifiy local bus struct definitions.

Reported-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Fix SRIO LAW setup on corenet_ds boards
Lian Minghuan [Wed, 18 Aug 2010 08:33:47 +0000 (16:33 +0800)]
powerpc/85xx: Fix SRIO LAW setup on corenet_ds boards

In function board_early_init_r(), serdes will not be initialize yet.
Thus sRIO was always considered disabled.  Move the check for sRIO into
misc_init_r() which is called after fsl_serdes_init().

Also, fixed warning associated with gur variable possibly not being
used.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Lian Minghuan <B31939@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/8xxx: Fix quad-rank DIMMs support on corenet_ds board.
york [Fri, 2 Jul 2010 22:25:59 +0000 (22:25 +0000)]
powerpc/8xxx: Fix quad-rank DIMMs support on corenet_ds board.

The board specific parameters associated with quad rank dimms where
missing.  This fixes it so the board will function if quad rank dimms
are placed in it.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Rename Security Engine Job Queue to Job Ring to match docs
Kumar Gala [Wed, 18 Aug 2010 04:12:37 +0000 (23:12 -0500)]
powerpc/85xx: Rename Security Engine Job Queue to Job Ring to match docs

Official docs call it the Job Ring not Job Queue for the p4080 security
block.  Match the docs to reduce confusion.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/8xxx: share PIC defines among 85xx and 86xx
Kim Phillips [Mon, 9 Aug 2010 23:39:57 +0000 (18:39 -0500)]
powerpc/8xxx: share PIC defines among 85xx and 86xx

fixes breakeage introduced by commit
a37c36f4e70bada297f281b0e542539ad43e50f6 "powerpc/8xxx: query
feature reporting register for num cores on unknown cpus"

Reported-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Wed, 18 Aug 2010 19:19:00 +0000 (21:19 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master

12 years agoMerge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Wolfgang Denk [Wed, 18 Aug 2010 19:16:35 +0000 (21:16 +0200)]
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

12 years agoARM: Update ARM mach-types
Sandeep Paulraj [Wed, 18 Aug 2010 14:45:54 +0000 (10:45 -0400)]
ARM: Update ARM mach-types

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

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoWork around bug in Numonyx P33/P30 256-Mbit 65nm flash chips.
Philippe De Muyter [Tue, 17 Aug 2010 16:40:25 +0000 (18:40 +0200)]
Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips.

I have "ported" U-boot to a in house made board with Numonyx Axcell P33/P30
256-Mbit 65nm flash chips.

After some time :( searching for bugs in our board or soft, we have
discovered that those chips have a small but annoying bug, documented in
"Numonyx Axcell P33/P30 256-Mbit Specification Update"

It states :
When customer uses [...] block unlock, the block lock status might be
altered inadvertently. Lock status might be set to either 01h or 03h
unexpectedly (00h as expected data), which leads to program/erase failure
on certain blocks.

A working workaround is given, which I have applied and tested with success :

Workaround:  If the interval between 60h and its subsequent command
     can be guaranteed within 20us, Option I is recommended,
     otherwise Option II (involves hardware) should be selected.
Option I: The table below lists the detail command sequences:
Command
      Data bus           Address bus       Remarks
Sequence
  1              90h            Block Address
   Read Lock Status
  2             Read         Block Address + 02h
 (2)(3)                                      (1)
3                60h           Block Address
 (2)(3)                                      (1)   Lock/Unlock/RCR Configuration
4           D0h/01h/03h        Block Address
Notes:
(1) Block Address refers to RCR configuration data only when the 60h
    command sequence is used to set RCR register combined with 03h
    subsequent command.
(2) For the third and fourth command sequences, the Block Address must
    be the same.
(3) The interval between 60h command and its subsequent D0h/01h/2Fh/03h
    commands should be less than 20us.

And here is a log comparison of a simple (destructive) flash test without
and with the workaround.

 diff without-numonyx-workaround.log with-numonyx-workaround.log
 -U-Boot 2010.06-00696-g22b002c-dirty (Aug 16 2010 - 15:07:47)
 +U-Boot 2010.06-00696-g22b002c-dirty (Aug 16 2010 - 15:25:19)

  CPU:   Freescale MCF5484
         CPU CLK 200 MHz BUS CLK 100 MHz
  Board: Macq Electronique ME2060
  I2C:   ready
  DRAM:  64 MiB
  FLASH: 32 MiB
  In:    serial
  Out:   serial
  Err:   serial
  Net:   FEC0, FEC1
  -> flinfo

  Bank # 1: CFI conformant FLASH (16 x 16)  Size: 32 MB in 259 Sectors
    Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x8922
    Erase timeout: 4096 ms, write timeout: 1 ms
    Buffer write timeout: 5 ms, buffer size: 1024 bytes

    Sector Start Addresses:
    FE000000 RO   FE008000 RO   FE010000 RO   FE018000 RO   FE020000 RO
    FE040000 RO   FE060000 RO   FE080000 RO   FE0A0000 RO   FE0C0000 RO
    ...
    FFF80000 RO   FFFA0000 RO   FFFC0000 RO   FFFE0000 RO
  -> protect off all
  Un-Protect Flash Bank # 1
  ................... done
  -> erase all
  Erase Flash Bank # 1
  ................... done
  -> cp.b 1000000 fe000000 2000000
 -Copy to Flash... Flash not Erased
 +Copy to Flash... done
  ->

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agocfi_flash: Cleanup flash_print_info()
Stefan Roese [Fri, 13 Aug 2010 07:36:36 +0000 (09:36 +0200)]
cfi_flash: Cleanup flash_print_info()

This patch does the following:

- Extract code to detect if sector is erased into function
  sector_erased().
- Because of this, we don't have variable declarations inside the
  sector loop in flash_print_info()
- Change "return" to "break" in the "if (ctrlc()) statement:
  This fixes a problem with the resulting output. Before this
  patch the output was:

  Sector Start Addresses:
  FC000000        FC020000        FC040000   =>

  With this patch it is now:

  Sector Start Addresses:
  FC000000        FC020000        FC040000
  =>

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Wolfgang Denk <wd@denx.de>
12 years agoFix printing & reading of 16-bit CFI device identifiers
Philippe De Muyter [Tue, 10 Aug 2010 14:54:52 +0000 (16:54 +0200)]
Fix printing & reading of 16-bit CFI device identifiers

Fix reading and printing of CFI flashes 16-bit devices identifiers

Nowadays CFI flashes have a 16-bit device identifier.  U-boot still
print them and read them as if they were only 8-bit wide.  Fix that.
Before:
  Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x1B
After:
  Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x881B

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agocfi_flash: flinfo: allow user interrupt in flash print info fn
Kim Phillips [Mon, 26 Jul 2010 23:35:39 +0000 (18:35 -0500)]
cfi_flash: flinfo: allow user interrupt in flash print info fn

flashes getting larger, users more impatient.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoS5P: Use accessor functions instead of SoC specific defines to access the base address
Minkyu Kang [Fri, 13 Aug 2010 07:07:35 +0000 (16:07 +0900)]
S5P: Use accessor functions instead of SoC specific defines to access the base address

This patch is intended to prepare the other S5P SoC. (s5pc210)
If use SoC specific defines then can't share with other SoC.
So, make the accessor functions for access the base address by common way.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
12 years agoenv_nand: return error when no device is found
Mike Frysinger [Thu, 12 Aug 2010 03:42:26 +0000 (23:42 -0400)]
env_nand: return error when no device is found

Currently, if there is an error probing the NAND chip and the env is based
in NAND, the readenv() function will use a NULL function pointer and thus
jump to address 0.

Here I just check for a non-zero value of blocksize as that shouldn't be
zero when a valid device is found, but perhaps there is a better way for
someone familiar with the NAND internals to suggest.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-ti
Wolfgang Denk [Thu, 12 Aug 2010 21:08:05 +0000 (23:08 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ti

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Thu, 12 Aug 2010 21:05:22 +0000 (23:05 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

12 years agommc: omap3: fix block read function
Grazvydas Ignotas [Wed, 11 Aug 2010 22:56:03 +0000 (15:56 -0700)]
mmc: omap3: fix block read function

The OMAP3 block read function is not following API and always returning
1 instead of read block count, fix it. Also to simplify code, merge it
with with a helper function, which was only called from the block read
function.

After this patch ext2 filesystem can be used properly.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agommc: omap3: make local symbols static
Grazvydas Ignotas [Wed, 11 Aug 2010 22:51:12 +0000 (15:51 -0700)]
mmc: omap3: make local symbols static

Make driver local variables and functions static and
remove them from the arch header.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoFixed clobbered output of the "help usb" command
Sergei Poselenov [Mon, 9 Aug 2010 12:01:42 +0000 (16:01 +0400)]
Fixed clobbered output of the "help usb" command

The "usb help" doesn't format the output correctly:

=> help usb
usb - USB sub-system

Usage:
usb reset - reset (rescan) USB controller
usb stop [f]  - stop USB [f]=force stop
usb tree  - show USB device tree
usb info [dev] - show available USB devices
usb storage  - show details of USB storage devices
usb dev [dev] - show or set current USB storage device
usb part [dev] - print partition table of one or all USB storage devices
usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'
    to memory address `addr'usb write addr blk# cnt - write `cnt'
blocks starting at block `blk#' from memory address `addr'
=>

With fix below applied, the output is correct:

=> help usb
usb - USB sub-system

Usage:
usb reset - reset (rescan) USB controller
usb stop [f]  - stop USB [f]=force stop
usb tree  - show USB device tree
usb info [dev] - show available USB devices
usb storage  - show details of USB storage devices
usb dev [dev] - show or set current USB storage device
usb part [dev] - print partition table of one or all USB storage devices
usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'
    to memory address `addr'
usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'
    from memory address `addr'
=>

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
12 years agoAM3517EVM: musb: add usb config
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:50 +0000 (11:43 +0530)]
AM3517EVM: musb: add usb config

Enabling USB HOST in defconfig.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
12 years agomusb: am35x: Workaround for fifo read issue
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:49 +0000 (11:43 +0530)]
musb: am35x: Workaround for fifo read issue

AM35x supports only 32bit read operations so we need to have
workaround for 8bit and 16bit read operations.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
12 years agomusb: MSC host support for AM35x
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:48 +0000 (11:43 +0530)]
musb: MSC host support for AM35x

Tested MSC Host on AM3517EVM.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
12 years agoAM35x: Adding SCM general register definitions
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:47 +0000 (11:43 +0530)]
AM35x: Adding SCM general register definitions

Adding general register structure of system control module (SCM)
of AM35x. This would be required to access devconf2 and ip_sw_reset
register in musb module.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
12 years agoBlackfin: re-use board data in cpu banner
Mike Frysinger [Mon, 9 Aug 2010 21:39:22 +0000 (17:39 -0400)]
Blackfin: re-use board data in cpu banner

The bi_cpu field of the board data is already set to the relevant cpu
string, so there is no need for us to use the define directly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: cm-bf548: increase monitor len
Mike Frysinger [Mon, 2 Aug 2010 20:30:39 +0000 (16:30 -0400)]
Blackfin: cm-bf548: increase monitor len

Recent features enabled by default require a larger monitor size for the
cm-bf548 port, so bump it up a bit.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: shutdown video DMA when booting Linux
Michael Hennerich [Fri, 7 Aug 2009 02:47:54 +0000 (02:47 +0000)]
Blackfin: shutdown video DMA when booting Linux

In case there is no frame buffer driver present in Linux to hand over the
PPI LCD DMA upon boot, the DMA initiated by u-boot to display the splash
screen runs unattended.  Therefore always stop the video driver in u-boot
before starting Linux.  If people don't want this behavior, then they can
simply stub out the video_stop() function in their board video driver.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoARM: Add support for jadecpu board based on MB86R01 SoC
Matthias Weisser [Mon, 9 Aug 2010 11:31:51 +0000 (13:31 +0200)]
ARM: Add support for jadecpu board based on MB86R01 SoC

This patch adds support for the jadecpu board using the
MB86R01 'Jade' SoC from Fujitsu.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
12 years agovideo: add support for display controller in MB86R0x SoCs
Matthias Weisser [Mon, 9 Aug 2010 11:31:50 +0000 (13:31 +0200)]
video: add support for display controller in MB86R0x SoCs

This patch adds support for the display controller in
the MB86R0x SoCs.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoARM: Add support for MB86R0x SoCs
Matthias Weisser [Mon, 9 Aug 2010 11:31:49 +0000 (13:31 +0200)]
ARM: Add support for MB86R0x SoCs

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
12 years agodisk/part.c: 'usb storage' avoiding overflow when output capacity
Sergei Trofimovich [Sun, 8 Aug 2010 12:05:39 +0000 (15:05 +0300)]
disk/part.c: 'usb storage' avoiding overflow when output capacity

Before:
    Marvell>> usb storage
      Device 0: Vendor: StoreJet Rev:  Prod:  Transcend
                Type: Hard Disk
                Capacity: 28759.9 MB = 28.0 GB (488397168 x 512)
After:
    Marvell>> usb storage
      Device 0: Vendor: StoreJet Rev:  Prod:  Transcend
                Type: Hard Disk
                Capacity: 238475.1 MB = 232.8 GB (488397168 x 512)

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 10 Aug 2010 21:03:15 +0000 (23:03 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Tue, 10 Aug 2010 20:57:54 +0000 (22:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-imx
Wolfgang Denk [Tue, 10 Aug 2010 20:49:09 +0000 (22:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-imx

12 years agoorion5x: allow overriding default mappings windows
Albert Aribaud [Tue, 13 Jul 2010 07:04:26 +0000 (09:04 +0200)]
orion5x: allow overriding default mappings windows

Turn all ORION5X_DEF{ADR,SZ}_xxx macros into ORION5X_{ADR,SZ}_xxx
and allow defining them from board code to override defaults. This
is particularly useful for defining board-specific FLASH address
and size in board header file rather than having to tweak orion5x
code.

Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-marvell
Wolfgang Denk [Tue, 10 Aug 2010 20:37:27 +0000 (22:37 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-marvell

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-ti
Wolfgang Denk [Tue, 10 Aug 2010 20:20:51 +0000 (22:20 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ti

12 years agoMerge branch 'master' of ../master
Wolfgang Denk [Tue, 10 Aug 2010 20:20:27 +0000 (22:20 +0200)]
Merge branch 'master' of ../master

12 years agoMX51EVK: fix return value of get_timer_masked
Li Haibo [Tue, 10 Aug 2010 06:18:38 +0000 (14:18 +0800)]
MX51EVK: fix return value of get_timer_masked

get_timer_masked() should return current timestamp,
not current ticks from hardware register.

Tested on one custom board with NAND flash.
Without this patch, NAND write always TIMEOUT
because get_timer(0) return a big value.

This patch applies for u-boot-2010.06

Signed-off-by: Li Haibo <hbli@sinocastel.com>
12 years agofix cmd_mmc.c, line 136 missing "
Reinhard Meyer [Mon, 9 Aug 2010 15:30:51 +0000 (17:30 +0200)]
fix cmd_mmc.c, line 136 missing "

Remove warning for missing " at the end of line 136

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
12 years agoS5P: mmc: use the standard debug macro
Minkyu Kang [Thu, 5 Aug 2010 00:55:14 +0000 (09:55 +0900)]
S5P: mmc: use the standard debug macro

Use the standard debug macro instead of the costom macro

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Cc: Wolfgang Denk <wd@denx.de>
12 years agoFix compile warnings for const correctness
Ben Warren [Thu, 29 Jul 2010 19:56:11 +0000 (12:56 -0700)]
Fix compile warnings for const correctness

Commit 6e37b1a3a25004d3df5867de49fff6b3fc9c4f04 modifies several net calls
to take a (const char *) parameter instead of (char *), but in some cases
the modified functions call other functions taking (char *).  The end result
is warnings about discarding the const qualifier.

This patch fixes these other function signatures.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
12 years agomiiphy: leverage current_mii cache more
Mike Frysinger [Tue, 27 Jul 2010 22:35:10 +0000 (18:35 -0400)]
miiphy: leverage current_mii cache more

For code that uses miiphy_{read,write}, every call invokes a full look up
of the mii list.  There is already a "current_mii" cache that is used by
some code, but have the miiphy_{read,write} function use it as well.  This
does increase the code size slightly, but I think it's worth it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
12 years agomiiphy: unify device list lookup
Mike Frysinger [Tue, 27 Jul 2010 22:35:09 +0000 (18:35 -0400)]
miiphy: unify device list lookup

Rather than have every func re-implement the list walking code, do it one
local function.  This shrinks the resulting object code a little while
making the source much more manageable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
12 years agomiiphy: constify device name
Mike Frysinger [Tue, 27 Jul 2010 22:35:08 +0000 (18:35 -0400)]
miiphy: constify device name

The driver name does not need to be writable, so constify it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
12 years agonet: rename "FSL UECx" net interfaces "UECx"
Kim Phillips [Mon, 26 Jul 2010 23:34:57 +0000 (18:34 -0500)]
net: rename "FSL UECx" net interfaces "UECx"

continuation of commit 2ecc2262d66a286e3aac79005bcb5f461312dea8
"net ppc: fix ethernet device names with spaces" (currently in
u-boot-net.git) for QE based parts.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
12 years agonet ppc: fix ethernet device names with spaces
Heiko Schocher [Tue, 20 Jul 2010 15:45:02 +0000 (17:45 +0200)]
net ppc: fix ethernet device names with spaces

since commit 1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names
with spaces drop a

Warning: eth device name has a space!

message. This patch fix it for:

- "FEC ETHERNET" devices found on
  mpc512x, mpc5xxx, mpc8xx and mpc8220 boards.
  renamed to "FEC".
- "SCC ETHERNET" devices found on
  mpc8xx, mpc82xx based boards. Renamed to "SCC".
- "HDLC ETHERNET" devices found on mpc8xx boards
  Renamed to "HDLC"
- "FCC ETHERNET" devices found on mpc8260 and mpc85xx based
  boards. Renamed to "FCC"

Tested on the kup4k board.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
12 years agonet,fec: Shorten device name as done for other drivers
Stefano Babic [Tue, 20 Jul 2010 05:57:07 +0000 (07:57 +0200)]
net,fec: Shorten device name as done for other drivers

After discussion on the ML it is suggested to drop unrequired
and not useful characters from the device name.
This patch changes the name for the fec_mxc driver from
"FEC_MXC" to "FEC".

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
12 years agoppc4xx: Fix/Update katmai board header
Stefan Roese [Tue, 3 Aug 2010 08:29:50 +0000 (10:29 +0200)]
ppc4xx: Fix/Update katmai board header

This patch has the following fixes/changes:

- Set 'kernel_addr' and 'ramdisk_addr' to correct values and add
  'fdt_addr' environment variable
- Remove 'kozio' environment variable
- Remove environmant variables to boot ancient arch/ppc Linux kernels
- Remove CONFIG_SYS_BOOTMAPSZ definition. It's already defined to
  the same value in amcc-common.h

Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: Fix building of sc3 board
Heiko Schocher [Tue, 27 Jul 2010 05:07:24 +0000 (07:07 +0200)]
ppc4xx: Fix building of sc3 board

Update image size after addition of new environment handling.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: Fix building of PMC440 board
Matthias Fuchs [Mon, 26 Jul 2010 15:17:53 +0000 (17:17 +0200)]
ppc4xx: Fix building of PMC440 board

Update image size and default environment
after addition of new environment handling.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: Fix building of CANBT board
Matthias Fuchs [Mon, 26 Jul 2010 15:17:52 +0000 (17:17 +0200)]
ppc4xx: Fix building of CANBT board

Update image size after addition of new environment handling.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: Fix building of AR405 board
Matthias Fuchs [Mon, 26 Jul 2010 15:17:51 +0000 (17:17 +0200)]
ppc4xx: Fix building of AR405 board

Update image size after addition of new environment handling.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: cleanup default environment for AMCC boards
Wolfgang Denk [Fri, 23 Jul 2010 19:16:26 +0000 (21:16 +0200)]
ppc4xx: cleanup default environment for AMCC boards

None of the AMCC boards uses an embedded environment, so there is no
need to run "saveenv" after updating U-Boot.  Drop the redundant
commands from the default environment.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>