project/bcm63xx/u-boot.git
11 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Mon, 4 Feb 2013 14:07:34 +0000 (09:07 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-microblaze

11 years agoserial: arm_dcc: Fix compilation warning and remove unneeded initialization
Michal Simek [Tue, 22 Jan 2013 23:40:07 +0000 (23:40 +0000)]
serial: arm_dcc: Fix compilation warning and remove unneeded initialization

- arm_dcc_dev is already initialized.
- Remove unused rc variable
Warning log:
arm_dcc.c: In function 'drv_arm_dcc_init':
arm_dcc.c:145:6: warning: unused variable 'rc' [-Wunused-variable]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agoserial: arm_dcc: Remove CONFIG_ARM_DCC_MULTI option
Michal Simek [Tue, 22 Jan 2013 23:40:06 +0000 (23:40 +0000)]
serial: arm_dcc: Remove CONFIG_ARM_DCC_MULTI option

CONFIG_ARM_DCC_MULTI should be also removed in the patch
"serial: Remove CONFIG_SERIAL_MULTI from serial drivers"
(sha1: a3827250606895ec2dd4b8d867342b7cabf3692f)
Because the driver defines serial_* functions
which cause conflict with serial.c (multiple definition of serial_*)

Removing CONFIG_SERIAL_MULTI function also require to define
default_serial_console for cases where another serial driver
is not available in the system.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agosf: stmicro: add support for N25Q064
Jagannadha Sutradharudu Teki [Wed, 12 Dec 2012 04:48:56 +0000 (04:48 +0000)]
sf: stmicro: add support for N25Q064

Add support for Numonyx N25Q064 SPI flash.

Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
11 years agocmd_time: merge run_command_and_time_it with cmd_process
Richard Genoud [Mon, 3 Dec 2012 06:28:28 +0000 (06:28 +0000)]
cmd_time: merge run_command_and_time_it with cmd_process

As far as every arch has a get_timer function,
run_command_and_time_it code can now disappear.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Acked-By: Che-Liang Chiou <clchiou@chromium.org>
[trini: s/ulong/unsigned long/ in command.h portion]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoconsole: USB: KBD: Fix incorrect autoboot timeout
Jim Lin [Thu, 24 Jan 2013 01:05:55 +0000 (01:05 +0000)]
console: USB: KBD: Fix incorrect autoboot timeout

Autoboot timeout defined by CONFIG_BOOTDELAY will not be accurate if
CONFIG_USB_KEYBOARD and CONFIG_SYS_USB_EVENT_POLL are defined in
configuration file and when tstc() function for checking key pressed
takes longer time than 10 ms (e.g., 50 ms) to finish.

Signed-off-by: Jim Lin <jilin@nvidia.com>
11 years agoboard sc3: fix warning about nested comment
Jeroen Hofstee [Tue, 8 Jan 2013 13:35:53 +0000 (13:35 +0000)]
board sc3: fix warning about nested comment

cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
11 years agocommon: env_mmc: Use __weak annotation to simplify code
Fabio Estevam [Tue, 8 Jan 2013 05:36:11 +0000 (05:36 +0000)]
common: env_mmc: Use __weak annotation to simplify code

Using the __weak annotation can make the code cleaner.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agocommon/cmd_bootm.c: prevent running of subcommands before 'bootm start'
Gabor Juhos [Sun, 6 Jan 2013 23:04:25 +0000 (23:04 +0000)]
common/cmd_bootm.c: prevent running of subcommands before 'bootm start'

The execution order of the bootm subcommands is fixed.
Although here is a sanity check in the state machine
which should prevent running the subcommands in wrong
order but it does not catch all possible errors.

It is possible to run any subcommand without running
'bootm start' first which leads to unexpected behaviour.
For example, running 'bootm loados' without 'bootm start'
causes a hang:

    U-Boot> bootm loados
       XIP Invalid Image ... OK
    OK

Add a sanity check to 'do_bootm_subcommand' in order
to ensure that no subcommands can be executed before
'bootm start'.

After the patch running of any subcommand without running
'bootm start' will cause an error like this:

    U-Boot> bootm loados
    Trying to execute a command out of order
    bootm - boot application image from memory

    Usage:
    bootm [addr [arg ...]]
        - boot application image stored in memory
    ...

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
11 years agodrivers/block/systemace - fixed data type in "systemace_read" to match prototype...
Alexey Brodkin [Thu, 3 Jan 2013 01:02:46 +0000 (01:02 +0000)]
drivers/block/systemace - fixed data type in "systemace_read" to match prototype in "block_dev_desc_t"

Currently we have "unsigned long blkcnt" which is fine with
CONFIG_SYS_64BIT_LBA undefined because "lbaint_t" is basically the same
"unsigned long".
If CONFIG_SYS_64BIT_LBA gets defined "lbaint_t" is defined as "unsigned
long long".

Even though not many embedded systems have CONFIG_SYS_64BIT_LBA defined
it's good to have types in function implementation that match exactly
with prototypes.

Signed-off-by: Alexey Brodkin <alexey.brodkin@gmail.com>
11 years agoFAT: remove ifdefs to make the code more readable
Richard Genoud [Thu, 13 Dec 2012 03:30:10 +0000 (03:30 +0000)]
FAT: remove ifdefs to make the code more readable

ifdefs in the code are making it harder to read.
The use of simple if(vfat_enabled) makes no more code and is cleaner.
(the code is discarded by the compiler instead of the preprocessor.)
NB: if -O0 is used, the code won't be discarded

and bonus, now the code compiles even if CONFIG_SUPPORT_VFAT is not
defined.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
11 years agoFAT: use toupper/tolower instead of recoding them
Richard Genoud [Thu, 13 Dec 2012 00:47:36 +0000 (00:47 +0000)]
FAT: use toupper/tolower instead of recoding them

toupper/tolower function are already declared, so use them.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agoconfigs:Remove unused macro CONFIG_DISCOVER_PHY
Ashok [Wed, 7 Nov 2012 07:39:29 +0000 (07:39 +0000)]
configs:Remove unused macro CONFIG_DISCOVER_PHY

Remove unused macro CONFIG_DISCOVER_PHY from configs.

Signed-off-by: Ashok Kumar Reddy <ashokkourla2000@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agox86: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:27 +0000 (20:49 +0000)]
x86: Use generic global_data

