]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
14 years agoMX31: Added LCD support for QONG module
Stefano Babic [Wed, 21 Apr 2010 07:56:31 +0000 (09:56 +0200)]
MX31: Added LCD support for QONG module

Added support for LCD and splash image to the QONG module.
The supported display is VBEST-VGG322403.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Wolfgang Denk [Tue, 27 Apr 2010 21:02:12 +0000 (23:02 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 27 Apr 2010 20:57:41 +0000 (22:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

14 years agoMerge branch 'next' of git://git.denx.de/u-boot-nios
Wolfgang Denk [Tue, 27 Apr 2010 20:53:04 +0000 (22:53 +0200)]
Merge branch 'next' of git://git.denx.de/u-boot-nios

14 years agoppc: Split MPC83xx SERDES code from MPC85xx/MPC86xx/QorIQ
Kumar Gala [Tue, 20 Apr 2010 15:02:24 +0000 (10:02 -0500)]
ppc: Split MPC83xx SERDES code from MPC85xx/MPC86xx/QorIQ

The MPC83xx SERDES control is different from the other FSL PPC chips.
For now lets split it out so we can standardize on interfaces for
determining of a device on SERDES is configured.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc85xx: Add the ability to set LCRR[CLKDIV] to improve R/W speed of flash
Lan Chunhe [Wed, 21 Apr 2010 12:40:50 +0000 (07:40 -0500)]
mpc85xx: Add the ability to set LCRR[CLKDIV] to improve R/W speed of flash

Signed-off-by: Lan Chunhe <b25806@freescale.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: clean up the io_sel for PCI express of P1022
Dave Liu [Wed, 14 Apr 2010 11:05:06 +0000 (19:05 +0800)]
85xx: clean up the io_sel for PCI express of P1022

clean up the wrong io_sel for PCI express according to latest manual.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx/socrates: Remove NFS support to fit image size.
Detlev Zundel [Wed, 14 Apr 2010 09:32:20 +0000 (11:32 +0200)]
85xx/socrates: Remove NFS support to fit image size.

This fixes an overflow during the link phase.

Signed-off-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: Fix compile warning
Kumar Gala [Tue, 13 Apr 2010 16:07:57 +0000 (11:07 -0500)]
85xx: Fix compile warning

cpu.c: In function 'checkcpu':
cpu.c:47: warning: unused variable 'gur'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: Convert cpu_init_f code to use out_be32 for LBC registers
Kumar Gala [Wed, 14 Apr 2010 04:56:23 +0000 (23:56 -0500)]
85xx: Convert cpu_init_f code to use out_be32 for LBC registers

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl_sata: Move the snoop bit to another place
Dave Liu [Mon, 12 Apr 2010 06:23:35 +0000 (14:23 +0800)]
fsl_sata: Move the snoop bit to another place

For P1022 SATA host controller, the data snoop bit of DW3 in PRDT
is moved to bit28.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl_sata: Add the workaround for errata SATA-A001
Dave Liu [Mon, 12 Apr 2010 06:23:25 +0000 (14:23 +0800)]
fsl_sata: Add the workaround for errata SATA-A001

After power on, the SATA host controller of P1022 Rev1 is configured
in legacy mode instead of the expected enterprise mode.

Software needs to clear bit[28] of HControl register to change to
enterprise mode after bringing the host offline.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: Add extra cycle to turnaround times
Dave Liu [Tue, 8 Dec 2009 03:56:48 +0000 (11:56 +0800)]
fsl-ddr: Add extra cycle to turnaround times

Add an extra cycle turnaround time to read->write to ensure stability
at high DDR frequencies.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: add the macro for Rtt_Nom definition
Dave Liu [Fri, 5 Mar 2010 04:23:00 +0000 (12:23 +0800)]
fsl-ddr: add the macro for Rtt_Nom definition

add the macro definition for Rtt_Nom termination value for DDR3

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/p4080: Add p4080 DEVDISR2 & SRDS_PLLCR0 defines
Kumar Gala [Wed, 7 Apr 2010 15:39:46 +0000 (10:39 -0500)]
ppc/p4080: Add p4080 DEVDISR2 & SRDS_PLLCR0 defines

Added some needed fines and some misc additional defines
used by p4080 initialization.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/p4080: Extend the GUTS memory map
Dave Liu [Fri, 5 Mar 2010 04:23:00 +0000 (12:23 +0800)]
ppc/p4080: Extend the GUTS memory map

Extend pin control and clock control to GUTS memory map

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/p4080: Fix synchronous frequency calculations
Srikanth Srinivasan [Wed, 10 Feb 2010 09:32:43 +0000 (17:32 +0800)]
ppc/p4080: Fix synchronous frequency calculations

When DDR is in synchronous mode, the existing code assigns sysclk
frequency to DDR frequency.  It should be synchronous with the platform
frequency.  CPU frequency is based on platform frequency in synchronous
mode.

Also fix:

* Fixes the bit mask for DDR_SYNC (RCWSR5[184])
* Corrects the detection of synchronous mode.

Signed-off-by: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Fixup PCI nodes for P1_P2_RDB
Kumar Gala [Wed, 7 Apr 2010 07:49:12 +0000 (02:49 -0500)]
ppc/85xx: Fixup PCI nodes for P1_P2_RDB

While we had ft_pci_board_setup it wasn't being called by
ft_board_setup.  Fix that so we actually update the device tree PCI
nodes on P1_P2_RDB boards.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agonios2: add nios2-generic board
Thomas Chou [Wed, 21 Apr 2010 00:40:59 +0000 (08:40 +0800)]
nios2: add nios2-generic board

This is a generic approach to port u-boot for nios2 boards.
You may find the usage of this approach on the nioswiki,
http://nioswiki.com/DasUBoot

A fpga parameter file, which contains base address information
and drivers declaration, is generated from Altera's hardware system
description sopc file using tools.

The example fpga parameter file is compatible with EP1C20, EP1S10
and EP1S40 boards. So these boards can be removed after this commit.
Though epcs controller is removed to cut the dependency of altera_spi
driver.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: fix no flash, add nand and mmc init in board.c
Thomas Chou [Thu, 22 Apr 2010 09:27:16 +0000 (17:27 +0800)]
nios2: fix no flash, add nand and mmc init in board.c

This patch fixes error when CONFIG_SYS_NO_FLASH. And adds
nand flash and mmc initialization, which should go before
env initialization.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: consolidate reset initialization
Thomas Chou [Tue, 20 Apr 2010 03:01:11 +0000 (11:01 +0800)]
nios2: consolidate reset initialization

Global interrupt should be disabled from the beginning.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agoaltera_jtag_uart: bypass when no jtag connection
Thomas Chou [Wed, 31 Mar 2010 00:30:08 +0000 (08:30 +0800)]
altera_jtag_uart: bypass when no jtag connection

This patch adds an option to bypass output waiting when there
is no jtag connection. This allows the jtag uart work similar
to a serial uart, ie, boot even without connection.

This option is enabled with CONFIG_ALTERA_JTAG_UART_BYPASS

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: add dma_alloc_coherent
Thomas Chou [Sat, 17 Apr 2010 15:34:40 +0000 (23:34 +0800)]
nios2: add dma_alloc_coherent

This function return cache-line aligned allocation which is mapped
to uncached io region.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: add 64 bits swab support
Thomas Chou [Sat, 17 Apr 2010 15:10:09 +0000 (23:10 +0800)]
nios2: add 64 bits swab support

This patch adds 64 bits swab support. Most 32 bits processors use
this. We need 64 bits swab for UBI.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: add altera cf reset
Thomas Chou [Wed, 31 Mar 2010 00:36:24 +0000 (08:36 +0800)]
nios2: add altera cf reset

This patch toggles power to reset the cf card.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: allow link script overriding from boards
Thomas Chou [Sat, 17 Apr 2010 09:39:12 +0000 (17:39 +0800)]
nios2: allow link script overriding from boards

This patch allow boards to override the default link script.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agompc5121: pdm360ng: add coprocessor POST
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:11 +0000 (19:27 +0200)]
mpc5121: pdm360ng: add coprocessor POST

Adds coprocessor communication POST code

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agompc5121: add common post_word_load/store code
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:10 +0000 (19:27 +0200)]
mpc5121: add common post_word_load/store code

Add common post_word_load/post_word_store routines
for all mpc5121 boards. pdm360ng board POST support
added by subsequent patch needs them.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agompc5121: add support for PDM360NG board
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:09 +0000 (19:27 +0200)]
mpc5121: add support for PDM360NG board

