platform/kernel/u-boot.git
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 13 Jan 2009 23:26:48 +0000 (00:26 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

15 years agoSome changes of TLB entry setting for MPC8572DS
Haiying Wang [Tue, 13 Jan 2009 21:29:28 +0000 (16:29 -0500)]
Some changes of TLB entry setting for MPC8572DS

- Move the TLB entry of PIXIS_BASE from TLB0 to TLB1[8], because in CAMP mode,
all the TLB0 entries will be invalidated after cpu1 brings up kernel, thus cpu0
can not access PIXIS_BASE anymore (any access will cause DataTLBError exception)

- Set CONFIG_SYS_DDR_TLB_START to 9 for MPC8572DS board.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
15 years agoChange DDR tlb start entry to CONFIG param for 85xx
Haiying Wang [Tue, 13 Jan 2009 21:29:22 +0000 (16:29 -0500)]
Change DDR tlb start entry to CONFIG param for 85xx

So that we can locate the DDR tlb start entry to the value other than 8. By
default, it is still 8.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
15 years agoChange PCIE1&2 deciide logic on MPC8544DS board more readable
Roy Zang [Fri, 9 Jan 2009 08:02:35 +0000 (16:02 +0800)]
Change PCIE1&2 deciide logic on MPC8544DS board more readable

The IO port selection for MPC8544DS board:
 Port cfg_io_ports
 PCIE1 0x2, 0x3, 0x4, 0x5, 0x6, 0x7
 PCIE2 0x4, 0x5, 0x6, 0x7
 PCIE3 0x6, 0x7
 This patch changes the PCIE12 and PCIE2 logic more readable.
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
15 years agoPCIE2 and PCIE3 are decided by corresponing bit in devdisr instead of PCIE1 bit
Roy Zang [Fri, 9 Jan 2009 08:01:52 +0000 (16:01 +0800)]
PCIE2 and PCIE3 are decided by corresponing bit in devdisr instead of PCIE1 bit

PCIE2 and PCIE3 should be decided by corresponing bit in devdisr instead of
PCIE1 bit.
On MPC8572DS board, PCIE refers to PCIE1.
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
15 years agoFix IO port selection issue on MPC8544DS and MPC8572DS boards
Roy Zang [Fri, 9 Jan 2009 08:00:55 +0000 (16:00 +0800)]
Fix IO port selection issue on MPC8544DS and MPC8572DS boards

The IO port selection is not correct on MPC8572DS and MPC8544DS board.
 This patch fixes this issue.
 For MPC8572
 Port cfg_io_ports
 PCIE1 0x2, 0x3, 0x7, 0xb, 0xc, 0xf
 PCIE2 0x3, 0x7
 PCIE3 0x7

For MPC8544
Port cfg_io_ports
PCIE1 0x2, 0x3, 0x4, 0x5, 0x6, 0x7
PCIE2 0x4, 0x5, 0x6, 0x7
PCIE3 0x6, 0x7
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
15 years agompc8610hpcd: Fix PCI mapping concepts
Becky Bruce [Thu, 4 Dec 2008 04:36:44 +0000 (22:36 -0600)]
mpc8610hpcd: Fix PCI mapping concepts

Rename _BASE to _BUS, as it's actually a PCI bus address,
separate virtual and physical addresses into _VIRT and _PHYS,
and use each appopriately.  This makes the code easier to read
and understand, and facilitates mapping changes going forward.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agosbc8641d: Fix PCI mapping concepts
Becky Bruce [Thu, 4 Dec 2008 04:36:26 +0000 (22:36 -0600)]
sbc8641d: Fix PCI mapping concepts

Rename _BASE to _BUS, as it's actually a PCI bus address,
separate virtual and physical addresses into _VIRT and _PHYS,
and use each appopriately.  This makes the code easier to read
and understand, and facilitates mapping changes going forward.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sat, 10 Jan 2009 17:18:37 +0000 (18:18 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

15 years agobf537-stamp/nand: fix board_nand_init prototype
Mike Frysinger [Mon, 5 Jan 2009 21:09:44 +0000 (16:09 -0500)]
bf537-stamp/nand: fix board_nand_init prototype

The board_nand_init() function should return an int, not void.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: drop CONFIG_SPI handling in board init
Mike Frysinger [Thu, 11 Dec 2008 12:04:48 +0000 (07:04 -0500)]
Blackfin: drop CONFIG_SPI handling in board init

The eeprom SPI init functions are duplicated as the common code already
executes these for us.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: fix out-of-tree building with ldscripts
Mike Frysinger [Fri, 24 Oct 2008 21:51:57 +0000 (17:51 -0400)]
Blackfin: fix out-of-tree building with ldscripts

Many of the Blackfin board linker scripts are preprocessed, so make sure we
output the linker script into the build tree rather than the source tree.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: fix linker scripts to work with --gc-sections
Mike Frysinger [Fri, 24 Oct 2008 21:48:54 +0000 (17:48 -0400)]
Blackfin: fix linker scripts to work with --gc-sections

Make sure all .text sections get pulled in and the entry point is properly
referenced so they don't get discarded when linking with --gc-sections.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: set proper LDRFLAGS for parallel booting LDRs
Mike Frysinger [Sun, 12 Oct 2008 00:45:44 +0000 (20:45 -0400)]
Blackfin: set proper LDRFLAGS for parallel booting LDRs

In order to boot an LDR out of parallel flash, the ldr utility needs a few
flags to tell it to generate the right header.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoat91rm9200: move define from lowlevel_init to header
Jean-Christophe PLAGNIOL-VILLARD [Tue, 6 Jan 2009 20:41:59 +0000 (21:41 +0100)]
at91rm9200: move define from lowlevel_init to header

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agom501sk: move to the common memory setup
Jean-Christophe PLAGNIOL-VILLARD [Sat, 3 Jan 2009 16:22:26 +0000 (17:22 +0100)]
m501sk: move to the common memory setup

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91rm9200: rename lowlevel init value to CONFIG_SYS_
Jean-Christophe PLAGNIOL-VILLARD [Sat, 3 Jan 2009 16:22:25 +0000 (17:22 +0100)]
at91rm9200: rename lowlevel init value to CONFIG_SYS_

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91: add at91sam9xeek board support
Nicolas Ferre [Tue, 6 Jan 2009 20:13:14 +0000 (21:13 +0100)]
at91: add at91sam9xeek board support

At91sam9xe is basically an at91sam9260 with embedded flash. We can manage
it as another entry for at91sam9260 in the Makefile.

Check documentation at :
http://www.atmel.com/dyn/products/product_card.asp?part_id=4263

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agofix bmp_logo.h make dependencies to allow parallel build
Jean-Christophe PLAGNIOL-VILLARD [Tue, 6 Jan 2009 20:15:57 +0000 (21:15 +0100)]
fix bmp_logo.h make dependencies to allow parallel build

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91: Fix Atmel's at91sam9 boards out of tree build
Jean-Christophe PLAGNIOL-VILLARD [Sat, 3 Jan 2009 16:22:24 +0000 (17:22 +0100)]
at91: Fix Atmel's at91sam9 boards out of tree build

introduced in commit 89a7a87f084c

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 30 Dec 2008 22:30:47 +0000 (23:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Wolfgang Denk [Tue, 30 Dec 2008 22:28:13 +0000 (23:28 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Tue, 30 Dec 2008 22:25:01 +0000 (23:25 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Tue, 30 Dec 2008 22:22:19 +0000 (23:22 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

15 years agoREADME: update mailing list name and hits to patch submission.
Wolfgang Denk [Tue, 30 Dec 2008 21:56:11 +0000 (22:56 +0100)]
README: update mailing list name and hits to patch submission.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years ago85xx: Enable inbound PCI config cycles for X-ES boards cleanup
Peter Tyser [Tue, 23 Dec 2008 22:32:01 +0000 (16:32 -0600)]
85xx: Enable inbound PCI config cycles for X-ES boards cleanup

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoXPedite5200 board support cleanup
Peter Tyser [Tue, 23 Dec 2008 22:32:00 +0000 (16:32 -0600)]
XPedite5200 board support cleanup

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agousb_kbd: fix usb_kbd_deregister when DEVICE_DEREGISTER not enable
Jean-Christophe PLAGNIOL-VILLARD [Tue, 2 Dec 2008 20:58:04 +0000 (21:58 +0100)]
usb_kbd: fix usb_kbd_deregister when DEVICE_DEREGISTER not enable

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Remy Böhmer <linux@bohmer.net>
16 years agompc8[56]xx: Put localbus clock in sysinfo and gd
Trent Piepho [Wed, 3 Dec 2008 23:16:37 +0000 (15:16 -0800)]
mpc8[56]xx: Put localbus clock in sysinfo and gd

Currently MPC85xx and MPC86xx boards just calculate the localbus frequency
and print it out, but don't save it.

This changes where its calculated and stored to be more consistent with the
CPU, CCB, TB, and DDR frequencies and the MPC83xx localbus clock.

The localbus frequency is added to sysinfo and calculated when sysinfo is
set up, in cpu/mpc8[56]xx/speed.c, the same as the other frequencies are.

get_clocks() copies the frequency into the global data, as the other
frequencies are, into a new field that is only enabled for MPC85xx and
MPC86xx.

checkcpu() in cpu/mpc8[56]xx/cpu.c will print out the local bus frequency
from sysinfo, like the other frequencies, instead of calculating it on the
spot.

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>
16 years agompc86xx: Double local bus clock divider
Trent Piepho [Wed, 3 Dec 2008 23:16:36 +0000 (15:16 -0800)]
mpc86xx: Double local bus clock divider

The local bus clock divider should be doubled for both 8610 and 8641.

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>
16 years agompc8568: Double local bus clock divider
Trent Piepho [Wed, 3 Dec 2008 23:16:35 +0000 (15:16 -0800)]
mpc8568: Double local bus clock divider

The clock divider for the MPC8568 local bus should be doubled, like the
other newer MPC85xx chips.

Since there are now more chips with a 2x divider than a 1x, and any new
85xx chips will probably be 2x, invert the sense of the #if so that it
lists the 1x chips instead of the 2x ones.

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>
16 years ago85xx: Fix the boot window issue
Dave Liu [Tue, 16 Dec 2008 04:09:27 +0000 (12:09 +0800)]
85xx: Fix the boot window issue

If one custom board is using the 8MB flash, it is set
as FLASH_BASE = 0xef000000, TEXT_BASE = 0xef780000.
The current start.S code will be broken at switch_as.

It is because the TLB1[15] is set as 16MB page size,
EPN = TEXT_BASE & 0xff000000, RPN = 0xff000000.

For the 8MB flash case, the EPN = 0xefxxxxxx,
RPN = 0xffxxxxxx. Assume the virt address of switch_as
is 0xef7ff18c, the real address of the instruction at
switch_as should be 0xff7ff18c. the 0xff7ff18c is out
of the range of the default 8MB boot LAW window
0xff800000 - 0xffffffff.

So when we switch to AS1 address space at switch_as,
the core can't fetch the instruction at switch_as any
more. It will cause broken issue.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agosbc8548: use proper PHY address
Paul Gortmaker [Thu, 11 Dec 2008 20:47:50 +0000 (15:47 -0500)]
sbc8548: use proper PHY address

The values given for the PHY address were wrong, so the code
read no valid PHY ID, and fell through to the generic PHY
support, which would work on 1000M but would not auto negotiate
down to 100M or 10M.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
16 years agosbc8548: enable command line editing by default.
Paul Gortmaker [Thu, 11 Dec 2008 20:47:51 +0000 (15:47 -0500)]
sbc8548: enable command line editing by default.

Lets make things a bit more user friendly.  It isn't 1985 anymore.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
16 years agosbc8548: don't enable the 3rd and 4th eTSEC
Paul Gortmaker [Thu, 11 Dec 2008 20:47:49 +0000 (15:47 -0500)]
sbc8548: don't enable the 3rd and 4th eTSEC

These interfaces don't have usable connectors on the board, so don't
bother enumerating or configuring them.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
16 years agoSet IVPR to kenrel entry point in second core boot page
Haiying Wang [Wed, 3 Dec 2008 15:08:19 +0000 (10:08 -0500)]
Set IVPR to kenrel entry point in second core boot page

Assuming the OSes exception vectors start from the base of kernel address, and
the kernel physical starting address can be relocated to an non-zero address.
This patch enables the second core to have a valid IVPR for debugger before
kernel setting IVPR in CAMP mode. Otherwise, IVPR is 0x0 and it is not a valid
value for second core which runs kernel at different physical address other
than 0x0.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
16 years agompc8xxx: LCRR[CLKDIV] is sometimes five bits
Trent Piepho [Wed, 3 Dec 2008 23:16:34 +0000 (15:16 -0800)]
mpc8xxx: LCRR[CLKDIV] is sometimes five bits

On newer CPUs, 8536, 8572, and 8610, the CLKDIV field of LCRR is five bits
instead of four.

In order to avoid an ifdef, LCRR_CLKDIV is set to 0x1f on all systems.  It
should be safe as the fifth bit was defined as reserved and set to 0.

Code that was using a hard coded 0x0f is changed to use LCRR_CLKDIV.

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>
16 years agompc8[56]xx: Put localbus clock in device tree
Trent Piepho [Wed, 3 Dec 2008 23:16:38 +0000 (15:16 -0800)]
mpc8[56]xx: Put localbus clock in device tree

Export the localbus frequency in the device tree, the same way the CPU, TB,
CCB, and various other frequencies are exported in their respective device
tree nodes.

Some localbus devices need this information to be programed correctly, so
it makes sense to export it along with the other frequencies.

Unfortunately, when someone wrote the localbus dts bindings, they didn't
bother to define what the "compatible" property should be.  So it seems no
one was quite sure what to put in their dts files.

Based on current existing dts files in the kernel source, I've used
"fsl,pq3-localbus" and "fsl,elbc" for MPC85xx, which are used by almost all
of the 85xx devices, and are looked for by the Linux code.  The eLBC is
apparently not entirely backward compatible with the pq3 LBC and so eLBC
equipped platforms like 8572 won't use pq3-localbus.

For MPC86xx, I've used "fsl,elbc" which is used by some of the 86xx systems
and is also looked for by the Linux code.  On MPC8641, I've also used
"fsl,mpc8641-localbus" as it is also commonly used in dts files, some of
which don't use "fsl,elbc" or any other acceptable name to match on.

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>
16 years agoNAND FSL elbc: Use virt_to_phys to determine which bank is in use
Kumar Gala [Tue, 16 Dec 2008 20:59:22 +0000 (14:59 -0600)]
NAND FSL elbc: Use virt_to_phys to determine which bank is in use

The current code that determines which bank/chipselect is used for a
given NAND instance only worked for 32-bit addresses and assumed
a 1:1 mapping.  This breaks in 36-bit physical configs.

The proper way to handle this is to use the virt_to_phys() and
BR_PHYS_ADDR() routinues to match the 34-bit lbc bus address
with the the virtual address the NAND code uses.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Scott Wood <scottwood@freescale.com>
16 years agoppc: Use addrmap in virt_to_phys and map_physmem.
Kumar Gala [Tue, 16 Dec 2008 20:59:21 +0000 (14:59 -0600)]
ppc: Use addrmap in virt_to_phys and map_physmem.

If we have addr map support enabled use the mapping functions to
implement virt_to_phys() and map_physmem().

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago85xx: Add support to populate addr map based on TLB settings
Kumar Gala [Tue, 16 Dec 2008 20:59:20 +0000 (14:59 -0600)]
85xx: Add support to populate addr map based on TLB settings

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoXPedite5200 board support
Peter Tyser [Mon, 1 Dec 2008 19:47:13 +0000 (13:47 -0600)]
XPedite5200 board support

Initial support for Extreme Engineering Solutions XPedite5200 -
a MPC8548-based PMC single board computer.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years ago85xx: Enable inbound PCI config cycles for X-ES boards
Peter Tyser [Wed, 29 Oct 2008 17:39:27 +0000 (12:39 -0500)]
85xx: Enable inbound PCI config cycles for X-ES boards

Update X-ES Freescale boards to allow inbound PCI configuration
cycles when configured as agent/endpoint.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agoXPedite5370 board support
Peter Tyser [Wed, 17 Dec 2008 22:36:23 +0000 (16:36 -0600)]
XPedite5370 board support

Initial support for Extreme Engineering Solutions XPedite5370 -
a MPC8572-based 3U VPX single board computer with a PMC/XMC
site.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agoAdd support for PCA953x I2C gpio devices
Peter Tyser [Wed, 17 Dec 2008 22:36:21 +0000 (16:36 -0600)]
Add support for PCA953x I2C gpio devices

Initial support for NXP's 4 and 8 bit I2C gpio expanders
(eg pca9537, pca9557, etc). The CONFIG_PCA953X define
enables support for the devices while the CONFIG_CMD_PCA953X
define enables the pca953x command. The CONFIG_CMD_PCA953X_INFO
define enables an 'info' sub-command which provides summary
information for the given pca953x device.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agopci/fsl_pci_init: Enable inbound PCI config cycles
Peter Tyser [Wed, 29 Oct 2008 17:39:26 +0000 (12:39 -0500)]
pci/fsl_pci_init: Enable inbound PCI config cycles

Add fsl_pci_config_unlock() function to enable a
PCI/PCIe interface configured in agent/endpoint mode to
respond to inbound PCI configuration cycles.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agoMIPS: qemu_mips: update doc to generate and to use qemu flash, ide file
Jean-Christophe PLAGNIOL-VILLARD [Mon, 8 Sep 2008 20:27:18 +0000 (22:27 +0200)]
MIPS: qemu_mips: update doc to generate and to use qemu flash, ide file

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMIPS: qemu_mips: update doc to use all disk and boot linux kernel
Jean-Christophe PLAGNIOL-VILLARD [Tue, 16 Dec 2008 21:10:31 +0000 (22:10 +0100)]
MIPS: qemu_mips: update doc to use all disk and boot linux kernel

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMIPS: qemu_mips: move env storage just after u-boot
Jean-Christophe PLAGNIOL-VILLARD [Tue, 16 Dec 2008 21:10:30 +0000 (22:10 +0100)]
MIPS: qemu_mips: move env storage just after u-boot

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoPrepare 2009.01-rc1 v2009.01-rc1
Wolfgang Denk [Tue, 16 Dec 2008 22:48:27 +0000 (23:48 +0100)]
Prepare 2009.01-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoinclude/configs/at91cap9adk.h: fix typo.
Wolfgang Denk [Tue, 16 Dec 2008 22:13:46 +0000 (23:13 +0100)]
include/configs/at91cap9adk.h: fix typo.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoboard/trab/memory.c: Fix compile problems.
Wolfgang Denk [Tue, 16 Dec 2008 21:32:25 +0000 (22:32 +0100)]
board/trab/memory.c: Fix compile problems.

Apply changes from commit 44b4dbed to board/trab/memory.c, too.

Actually we'd need a major cleanup here - as it turns out,
board/trab/memory.c is more or less a verbatim copy of
post/drivers/memory.c ... but then, trab is EOL anyway,r
so this is not worth the effort.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoNAND: Mark the BBT as scanned prior to calling scan_bbt.
Scott Wood [Tue, 16 Dec 2008 20:24:16 +0000 (14:24 -0600)]
NAND: Mark the BBT as scanned prior to calling scan_bbt.

Otherwise, recursion can occur if scan_bbt does not find a bad block
table, and tries to write one, and the attempt to erase the BBT area
causes a bad block check.

Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agoMerge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Wolfgang Denk [Tue, 16 Dec 2008 16:16:34 +0000 (17:16 +0100)]
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

16 years agojffs2: include <linux/mtd/compat.h> instead of defining own min_t
Ilya Yanok [Thu, 11 Dec 2008 02:51:57 +0000 (05:51 +0300)]
jffs2: include <linux/mtd/compat.h> instead of defining own min_t

Include <linux/mtd/compat.h> header for min_t definition instead of
providing our own one. Removes warnings in case of OneNAND support
enabled.

Although I thinks it's a bit silly to include <linux/mtd/compat.h>
just for min_t...

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Acked-by: Stefan Roese <sr@denx.de>
16 years agopowerpc: fix io.h build warning with CONFIG_PHYS_64BIT
Becky Bruce [Thu, 4 Dec 2008 05:04:37 +0000 (23:04 -0600)]
powerpc: fix io.h build warning with CONFIG_PHYS_64BIT

Casting a pointer to a phys_addr_t when it's an unsigned long long
on a 32-bit system without first casting to a non-pointer type
generates a compiler warning. Fix this.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
16 years agotrab: make trab_fkt standalone code independent of libgcc
Wolfgang Denk [Tue, 16 Dec 2008 15:22:50 +0000 (16:22 +0100)]
trab: make trab_fkt standalone code independent of libgcc

Use our own local functions in lib_arm/ instead.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agopost/Makefile: fix dependency problem with parallel builds
Wolfgang Denk [Tue, 16 Dec 2008 13:44:06 +0000 (14:44 +0100)]
post/Makefile: fix dependency problem with parallel builds

Parallel builds (using "make -jN") would occasionally fail with error
messages like
ppc_4xxFP-objdump: string.o: File format not recognized
or
post/libpost.a(cpu.o): In function `cpu_post_test':
/home/wd/git/u-boot/work/post/lib_ppc/cpu.c:130: undefined reference to `cpu_post_test_string'
or similar. We now make sure to run the 'postdeps" step before
attempting to build the specific POST libraries.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMakefile: fix dependency problem with parallel builds
Wolfgang Denk [Tue, 16 Dec 2008 13:41:02 +0000 (14:41 +0100)]
Makefile: fix dependency problem with parallel builds

Parallel builds (using "make -jN") would occasionally fail with error
messages like
include/autoconf.mk:212: *** missing separator.  Stop.
Line numbers and affected boards were changing. Obviously some
Makefiles included autoconf.mk while it was still being written to.
As a fix, we now write to a temporary file first and then rename it,
so that it is really ready to use as soon as it appears.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCoding style cleanup, update CHANGELOG.
Wolfgang Denk [Tue, 16 Dec 2008 00:02:17 +0000 (01:02 +0100)]
Coding style cleanup, update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agospi/stmicro: fix debug() display of cmd
Mike Frysinger [Thu, 11 Dec 2008 23:39:08 +0000 (18:39 -0500)]
spi/stmicro: fix debug() display of cmd

The stmicro_wait_ready() func tries to show the actual opcode that was sent
to the device, but instead it displays the array pointer.  Fix it to pull
out the opcode from the start of the array.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
16 years agoenv_sf: support embedded environments
Mike Frysinger [Thu, 11 Dec 2008 11:23:37 +0000 (06:23 -0500)]
env_sf: support embedded environments

If both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE are defined, and the sect
size is larger than the env size, then it means the env is embedded in a
block.  So we have to save/restore the part of the sector which is not the
environment.  Previously, saving the environment in SPI flash in this
setup would probably brick the board as the rest of the sector tends to
contain actual U-Boot data/code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoi2c: merge all i2c_reg_read() and i2c_reg_write() into inline functions
Timur Tabi [Wed, 3 Dec 2008 17:28:30 +0000 (11:28 -0600)]
i2c: merge all i2c_reg_read() and i2c_reg_write() into inline functions

All implementations of the functions i2c_reg_read() and
i2c_reg_write() are identical. We can save space and simplify the
code by converting these functions into inlines and putting them in
i2c.h.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-By: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agolib_ppc: rework the flush_cache
Dave Liu [Fri, 5 Dec 2008 07:36:14 +0000 (15:36 +0800)]
lib_ppc: rework the flush_cache

- It is possible to miss flush/invalidate the last
  cache line, we fix it at here.
- add the volatile and memory clobber.

They are pointed by Scott Wood.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agoIntroduce addr_map library
Kumar Gala [Sat, 13 Dec 2008 23:20:28 +0000 (17:20 -0600)]
Introduce addr_map library

Add a library that helps in translating between virtual and physical
addresses.  This library can be useful as a simple means to implement
map_physmem() and virt_to_phys() for platforms that need functionality
beyond the simple 1:1 mapping.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoIntroduce virt_to_phys()
Kumar Gala [Sat, 13 Dec 2008 23:20:27 +0000 (17:20 -0600)]
Introduce virt_to_phys()

virt_to_phys() returns the physical address given a virtual. In most
cases this will be just the input value as the vast majority of
systems run in a 1:1 mode.

However in systems that are not running this way it should report the
physical address or ~0 if no mapping exists for the given virtual
address.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoPOST Make: fix the sub-dir dependencies missing.
Yuri Tikhonov [Sun, 7 Dec 2008 21:12:50 +0000 (22:12 +0100)]
POST Make: fix the sub-dir dependencies missing.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoFix a typo in fw_env.config
Martin Michlmayr [Wed, 6 Aug 2008 11:44:05 +0000 (14:44 +0300)]
Fix a typo in fw_env.config

Reported-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoRemove unused CONFIG_ADDR_STREAMING defines
Peter Tyser [Mon, 1 Dec 2008 22:22:45 +0000 (16:22 -0600)]
Remove unused CONFIG_ADDR_STREAMING defines

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agocmd_mem: Remove unused variable
Peter Tyser [Mon, 24 Nov 2008 17:54:47 +0000 (11:54 -0600)]
cmd_mem: Remove unused variable

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agoFix new found CFG_
Jean-Christophe PLAGNIOL-VILLARD [Sun, 14 Dec 2008 09:29:39 +0000 (10:29 +0100)]
Fix new found CFG_

Also fix some minor typos.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoRemove compiler warning: target CPU does not support interworking
Sergei Poselenov [Fri, 19 Sep 2008 10:07:34 +0000 (12:07 +0200)]
Remove compiler warning: target CPU does not support interworking

This warning is issued by modern ARM-EABI GCC on non-thumb targets.

Signed-off-by: Vladimir Panfilov <pvr@emcraft.com>
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoFix FIT and FDT support to have CONFIG_OF_LIBFDT and CONFIG_FIT independent
Jean-Christophe PLAGNIOL-VILLARD [Mon, 24 Nov 2008 12:33:51 +0000 (13:33 +0100)]
Fix FIT and FDT support to have CONFIG_OF_LIBFDT and CONFIG_FIT independent

FDT support is used for both FIT style images and for architectures
that can pass a fdt blob to an OS (ppc, m68k, sparc).

For other architectures and boards which do not pass a fdt blob to an
OS but want to use the new uImage format, we just need FIT support.

Now we can have the 4 following configurations :

1) FIT only             CONFIG_FIT
2) fdt blob only        CONFIG_OF_LIBFDT
3) both                 CONFIG_OF_LIBFDT & CONFIG_FIT
4) none                 none

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Fri, 12 Dec 2008 23:36:25 +0000 (00:36 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Wolfgang Denk [Fri, 12 Dec 2008 23:34:12 +0000 (00:34 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Fri, 12 Dec 2008 23:26:19 +0000 (00:26 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-microblaze
Wolfgang Denk [Fri, 12 Dec 2008 23:25:24 +0000 (00:25 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-microblaze

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Fri, 12 Dec 2008 23:20:01 +0000 (00:20 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

16 years agoppc4xx: Disable EEPROM write access on PMC440 boards
Matthias Fuchs [Wed, 10 Dec 2008 14:13:32 +0000 (15:13 +0100)]
ppc4xx: Disable EEPROM write access on PMC440 boards

This patch disables EEPROM wrtie access by default on PMC440 board.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Fix Ethernet PHY LED configuration on PMC440 boards
Matthias Fuchs [Wed, 10 Dec 2008 14:12:56 +0000 (15:12 +0100)]
ppc4xx: Fix Ethernet PHY LED configuration on PMC440 boards

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoMIPS: Flush data cache upon relocation
Stefan Roese [Tue, 18 Nov 2008 15:36:12 +0000 (16:36 +0100)]
MIPS: Flush data cache upon relocation

This patch now adds a flush to the data cache upon relocation. The
current implementation is missing this. Only a comment states that it
should be done. So let's really do it now.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMIPS: Add CONFIG_SKIP_LOWLEVEL_INIT
Stefan Roese [Tue, 18 Nov 2008 15:36:22 +0000 (16:36 +0100)]
MIPS: Add CONFIG_SKIP_LOWLEVEL_INIT

This patch adds the CONFIG_SKIP_LOWLEVEL_INIT option to start.S. This
enables support for boards where the lowlevel initialization is
already done when U-Boot runs (e.g. via OnChip ROM).

This will be used in the upcoming VCTH board support.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMIPS: Add board_early_init_f() to init_sequence
Stefan Roese [Wed, 12 Nov 2008 12:18:02 +0000 (13:18 +0100)]
MIPS: Add board_early_init_f() to init_sequence

This patch adds the board_early_init_f() call to the MIPS init
sequence. A weak dummy implementation is also added which can be
overridden by a board specific version.

This will be used by the upcoming VCTH board support.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMIPS: Add onenand_init() to board.c and move nand_init()
Stefan Roese [Wed, 12 Nov 2008 12:18:19 +0000 (13:18 +0100)]
MIPS: Add onenand_init() to board.c and move nand_init()

This patch adds a call to onenand_init() for OneNAND support and moves
the nand_init() call to an earlier place, so that the environment can
be used from NAND and OneNAND.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agosh: Update sh2/sh2a timer
Nobuhiro Iwamatsu [Tue, 9 Dec 2008 02:32:46 +0000 (11:32 +0900)]
sh: Update sh2/sh2a timer

Renesas SH2/SH2A timer broken.
This patch fix timer function.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: r2dplus fix register access
Jean-Christophe PLAGNIOL-VILLARD [Fri, 5 Dec 2008 06:27:37 +0000 (07:27 +0100)]
sh: r2dplus fix register access

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: r2dplus/lowlevel_init: coding style fix
Jean-Christophe PLAGNIOL-VILLARD [Tue, 2 Dec 2008 06:40:03 +0000 (07:40 +0100)]
sh: r2dplus/lowlevel_init: coding style fix

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Changed value of CACHE_OC_NUM_ENTRIES and CACHE_OC_WAY_SHIFT
Nobuhiro Iwamatsu [Tue, 25 Nov 2008 02:05:19 +0000 (11:05 +0900)]
sh: Changed value of CACHE_OC_NUM_ENTRIES and CACHE_OC_WAY_SHIFT

SH4 is different a value of CACHE_OC_NUM_ENTRIES and
CACHE_OC_WAY_SHIFT every CPU.
This patch corrects these values.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Update sh timer function
Nobuhiro Iwamatsu [Thu, 20 Nov 2008 07:44:42 +0000 (16:44 +0900)]
sh: Update sh timer function

Change to write/readX function and fix timer problem.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Migo-R: Update BSC value
Nobuhiro Iwamatsu [Tue, 4 Nov 2008 02:58:58 +0000 (11:58 +0900)]
sh: Migo-R: Update BSC value

A value of BSC CS4 was wrong, Fixed it.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Update ms7722se board config
Nobuhiro Iwamatsu [Mon, 17 Nov 2008 07:52:09 +0000 (16:52 +0900)]
sh: Update ms7722se board config

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Update SuperH serial driver
Nobuhiro Iwamatsu [Mon, 17 Nov 2008 07:53:09 +0000 (16:53 +0900)]
sh: Update SuperH serial driver

The address of SCFSR register is wrong at SH7720/SH7721.
This patch fix this.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: fix rsk7203 and MigoR out of tree build
Jean-Christophe PLAGNIOL-VILLARD [Tue, 11 Nov 2008 21:20:15 +0000 (22:20 +0100)]
sh: fix rsk7203 and MigoR out of tree build

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agoppc4xx: Update TEXT_BASE for CPCI405 boards
Matthias Fuchs [Wed, 10 Dec 2008 13:41:25 +0000 (14:41 +0100)]
ppc4xx: Update TEXT_BASE for CPCI405 boards

This patch fixes building U-Boot for CPCI405 boards.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Remove some features from ALPR to fit into 256k again
Stefan Roese [Tue, 9 Dec 2008 19:08:01 +0000 (20:08 +0100)]
ppc4xx: Remove some features from ALPR to fit into 256k again

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoUBI: Set ubi_dev.type back to DEV_TYPE_NONE upon failing initialization
Stefan Roese [Wed, 10 Dec 2008 09:32:59 +0000 (10:32 +0100)]
UBI: Set ubi_dev.type back to DEV_TYPE_NONE upon failing initialization

With this patch we set the type back to NONE upon failing UBI partition
initialization. Otherwise further calls to the UBI subsystem would try
to really access the non-existing UBI partition.

Thanks to Michael Lawnick for pointing this out.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoUBI: Return -ENOMEM upon failing malloc
Stefan Roese [Wed, 10 Dec 2008 09:28:33 +0000 (10:28 +0100)]
UBI: Return -ENOMEM upon failing malloc

Return with correct error code (-ENOMEM) from ubi_attach_mtd_dev() upon
failing malloc().

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoFix compile error in building MBX860T.
Ben Warren [Wed, 10 Dec 2008 07:34:15 +0000 (23:34 -0800)]
Fix compile error in building MBX860T.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agomicroblaze: Remove XUPV2P board
Michal Simek [Tue, 25 Nov 2008 10:42:20 +0000 (11:42 +0100)]
microblaze: Remove XUPV2P board

---

Microblaze platforms use generic settings and to have
many platforms is confusing that's why I decided to remove this
platform from U-BOOT. ml401 tree is sufficient for covering
all Microblaze platforms.

This change will go through microblaze custodian tree.

16 years agomicroblaze: Remove CONFIG_LIBFDT due to error in common files
Michal Simek [Mon, 24 Nov 2008 17:25:41 +0000 (18:25 +0100)]
microblaze: Remove CONFIG_LIBFDT due to error in common files