Move x86 over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agosparc: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:26 +0000 (20:49 +0000)]
sparc: Use generic global_data

Move sparc over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agosh: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:25 +0000 (20:49 +0000)]
sh: Use generic global_data

Move sh over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agosandbox: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:24 +0000 (20:49 +0000)]
sandbox: Use generic global_data

Move sandbox over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopowerpc: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:23 +0000 (20:49 +0000)]
powerpc: Use generic global_data

Move powerpc over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoopenrisc: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:22 +0000 (20:49 +0000)]
openrisc: Use generic global_data

Move openrisc over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agonios2: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:21 +0000 (20:49 +0000)]
nios2: Use generic global_data

Move nios2 over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
11 years agonds32: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:20 +0000 (20:49 +0000)]
nds32: Use generic global_data

Move nds32 over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agomips: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:19 +0000 (20:49 +0000)]
mips: Use generic global_data

Move mips over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agomicroblaze: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:18 +0000 (20:49 +0000)]
microblaze: Use generic global_data

Move microblaze over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Michal Simek <monstr@monstr.eu>
11 years agom68k: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:17 +0000 (20:49 +0000)]
m68k: Use generic global_data

Move m68k over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoblackfin: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:16 +0000 (20:49 +0000)]
blackfin: Use generic global_data

Move blackfin over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoavr32: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:15 +0000 (20:49 +0000)]
avr32: Use generic global_data

Move avr32 over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Use generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:14 +0000 (20:49 +0000)]
arm: Use generic global_data

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoOnly use fb_base if we have a display
Simon Glass [Thu, 13 Dec 2012 20:49:13 +0000 (20:49 +0000)]
Only use fb_base if we have a display

The ideal of having a frame buffer when there isn't a display is not
that useful. Change the bdinfo command to expect this only when we
have an lcd or video display.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoAdd generic global_data
Simon Glass [Thu, 13 Dec 2012 20:49:12 +0000 (20:49 +0000)]
Add generic global_data