PDM360NG is a MPC5121E based board by ifm ecomatic gmbh.

Signed-off-by: Michael Weiss <michael.weiss@ifm.com>
Signed-off-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agompc5121: determine RAM size using get_ram_size()
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:08 +0000 (19:27 +0200)]
mpc5121: determine RAM size using get_ram_size()

Configure CONFIG_SYS_MAX_RAM_SIZE address range in
DDR Local Access Window and determine the RAM size.
Fix DDR LAW afterwards using detected RAM size.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agompc512x: make MEM IO Control configuration a board config option
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:07 +0000 (19:27 +0200)]
mpc512x: make MEM IO Control configuration a board config option

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agompc5121: add PSC serial communication routines
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:06 +0000 (19:27 +0200)]
mpc5121: add PSC serial communication routines

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agompc512x: add multi serial PSC support
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:05 +0000 (19:27 +0200)]
mpc512x: add multi serial PSC support

Extend mpc512x serial driver to support multiple PSC ports.

Subsequent patches for PDM360NG board support make use of this
functionality by defining CONFIG_SERIAL_MULTI in the board config
file. Additionally the used PSC devices are specified by defining
e.g. CONFIG_SYS_PSC1, CONFIG_SYS_PSC4 and CONFIG_SYS_PSC6.

Support for PSC devices other than 1, 3, 4 and 6 is not added
by this patch because these aren't used currently. In the future
it can be easily added using DECLARE_PSC_SERIAL_FUNCTIONS(N) and
INIT_PSC_SERIAL_STRUCTURE(N) macros in cpu/mpc512x/serial.c.
Additionally you have to add code for registering added
devices in serial_initialize() in common/serial.c.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agoserial: struct serial_device: add uninit() entry for drivers
Anatolij Gustschin [Sat, 24 Apr 2010 17:27:04 +0000 (19:27 +0200)]
serial: struct serial_device: add uninit() entry for drivers