Add a generic global_data structure which all archs will eventually
use.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agosandbox: Move ram_buf to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:11 +0000 (20:49 +0000)]
sandbox: Move ram_buf to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoavr32: Move cpu_hz to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:10 +0000 (20:49 +0000)]
avr32: Move cpu_hz to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoavr32: Move stack_end to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:09 +0000 (20:49 +0000)]
avr32: Move stack_end to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agomips: Move per_clk and dev_clk to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:08 +0000 (20:49 +0000)]
mips: Move per_clk and dev_clk to arch_global_data

Move these field into arch_global_data and tidy up. The other
CONFIG_JZSOC fields are used by various architectures, so just remove
the #ifdef bracketing for these.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agom68k: Move CONFIG_EXTRA_CLOCK to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:07 +0000 (20:49 +0000)]
m68k: Move CONFIG_EXTRA_CLOCK to arch_global_data

Move inp_clk, vco_clk and flb_clk into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agosparc: Drop kbd_status and reset_status from global_data
Simon Glass [Thu, 13 Dec 2012 20:49:06 +0000 (20:49 +0000)]
sparc: Drop kbd_status and reset_status from global_data

These fields is not used on sparc, so punt them.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: arm: Move sdhc_clk into arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:05 +0000 (20:49 +0000)]
ppc: arm: Move sdhc_clk into arch_global_data

This is used by both powerpc and arm, but I think it still qualifies as
architecture-specific.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move kbd_status to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:04 +0000 (20:49 +0000)]
ppc: Move kbd_status to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move wdt_last to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:03 +0000 (20:49 +0000)]
ppc: Move wdt_last to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move fpga_state to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:02 +0000 (20:49 +0000)]
ppc: Move fpga_state to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Remove console_addr from global data
Simon Glass [Thu, 13 Dec 2012 20:49:01 +0000 (20:49 +0000)]
ppc: Remove console_addr from global data

This does not appear to be used, so punt it.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move mirror_hack to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:49:00 +0000 (20:49 +0000)]
ppc: Move mirror_hack to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Move uart_clk to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:59 +0000 (20:48 +0000)]
arm: Move uart_clk to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move dp_alloc_base, dp_alloc_top to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:58 +0000 (20:48 +0000)]
ppc: Move dp_alloc_base, dp_alloc_top to arch_global_data

Move these fields into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move arbiter fields to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:57 +0000 (20:48 +0000)]
ppc: Move arbiter fields to arch_global_data

Move arbiter_event_attributes and arbiter_event_address into
arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move reset_status to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:56 +0000 (20:48 +0000)]
ppc: Move reset_status to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move mpc8220 clocks to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:55 +0000 (20:48 +0000)]
ppc: Move mpc8220 clocks to arch_global_data

Move these fields into arch_global_data and tidy up. The bExtUart field
does not appear to be used, so punt it.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move mpc512x clocks to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:54 +0000 (20:48 +0000)]
ppc: Move mpc512x clocks to arch_global_data

Move ips_clk and csb_clk into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move mpc5xxx clocks to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:53 +0000 (20:48 +0000)]
ppc: Move mpc5xxx clocks to arch_global_data

Move ipb_clk and pci_clk into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move used_tlb_cams to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:52 +0000 (20:48 +0000)]
ppc: Move used_tlb_cams to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move used_laws to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:51 +0000 (20:48 +0000)]
ppc: Move used_laws to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move CONFIG_QE to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:50 +0000 (20:48 +0000)]
ppc: Move CONFIG_QE to arch_global_data

Move the quantative easing fields into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: m68k: Move i2c1_clk, i2c2_clk to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:49 +0000 (20:48 +0000)]
ppc: m68k: Move i2c1_clk, i2c2_clk to arch_global_data

Move these fields into arch_global_data and tidy up. This is needed for
both ppc and m68k since they share the i2c driver.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move lbc_clk and cpu to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:48 +0000 (20:48 +0000)]
ppc: Move lbc_clk and cpu to arch_global_data

Move these fields into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Update for bsc9132qds.c, b4860qds.c]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agomicroblaze: Remove FSL support from generic board
Michal Simek [Wed, 23 Jan 2013 13:18:25 +0000 (14:18 +0100)]
microblaze: Remove FSL support from generic board

This code was targetting one specific Microblaze platform
configuration which is obsolete and fsl bus isn't used
in this way.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agocommon: cmd_bdinfo: Fix compilation warning for microblaze
Michal Simek [Wed, 23 Jan 2013 13:15:35 +0000 (14:15 +0100)]
common: cmd_bdinfo: Fix compilation warning for microblaze

Fix one printf compilation warning in microblaze bdinfo part.

Warning log:
cmd_bdinfo.c: In function 'do_bdinfo':
cmd_bdinfo.c:219:2: warning: format '%u' expects argument of type
'unsigned int', but argument 2 has type 'long unsigned int' [-Wformat]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agoboard: xilinx: Remove common folder
Michal Simek [Wed, 23 Jan 2013 13:11:50 +0000 (14:11 +0100)]
board: xilinx: Remove common folder

All these files was used for ancient xilinx drivers
which are finally gone.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Rommel Custodio <sessyargc@gmail.com>
11 years agoboard: xilinx: Remove unused ancient i2c driver
Michal Simek [Wed, 23 Jan 2013 13:09:35 +0000 (14:09 +0100)]
board: xilinx: Remove unused ancient i2c driver

There is new driver in the driver folder.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Rommel Custodio <sessyargc@gmail.com>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agospi: xilinx_spi: Perform software reset during slave setup
Jason Wu [Fri, 23 Nov 2012 05:05:08 +0000 (15:05 +1000)]
spi: xilinx_spi: Perform software reset during slave setup

to make sure it is in the clear state.

Signed-off-by: Jason Wu <huanyu@xilinx.com>
11 years agocommon: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM
Michal Simek [Wed, 23 Jan 2013 11:21:18 +0000 (12:21 +0100)]
common: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM

- Show all ethernet MACs in the system.
- Show current ethernet device

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agomicroblaze: Add muldi3.c which contains routines for _muldi3
David Holsgrove [Tue, 6 Nov 2012 13:01:24 +0000 (23:01 +1000)]
microblaze: Add muldi3.c which contains routines for _muldi3

Referenced arch/blackfin/lib/muldi3.c and the linux kernel.
Resolves issue seen when building u-boot for HW_MUL=0;

PLATFORM_CPPFLAGS += -mxl-soft-mul
PLATFORM_CPPFLAGS += -mno-xl-multiply-high

which resulted in error while linking to libgcc.a without mul hw (bs / m);

libgcc.a(_muldi3.o): In function `__muldi3':
.... src/gcc-4.6.2/libgcc/libgcc2.c:550: undefined reference to `_GLOBAL_OFFSET_TABLE_'

This link failure would not occur if we used gcc instead of ld directly, as
gcc will correctly use the crt's to resolve this link.

Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agoblock: systemace: Added missing "else" in "ace_writew"
Alexey Brodkin [Thu, 3 Jan 2013 09:35:23 +0000 (13:35 +0400)]
block: systemace: Added missing "else" in "ace_writew"

System ACE compact flash controller supports either 8-bit (default) or
16-bit data transfers. And in corresponding driver we need to implement
read/write of 16-bit data words properly for both modes of operation.

In existing code if width==8 both branches get executed which may cause
unexpected behavior of SystemAce controller.

Addition of "else" fixes described issue and execution is done as
expected for both (8-bit and 16-bit) data bus widths.

Signed-off-by: Alexey Brodkin <alexey.brodkin@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agoppc: Move mpc83xx clock fields to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:47 +0000 (20:48 +0000)]
ppc: Move mpc83xx clock fields to arch_global_data

Move al mpc83xx fields into arch_global_data and tidy up. Also indent
the nested #ifdef for clarity.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move clock fields to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:46 +0000 (20:48 +0000)]
ppc: Move clock fields to arch_global_data