Subsequent patch extends mpc512x serial driver to support
multiple PSC ports. The driver will provide an uninit()
function to stop the serial controller and to disable the
controller's clock. Adding uninit() entry to struct serial_device
allows disabling the serial controller after usage of
a stdio serial device.

This patch adds uninit() entry to the struct serial_device
and fixes initialization of this structure in the code
accordingly.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mmc
Wolfgang Denk [Sat, 24 Apr 2010 19:25:42 +0000 (21:25 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Sat, 24 Apr 2010 19:16:57 +0000 (21:16 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-microblaze
Wolfgang Denk [Sat, 24 Apr 2010 19:13:31 +0000 (21:13 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-microblaze

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Sat, 24 Apr 2010 19:11:56 +0000 (21:11 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

14 years agoppc/85xx: PIO Support for FSL eSDHC Controller Driver
Dipen Dudhat [Mon, 5 Oct 2009 10:11:58 +0000 (15:41 +0530)]
ppc/85xx: PIO Support for FSL eSDHC Controller Driver

On some Freescale SoC Internal DMA of eSDHC controller has bug.
So PIO Mode has been introduced to do data transfer using CPU.

Signed-off-by: Dipen Dudhat <dipen.dudhat@freescale.com>
14 years agompc83xx: turn on icache in core initialization to improve u-boot boot time
Kim Phillips [Wed, 21 Apr 2010 00:37:54 +0000 (19:37 -0500)]
mpc83xx: turn on icache in core initialization to improve u-boot boot time

before, MPC8349ITX boots u-boot in 4.3sec:

        column1 is elapsed time since first message
        column2 is elapsed time since previous message
        column3 is the message
0.000 0.000: U-Boot 2010.03-00126-gfd4e49c (Apr 11 2010 - 17:25:29) MPC83XX
0.000 0.000:
0.000 0.000: Reset Status:
0.000 0.000:
0.032 0.032: CPU:   e300c1, MPC8349E, Rev: 1.1 at 533.333 MHz, CSB: 266.667 MHz
0.032 0.000: Board: Freescale MPC8349E-mITX
0.032 0.000: UPMA:  Configured for compact flash
0.032 0.000: I2C:   ready
0.061 0.028: DRAM:  256 MB (DDR1, 64-bit, ECC off, 266.667 MHz)
1.516 1.456: FLASH: 16 MB
2.641 1.125: PCI:   Bus Dev VenId DevId Class Int
2.652 0.011:         00  10  1095  3114  0180  00
2.652 0.000: PCI:   Bus Dev VenId DevId Class Int
2.652 0.000: In:    serial
2.652 0.000: Out:   serial
2.652 0.000: Err:   serial
2.682 0.030: Board revision: 1.0 (PCF8475A)
3.080 0.398: Net:   TSEC1: No support for PHY id ffffffff; assuming generic
3.080 0.000: TSEC0, TSEC1
4.300 1.219: IDE:   Bus 0: .** Timeout **

after, MPC8349ITX boots u-boot in 3.0sec:

0.010 0.010: U-Boot 2010.03-00127-g4b468cc-dirty (Apr 11 2010 - 17:47:29) MPC83XX
0.010 0.000:
0.010 0.000: Reset Status:
0.010 0.000:
0.017 0.007: CPU:   e300c1, MPC8349E, Rev: 1.1 at 533.333 MHz, CSB: 266.667 MHz
0.017 0.000: Board: Freescale MPC8349E-mITX
0.038 0.020: UPMA:  Configured for compact flash
0.038 0.000: I2C:   ready
0.038 0.000: DRAM:  256 MB (DDR1, 64-bit, ECC off, 266.667 MHz)
0.260 0.222: FLASH: 16 MB
1.390 1.130: PCI:   Bus Dev VenId DevId Class Int
1.390 0.000:         00  10  1095  3114  0180  00
1.390 0.000: PCI:   Bus Dev VenId DevId Class Int
1.400 0.010: In:    serial
1.400 0.000: Out:   serial
1.400 0.000: Err:   serial
1.400 0.000: Board revision: 1.0 (PCF8475A)
1.832 0.432: Net:   TSEC1: No support for PHY id ffffffff; assuming generic
1.832 0.000: TSEC0, TSEC1
3.038 1.205: IDE:   Bus 0: .** Timeout **

also tested on these boards (albeit with a less accurate
boottime measurement method):

seconds: before  after
8349MDS  ~2.6    ~2.2
8360MDS  ~2.8    ~2.6
8313RDB  ~2.5    ~2.3 #nand boot
837xRDB  ~3.1    ~2.3

also tested on an 8323ERDB.

v2: also remove the delayed icache enablement assumption in arch ppc's
board.c, and add a CONFIG_MPC83xx define in the ITX config file for
consistency (even though it was already being defined in 83xx'
config.mk).

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: enable command line autocompletion
Kim Phillips [Thu, 15 Apr 2010 22:36:05 +0000 (17:36 -0500)]
mpc83xx: enable command line autocompletion

because it's convenient.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: use "A" nomenclature only on mpc834x and mpc836x families
Kim Phillips [Thu, 15 Apr 2010 22:36:02 +0000 (17:36 -0500)]
mpc83xx: use "A" nomenclature only on mpc834x and mpc836x families

marketing didn't extend their postpend-with-an-A naming strategy
on rev.2's and higher beyond the first two 83xx families.  This
patch stops us from misreporting we're running e.g., on an MPC8313EA,
when such a name doesn't exist.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: Use CONFIG_FSL_ESDHC to enable sdhc clk
Rini van Zetten [Thu, 15 Apr 2010 14:03:05 +0000 (16:03 +0200)]
mpc83xx: Use CONFIG_FSL_ESDHC to enable sdhc clk

Enable eSDHC Clock based on generic CONFIG_FSL_ESDHC define
instead of a platform define. This will enable all the 83xx
platforms to use sdhc_clk based on CONFIG_FSL_ESDHC.  It's
the same patch as commit 6b9ea08c5010eab5ad1056bc9bf033afb672d9cc
for the ppc/85xx.

Signed-off-by: Rini <rini@arvoo.nl>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoMove arch/ppc to arch/powerpc
Stefan Roese [Thu, 15 Apr 2010 14:07:28 +0000 (16:07 +0200)]
Move arch/ppc to arch/powerpc

As discussed on the list, move "arch/ppc" to "arch/powerpc" to
better match the Linux directory structure.

Please note that this patch also changes the "ppc" target in
MAKEALL to "powerpc" to match this new infrastructure. But "ppc"
is kept as an alias for now, to not break compatibility with
scripts using this name.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Anatolij Gustschin <agust@denx.de>
14 years agoppc4xx: TLB init file cleanup
Stefan Roese [Wed, 14 Apr 2010 11:57:18 +0000 (13:57 +0200)]
ppc4xx: TLB init file cleanup

This patch adds new macros, with frequently used combinations of the
4xx TLB access control and storage attibutes. Additionally the 4xx init.S
files are updated to make use of these new macros. Resulting in easier
to read TLB definitions.

Additionally some init.S files are updated to use the mmu header for the
TLB defines, instead of defining their own macros.

Signed-off-by: Stefan Roese <sr@denx.de>
14 years agofsl_i2c: Added a callpoint for i2c_board_late_init
Richard Retanubun [Mon, 12 Apr 2010 19:08:17 +0000 (15:08 -0400)]
fsl_i2c: Added a callpoint for i2c_board_late_init

This patch adds a callpoint in i2c_init that allows board specific
i2c board initialization (typically for i2c bus reset) that is called
after i2c_init operations, allowing the i2c_board_late_init function
to use the pre-configured i2c bus speed and slave address.

14 years agonios2: Move individual board linker scripts to common script in cpu tree.
Scott McNutt [Fri, 16 Apr 2010 20:12:39 +0000 (16:12 -0400)]
nios2: Move individual board linker scripts to common script in cpu tree.

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agomicroblaze: Consolidate cache code
Michal Simek [Fri, 16 Apr 2010 10:56:33 +0000 (12:56 +0200)]
microblaze: Consolidate cache code

Merge cpu and lib cache code.
Flush cache before disabling.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Flush cache before jumping to kernel
Michal Simek [Fri, 16 Apr 2010 10:01:32 +0000 (12:01 +0200)]
microblaze: Flush cache before jumping to kernel

There is used max cache size on system which doesn't define
cache size.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Support system with WB cache
Michal Simek [Fri, 16 Apr 2010 09:59:29 +0000 (11:59 +0200)]
microblaze: Support system with WB cache

WB cache use different instruction that WT cache but the major code
is that same. That means that wdc.flush on system with WT cache
do the same thing as before.

You need newer toolchain with wdc.flush support.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Change initialization sequence
Michal Simek [Fri, 16 Apr 2010 09:57:35 +0000 (11:57 +0200)]
microblaze: Change initialization sequence

env_relocation should be called first.
Added stdio_init too.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Change cache report messages
Michal Simek [Fri, 16 Apr 2010 09:55:01 +0000 (11:55 +0200)]
microblaze: Change cache report messages

It is more accurate to show that caches are OFF instead of FAIL.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Fix interrupt handler code
Michal Simek [Fri, 16 Apr 2010 09:51:59 +0000 (11:51 +0200)]
microblaze: Fix interrupt handler code

It is better to read ivr and react on it than do long parsing from
two regs. Interrupt controller returs actual irq number.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Move FSL initialization to board.c
Michal Simek [Fri, 16 Apr 2010 09:43:43 +0000 (11:43 +0200)]
microblaze: Move FSL initialization to board.c

Move FSL out of interrupt controller.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Move timer initialization to board.c
Michal Simek [Fri, 16 Apr 2010 09:37:41 +0000 (11:37 +0200)]
microblaze: Move timer initialization to board.c

I would like to handle case where system doesn't contain
intc that's why I need timer initialization out of intc code.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Fix irq.S code
Michal Simek [Fri, 16 Apr 2010 09:30:16 +0000 (11:30 +0200)]
microblaze: Fix irq.S code

It is ancient code. There is possible to save several instructions
just if we use offset instead of addik

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Add FDT support
Arun Bhanu [Thu, 15 Apr 2010 10:27:17 +0000 (18:27 +0800)]
microblaze: Add FDT support

This patch adds FDT (flattened device tree) support to microblaze arch.

Tested with Linux arch/microblaze kernels with and without compiled in
FDT on Xilinx ML506 board.

Signed-off-by: Arun Bhanu <arun@bhanu.net>
Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agoppc4xx: Add option for PPC440SPe ports without old Rev. A support
Stefan Roese [Fri, 9 Apr 2010 12:03:59 +0000 (14:03 +0200)]
ppc4xx: Add option for PPC440SPe ports without old Rev. A support

The 440SPe Rev. A is quite old and newer 440SPe boards don't need support
for this CPU revision. Since removing support for this older version
simplifies the creation for newer U-Boot ports, this patch now enables
440SPe > Rev. A support by creating the CONFIG_440SPE_REVA define. By
defining this in the board config header, Rev. A will still be supported.
Otherwise (default for newer board ports), Rev. A will not be supported.

Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoppc4xx: alpr: Remove some not needed commands to make image fit again
Stefan Roese [Thu, 8 Apr 2010 07:33:13 +0000 (09:33 +0200)]
ppc4xx: alpr: Remove some not needed commands to make image fit again

The latest changes increased the size of the alpr image a bit more.
Now it doesn't fit into the 256k reserved for it. This patch now removes
the commands "loads" and "loadb" which are not needed in the production
systems.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
14 years agoUpdate README to reflect new directory structure
Peter Tyser [Tue, 13 Apr 2010 03:28:21 +0000 (22:28 -0500)]
Update README to reflect new directory structure

Also fix up some whitespace issues that were introduced when moving
directory locations.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agonios2: Move cpu/nios2/* to arch/nios2/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:20 +0000 (22:28 -0500)]
nios2: Move cpu/nios2/* to arch/nios2/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agonios: Move cpu/nios/* to arch/nios/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:19 +0000 (22:28 -0500)]
nios: Move cpu/nios/* to arch/nios/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agosparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]
Peter Tyser [Tue, 13 Apr 2010 03:28:18 +0000 (22:28 -0500)]
sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoi386: Move cpu/i386/* to arch/i386/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:17 +0000 (22:28 -0500)]
i386: Move cpu/i386/* to arch/i386/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agomicroblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:16 +0000 (22:28 -0500)]
microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoavr32: Move cpu/at32ap/* to arch/avr32/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:15 +0000 (22:28 -0500)]
avr32: Move cpu/at32ap/* to arch/avr32/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agomips: Move cpu/mips/* to arch/mips/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:14 +0000 (22:28 -0500)]
mips: Move cpu/mips/* to arch/mips/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoblackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:13 +0000 (22:28 -0500)]
blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agom68k: Move cpu/$CPU to arch/m68k/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:12 +0000 (22:28 -0500)]
m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoarm: Move cpu/$CPU to arch/arm/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:11 +0000 (22:28 -0500)]
arm: Move cpu/$CPU to arch/arm/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agosh: Move cpu/$CPU to arch/sh/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:10 +0000 (22:28 -0500)]
sh: Move cpu/$CPU to arch/sh/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoppc: Move cpu/$CPU to arch/ppc/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:09 +0000 (22:28 -0500)]
ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoMove architecture-specific includes to arch/$ARCH/include/asm
Peter Tyser [Tue, 13 Apr 2010 03:28:08 +0000 (22:28 -0500)]
Move architecture-specific includes to arch/$ARCH/include/asm

This helps to clean up the include/ directory so that it only contains
non-architecture-specific headers and also matches Linux's directory
layout which many U-Boot developers are already familiar with.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoReplace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"
Peter Tyser [Tue, 13 Apr 2010 03:28:07 +0000 (22:28 -0500)]
Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"

The appropriate include/asm-$ARCH directory should already by symlinked
to include/asm so using the whole "asm-$ARCH" path is unnecessary.

This change should also allow us to move the include/asm-$ARCH
directories into their appropriate lib/$ARCH/ directories.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoMove libfdt/ into lib/
Peter Tyser [Tue, 13 Apr 2010 03:28:06 +0000 (22:28 -0500)]
Move libfdt/ into lib/

Move the libfdt directory into the common lib/ directory to clean up the
top-level directory.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoRename lib_generic/ to lib/
Peter Tyser [Tue, 13 Apr 2010 03:28:05 +0000 (22:28 -0500)]
Rename lib_generic/ to lib/

Now that the other architecture-specific lib directories have been
moved out of the top-level directory there's not much reason to have the
'_generic' suffix on the common lib directory.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoMove lib_$ARCH directories to arch/$ARCH/lib
Peter Tyser [Tue, 13 Apr 2010 03:28:04 +0000 (22:28 -0500)]
Move lib_$ARCH directories to arch/$ARCH/lib

Also move lib_$ARCH/config.mk to arch/$ARCH/config.mk

This change is intended to clean up the top-level directory structure
and more closely mimic Linux's directory organization.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoChange directory-specific CFLAGS to use full path
Peter Tyser [Tue, 13 Apr 2010 03:28:03 +0000 (22:28 -0500)]
Change directory-specific CFLAGS to use full path

Previously, a specific file or directory could be compiled with custom
CFLAGS by adding a Makefile variable such as:
  CFLAGS_dlmalloc.o = <custom flags for common/dlmalloc.c>
or
  CFLAGS_lib = <custom flags for lib directory>

This method breaks down once multiple files or directories share the
same path.  Eg FLAGS_fileA = <custom flags> would incorrectly result in
both dir1/fileA.c and dir2/fileA.c being compiled with <custom flags>.

This change allows finer grained control which we need once we move
lib_$ARCH to arch/$ARCH/lib/ and lib_generic/ to lib/.  Without this
change all lib/ directories would share the same custom CFLAGS.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoCreate CPUDIR variable
Peter Tyser [Tue, 13 Apr 2010 03:28:02 +0000 (22:28 -0500)]
Create CPUDIR variable

The CPUDIR variable points to the location of a target's CPU directory.
Currently, it is set to cpu/$CPU.  However, using $CPUDIR will allow for
more flexibility in the future.  It lays the groundwork for reorganizing
U-Boot's directory structure to support a layout such as:

  arch/$ARCH/cpu/$CPU/* (architecture with multiple CPU types)
  arch/$ARCH/cpu/*      (architecture with one CPU type)

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sat, 10 Apr 2010 21:59:39 +0000 (23:59 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

14 years agoFIX: watchdog timeout, while waiting for input
Jens Scharsig [Fri, 9 Apr 2010 17:02:38 +0000 (19:02 +0200)]
FIX: watchdog timeout, while waiting for input

* add WATCHDOG_RESET to !tstc() loops
* prevents watchdog timeout, while waiting for input,
  if CONFIG_BOOT_RETRY_TIME or CONFIG_SHOW_ACTIVITY defined

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoconfig_cmd_all.h: Sort entries alphabetically
Detlev Zundel [Thu, 8 Apr 2010 15:55:48 +0000 (17:55 +0200)]
config_cmd_all.h: Sort entries alphabetically

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agoconfig_cmd_all.h: added missing CONFIG_CMD_UBI and CONFIG_CMD_UBIFS
Frans Meulenbroeks [Thu, 8 Apr 2010 15:55:47 +0000 (17:55 +0200)]
config_cmd_all.h: added missing CONFIG_CMD_UBI and CONFIG_CMD_UBIFS

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
14 years agomalloc: sbrk() should return MORECORE_FAILURE instead of NULL on failure
karl.beldan@gmail.com [Tue, 6 Apr 2010 20:18:08 +0000 (22:18 +0200)]
malloc: sbrk() should return MORECORE_FAILURE instead of NULL on failure

Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
14 years agomkimage: Fix strict-aliasing compiler warning
Peter Tyser [Mon, 5 Apr 2010 03:36:03 +0000 (22:36 -0500)]
mkimage: Fix strict-aliasing compiler warning

Version 4.2.4 of gcc produces the following warnings without this change:
  mkimage.c: In function ‘main’:
  mkimage.c:204: warning: dereferencing type-punned pointer will break strict-aliasing rules
  mkimage.c:222: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
14 years agoAdd initial support for Matrix Vision mvSMR board based on MPC5200B.
Andre Schwarz [Thu, 1 Apr 2010 19:26:55 +0000 (21:26 +0200)]
Add initial support for Matrix Vision mvSMR board based on MPC5200B.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
14 years agocmd_bmp.c: add standard subcommand handling
Frans Meulenbroeks [Sat, 27 Mar 2010 10:16:10 +0000 (11:16 +0100)]
cmd_bmp.c: add standard subcommand handling

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
14 years agodrivers/mtd/spi/eeprom_m95xxx.c: add missing error checking
Albin Tonnerre [Sun, 14 Mar 2010 17:47:23 +0000 (18:47 +0100)]
drivers/mtd/spi/eeprom_m95xxx.c: add missing error checking

Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Fri, 9 Apr 2010 19:49:42 +0000 (21:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Fri, 9 Apr 2010 19:42:18 +0000 (21:42 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

14 years agocmd_ubi: Fix uninitialized variable warning
Peter Tyser [Mon, 5 Apr 2010 03:40:50 +0000 (22:40 -0500)]
cmd_ubi: Fix uninitialized variable warning

gcc 3.4.6 previously reported the following error on many MIPS boards
which utilize UBI:
  cmd_ubi.c:193: warning: 'vol' might be used uninitialized in this function

The current code is structured such that 'vol' will never be used when
it is NULL anyway, but gcc isn't smart enough to figure this out.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoUSB storage probe
Kim B. Heino [Fri, 12 Mar 2010 08:07:00 +0000 (10:07 +0200)]
USB storage probe

While debugging one ill behaving USB device I found two bugs in USB
storage probe.

usb_stor_get_info() returns -1 (error), 0 (skip) or 1 (ok). First part
of this patch fixes error case.

Second part fixes usb_inquiry()'s retry counter handling. Original code
had retry = -1 on error case, not retry = 0 as checked in the next line.

Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
14 years agoUSB storage count
Kim B. Heino [Fri, 12 Mar 2010 13:46:56 +0000 (15:46 +0200)]
USB storage count

Here's another USB storage patch. Currently U-Boot handles storage
devices #0 - #4 as valid devices, even if there is none connected. This
patch fixes usb_stor_get_dev() to check detected device count instead
of MAX-define.

This is very important for ill behaving devices. usb_dev_desc[] can be
partially initialized if device probe fails.

After fixing get_dev() it was easy to fix "usb part" etc commands.
Previously it outputed "Unknown partition table" five times, now it's
"no USB devices available".

Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
14 years agoEHCI: add NEC PCI ID
Sergei Shtylyov [Sat, 27 Feb 2010 18:34:41 +0000 (21:34 +0300)]
EHCI: add NEC PCI ID

Add NEC EHCI controller to the list of the supported devices.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
 drivers/usb/host/ehci-pci.c |    1 +
 1 file changed, 1 insertion(+)

14 years agoEHCI: fix port reset reporting
Sergei Shtylyov [Sat, 27 Feb 2010 18:33:21 +0000 (21:33 +0300)]
EHCI: fix port reset reporting

Commit b416191a14770c6bcc6fd67be7decf8159b2baee (Fix EHCI port reset.) didn't
move the code that checked for successful clearing of the port reset bit from
ehci_submit_root(), relying on wait_ms() call instead. The mentioned code also
erroneously reported port reset state when the reset was already completed.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
14 years agoEHCI: fix off-by-one error in ehci_submit_root()
Sergei Shtylyov [Sat, 27 Feb 2010 18:32:17 +0000 (21:32 +0300)]
EHCI: fix off-by-one error in ehci_submit_root()

USB devices on the 2nd port are not detected and I get the following message:

The request port(1) is not configured

That's with default CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS value of 2. 'req->index'
is 1-based, so the comparison in ehci_submit_root() can't be correct.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
14 years agoEHCI: fix root hub device descriptor
Sergei Shtylyov [Sat, 27 Feb 2010 18:29:42 +0000 (21:29 +0300)]
EHCI: fix root hub device descriptor

On little endian machines, EHCI root hub's USB revision is reported as 0.2 --
cpu_to_le16() was missed in the initializer for the 'bcdUSB' descriptor field.
The same should be done for the 'bcdDevice' field.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
14 years agovideo: ati_radeon_fb.c: fix warning while compiling with DEBUG
Anatolij Gustschin [Thu, 8 Apr 2010 13:50:55 +0000 (15:50 +0200)]
video: ati_radeon_fb.c: fix warning while compiling with DEBUG

Fixes this warning:

ati_radeon_fb.c: In function 'radeon_probe':
ati_radeon_fb.c:598: warning: format '%x' expects type 'unsigned int',
but argument 2 has type 'void *'

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agoati_radeon: Support PCI virtual not eq bus mapping.
Ed Swarthout [Wed, 31 Mar 2010 20:52:40 +0000 (15:52 -0500)]
ati_radeon: Support PCI virtual not eq bus mapping.

Use pci_bus_to_virt() to convert the bus address from the BARs to
virtual address' to eliminate the direct mapping requirement.

Rename variables to better match usage (_phys -> _bus or no-suffix)

This fixes the mpc8572ds CONFIG_PHYS_64BIT mode failure:
"videoboot: Video ROM failed to map!"

Tested on mpc8572ds with and without CONFIG_PHYS_64BIT.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
14 years agoati_radeon: return with error when emulator fails
Ed Swarthout [Wed, 31 Mar 2010 14:54:28 +0000 (09:54 -0500)]
ati_radeon: return with error when emulator fails

Console was being switched to video even if emulator fails and
causing this hang:

               Scanning PCI bus 04
        04  00  1095  3132  0104  00
    PCIE3 on bus 03 - 04
Video: ATI Radeon video card (1002, 5b60) found @(2:0:0)
videoboot: Booting PCI video card bus 2, function 0, device 0
videoboot: Video ROM failed to map!
640x480x8 31kHz 59Hz
radeonfb: FIFO Timeout !

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Tested-by: Anatolij Gustschin <agust@denx.de>