Move vco_out, cpm_clk, scc_clk, brg_clk into arch_global_data and tidy
up. Leave pci_clk on its own since this should really depend only on
CONFIG_PCI and not any particular chip type.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Remove extra pci_clk fields from global_data
Simon Glass [Thu, 13 Dec 2012 20:48:45 +0000 (20:48 +0000)]
ppc: Remove extra pci_clk fields from global_data

PPC has several of these fields, selected by chip type, although only one
is ever compiled in.

Instead, use a single field. It would be nice if this could be selected
by CONFIG_PCI, but some chips (e.g. mpc5xxx) use pci_clk even when
CONFIG_PCI is not enabled.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoppc: Move brg_clk to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:44 +0000 (20:48 +0000)]
ppc: Move brg_clk to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agox86: Remove reset_status, relocoff from global_data
Simon Glass [Thu, 13 Dec 2012 20:48:43 +0000 (20:48 +0000)]
x86: Remove reset_status, relocoff from global_data

These fields are not used on x86, so punt them.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agox86: Move gd_addr into arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:41 +0000 (20:48 +0000)]
x86: Move gd_addr into arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Add arch/x86/cpu/cpu.c changes after Graeme's comments]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agox86: Set up the global data pointer in C instead of asm
Simon Glass [Thu, 13 Dec 2012 20:48:42 +0000 (20:48 +0000)]
x86: Set up the global data pointer in C instead of asm

We currently assume that the global data pointer is at the start of
struct global_data. We want to remove this restriction, and it is
easiest to do this in C.

Remove the asm code and add equivalent code in C.

This idea was proposed by Graeme Russ here:
   http://patchwork.ozlabs.org/patch/199741/

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Apply Graeme Russ' comments
http://patchwork.ozlabs.org/patch/206305/ here, re-order]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agox86: Remove gdt_addr from arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:40 +0000 (20:48 +0000)]
x86: Remove gdt_addr from arch_global_data

Remove this unused field.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Move tlb_addr and tlb_size to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:39 +0000 (20:48 +0000)]
arm: Move tlb_addr and tlb_size to arch_global_data

Move these fields into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Address tlb_size in this patch as well]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agonds32: Drop tlb_addr from global data
Simon Glass [Thu, 13 Dec 2012 20:48:38 +0000 (20:48 +0000)]
nds32: Drop tlb_addr from global data

This field doesn't appear to be used for anything important, so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoixp: Move timestamp to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:37 +0000 (20:48 +0000)]
ixp: Move timestamp to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Move timer_reset_value to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:36 +0000 (20:48 +0000)]
arm: Move timer_reset_value to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Move lastinc to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:35 +0000 (20:48 +0000)]
arm: Move lastinc to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Move tbl to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:34 +0000 (20:48 +0000)]
arm: Move tbl to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Move tbu to arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:33 +0000 (20:48 +0000)]
arm: Move tbu to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoarm: Move timer_rate_hz into arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:32 +0000 (20:48 +0000)]
arm: Move timer_rate_hz into arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoat91: Move at91 global data into arch_global_data
Simon Glass [Thu, 13 Dec 2012 20:48:31 +0000 (20:48 +0000)]
at91: Move at91 global data into arch_global_data

Move these fields into arch_global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoAdd architecture-specific global data
Simon Glass [Thu, 13 Dec 2012 20:48:30 +0000 (20:48 +0000)]
Add architecture-specific global data

We plan to move architecture-specific data into a separate structure so
that we can make the rest of it common.

As a first step, create struct arch_global_data to hold these fields.
Initially it is empty.

This patch applies to all archs at once. I can split it if this is really
a pain.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agovfat: Fix mkcksum argument sizes
Marek Vasut [Fri, 11 Jan 2013 03:35:48 +0000 (03:35 +0000)]
vfat: Fix mkcksum argument sizes

In case a function argument is known/fixed size array in C, the argument is
still decoyed as pointer instead ( T f(U n[k]) ~= T fn(U *n) ) and therefore
calling sizeof on the function argument will result in the size of the pointer,
not the size of the array.

The VFAT code contains such a bug, this patch fixes it.

Reported-by: Aaron Williams <Aaron.Williams@cavium.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <tom.rini@gmail.com>
Cc: Aaron Williams <Aaron.Williams@cavium.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoarm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
Lucas Stach [Tue, 22 Jan 2013 00:15:49 +0000 (00:15 +0000)]
arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

No one expects to end up in a delayed environment if
CONFIG_DELAY_ENVIRONMENT isn't defined.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Allen Martin <amartin@nvidia.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Tom Rini [Thu, 31 Jan 2013 00:26:38 +0000 (19:26 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

11 years agoMIPS: qi_lb60: remove custom u-boot.lds script
Gabor Juhos [Wed, 30 Jan 2013 04:31:58 +0000 (04:31 +0000)]
MIPS: qi_lb60: remove custom u-boot.lds script

Remove the board specific linker script. It is not
needed anymore, the unified MIPS linker script can
be used instead.

The qi_lb60 target produces a slightly different
image after the change than before. The value of
'num_got_entries' symbol is different:

    @@ -49,7 +49,7 @@
     801000b4:      80122d00        lb      s2,11520(zero)
     801000b8:      80123500        lb      s2,13568(zero)
     801000bc:      80123ef8        lb      s2,16120(zero)
    -801000c0:      00000139        0x139
    +801000c0:      00000136        tne     zero,zero,0x4

     801000c4 <in_ram>:
     801000c4:      8d0bfffc        lw      t3,-4(t0)

This is caused by the different placement of the
'__got_start' and '__got_end' symbols between the
board specific scrip and the unified script.

  board specific script:

        __got_start = .;
        .got  : { *(.got) }
        __got_end = .;

  unified script:
        .got  : {
                __got_start = .;
                *(.got)
                __got_end = .;
        }

Despite this difference, the resulting images are
functionally identical.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
11 years agoMIPS: dbau1x00: remove custom u-boot.lds script
Gabor Juhos [Wed, 30 Jan 2013 04:31:57 +0000 (04:31 +0000)]
MIPS: dbau1x00: remove custom u-boot.lds script

Remove the board specific linker script. It is not
needed anymore, the unified MIPS linker script can
be used instead.

All dbau1x00 targets are producing identical binary
images after the change than before.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
11 years agoMIPS: incaip: remove custom u-boot.lds script
Gabor Juhos [Wed, 30 Jan 2013 04:31:56 +0000 (04:31 +0000)]
MIPS: incaip: remove custom u-boot.lds script

Remove the board specific linker script. It is not
needed anymore, the unified MIPS linker script can
be used instead.

All incaip targets are producing identical binary
images after the change than before.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Wolfgang Denk <wd@denx.de>
11 years agoMIPS: vct: remove custom u-boot.lds script
Gabor Juhos [Wed, 30 Jan 2013 04:31:55 +0000 (04:31 +0000)]
MIPS: vct: remove custom u-boot.lds script

Remove the board specific linker script. It is not
needed anymore, the unified MIPS linker script can
be used instead.

All vct targets are producing identical binary
images after the change than before.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
11 years agoMIPS: pb1x00: remove custom u-boot.lds script
Gabor Juhos [Wed, 30 Jan 2013 04:31:54 +0000 (04:31 +0000)]
MIPS: pb1x00: remove custom u-boot.lds script

Remove the board specific linker script. It is not
needed anymore, the unified MIPS linker script can
be used instead.

All pb1x00 targets are producing identical binary
images after the change than before.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
11 years agoMIPS: qemu-mips: use the unified u-boot.lds script
Gabor Juhos [Wed, 30 Jan 2013 04:31:53 +0000 (04:31 +0000)]
MIPS: qemu-mips: use the unified u-boot.lds script

Remove the board specific linker script. It is not
needed anymore, the unified MIPS linker script can
be used instead.

All qemu_mips targets are producing identical binary
images after the change than before.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
11 years agoMIPS: add unified u-boot.lds file
Gabor Juhos [Wed, 30 Jan 2013 04:31:52 +0000 (04:31 +0000)]
MIPS: add unified u-boot.lds file

The patch adds an unified linker script file which
can be used for all currently supported MIPS targets.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
Acked-by: Stefan Roese <sr@denx.de>
11 years agoMIPS: remove OUTPUT_FORMAT from linker scripts
Gabor Juhos [Wed, 30 Jan 2013 02:22:51 +0000 (02:22 +0000)]
MIPS: remove OUTPUT_FORMAT from linker scripts

The OUTPUT_FORMAT command in linker scripts
was always misused due to some endianess and
toolchain problems.

Use GCC flags to ensure proper output format,
and get rid of the OUTPUT_FORMAT commands in
the board specific u-boot.lds files.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
11 years agoMIPS: xburst: simplify relocation offset calculation
Gabor Juhos [Wed, 30 Jan 2013 04:51:06 +0000 (04:51 +0000)]
MIPS: xburst: simplify relocation offset calculation

The current code uses four instructions and a
temporary register to calculate the relocation
offset and to adjust the gp register.

The relocation offset can be calculated directly
from the CONFIG_SYS_MONITOR_BASE constant and from
the destination address. The resulting offset can
be used to adjust the gp pointer.

This approach makes the code a bit simpler because
it needs two instructions only.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
11 years agoMIPS: simplify relocated _G_O_T_ address calculation
Gabor Juhos [Wed, 30 Jan 2013 04:56:37 +0000 (04:56 +0000)]
MIPS: simplify relocated _G_O_T_ address calculation

The difference between the address of the original
and the relocated _GLOBAL_OFFSET_TABLE_ is always
the same as the relocation offset.

The relocation offset is already computed and it is
available in the 's1/t6' register. Use that to adjust
the relocated _G_O_T_ address, instead of calculating
the offset again from the _gp value.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
11 years agocorenet: Disable video on P2020DS
Andy Fleming [Thu, 24 Jan 2013 07:55:11 +0000 (01:55 -0600)]
corenet: Disable video on P2020DS

The P2020DS build had grown too large, and video support isn't enabled
in almost any other Freescale board. Disabling it allows us to keep
building, and provides options for reenabling it later.

Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agoboard/common: Add support for QIXIS read/write using i2c
Prabhakar Kushwaha [Wed, 23 Jan 2013 17:59:37 +0000 (17:59 +0000)]
board/common: Add support for QIXIS read/write using i2c

QIXIS FPGA is accessable via both i2c and flash controller.
Only flash controller access is supported.

Add support of i2c based access. It is quite useful in the scenario
where either flash controller path is broken or not present.

Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agopowerpc/t4240: Adding workaround errata A-005871
Shengzhou Liu [Wed, 23 Jan 2013 19:56:23 +0000 (19:56 +0000)]
powerpc/t4240: Adding workaround errata A-005871

When CoreNet Fabric (CCF) internal resources are consumed by the cores,
inbound SRIO messaging traffic through RMan can put the device into a
deadlock condition.

This errata workaround forces internal resources to be reserved for
upstream transactions. This ensures resources exist on the device for
upstream transactions and removes the deadlock condition.

The Workaround is for the T4240 silicon rev 1.0.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agopowerpc/mpc85xx: Add property 'fsl, sec-era' in device tree node 'crypto'
Vakul Garg [Wed, 23 Jan 2013 22:52:31 +0000 (22:52 +0000)]
powerpc/mpc85xx: Add property 'fsl, sec-era' in device tree node 'crypto'

If property 'fsl,sec-era' is already present, it is updated.
This property is required so that applications can ascertain which
descriptor commands are supported on a particular CAAM version.

Signed-off-by: Vakul Garg <vakul@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agompc8xxx: fix DDR init value to use CONFIG_MEM_INIT_VALUE
Anatolij Gustschin [Mon, 21 Jan 2013 23:50:27 +0000 (23:50 +0000)]
mpc8xxx: fix DDR init value to use CONFIG_MEM_INIT_VALUE

Configuring custom memory init value using CONFIG_MEM_INIT_VALUE in
the board config file doesn't work and memory is always initialized
to the value 0xdeadbeef. Only use this default value if a board doesn't
define CONFIG_MEM_INIT_VALUE.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agopowerpc/mpc85xx: add support for MMUv2 page sizes
Scott Wood [Fri, 18 Jan 2013 15:45:58 +0000 (15:45 +0000)]
powerpc/mpc85xx: add support for MMUv2 page sizes

e6500 implements MMUv2 and supports power-of-2 page sizes rather than
power-of-4.  Add support for such pages.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agopowerpc/85xx: Add BSC9132QDS support
Prabhakar Kushwaha [Mon, 14 Jan 2013 18:26:57 +0000 (18:26 +0000)]
powerpc/85xx: Add BSC9132QDS support

BSC9132QDS is a Freescale reference design board for BSC9132 SoC.
BSC9132 SOC is an integrated device that targets the evolving Microcell,
Picocell, and Enterprise-Femto base station market subsegments.
It combines Power Architecture e500v2 and DSP StarCore SC3850 core
technologies with MAPLE-B2F baseband acceleration processing elements.

BSC9132QDS Overview
 --------------------
  2Gbyte DDR3 (on board DDR), Dual Ranki
  32Mbyte 16bit NOR flash
  128Mbyte 2K page size NAND Flash
  256 Kbit M24256 I2C EEPROM
  128 Mbit SPI Flash memory
  SD slot
  USB-ULPI
  eTSEC1: Connected to SGMII PHY
  eTSEC2: Connected to SGMII PHY
  PCIe
  CPRI
  SerDes
  I2C RTC
  DUART interface: supports one UARTs up to 115200 bps for console display

Apart from the above it also consists various peripherals to support DSP
functionalities.

This patch adds support for mainly Power side functionalities and peripherals

Signed-off-by: Naveen Burmi <NaveenBurmi@freescale.com>
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agopowerpc/mpc85xx: Add BSC9132/BSC9232 processor support
Prabhakar Kushwaha [Wed, 23 Jan 2013 17:59:57 +0000 (17:59 +0000)]
powerpc/mpc85xx: Add BSC9132/BSC9232 processor support

The BSC9132 is a highly integrated device that targets the evolving
 Microcell, Picocell, and Enterprise-Femto base station market subsegments.

 The BSC9132 device combines Power Architecture e500 and DSP StarCore SC3850
 core technologies with MAPLE-B2P baseband acceleration processing elements
 to address the need for a high performance, low cost, integrated solution
 that handles all required processing layers without the need for an
 external device except for an RF transceiver or, in a Micro base station
 configuration, a host device that handles the L3/L4 and handover between
 sectors.

 The BSC9132 SoC includes the following function and features:
    - Power Architecture subsystem including two e500 processors with
512-Kbyte shared L2 cache
    - Two StarCore SC3850 DSP subsystems, each with a 512-Kbyte private L2
cache
    - 32 Kbyte of shared M3 memory
    - The Multi Accelerator Platform Engine for Pico BaseStation Baseband
      Processing (MAPLE-B2P)
    - Two DDR3/3L memory interfaces with 32-bit data width (40 bits including
      ECC), up to 1333 MHz data rate
    - Dedicated security engine featuring trusted boot
    - Two DMA controllers
         - OCNDMA with four bidirectional channels
         - SysDMA with sixteen bidirectional channels
    - Interfaces
        - Four-lane SerDes PHY
    - PCI Express controller complies with the PEX Specification-Rev 2.0
        - Two Common Public Radio Interface (CPRI) controller lanes
    - High-speed USB 2.0 host and device controller with ULPI interface
        - Enhanced secure digital (SD/MMC) host controller (eSDHC)
    - Antenna interface controller (AIC), supporting four industry
standard JESD207/four custom ADI RF interfaces
       - ADI lanes support both full duplex FDD support & half duplex TDD
       - Universal Subscriber Identity Module (USIM) interface that
   facilitates communication to SIM cards or Eurochip pre-paid phone
   cards
       - Two DUART, two eSPI, and two I2C controllers
       - Integrated Flash memory controller (IFC)
       - GPIO
     - Sixteen 32-bit timers

Signed-off-by: Naveen Burmi <NaveenBurmi@freescale.com>
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>