]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-x86
Tom Rini [Mon, 4 Feb 2013 22:50:11 +0000 (17:50 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-x86

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://www.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 agopatman: Allow use outside of u-boot tree
Vadim Bendebury [Wed, 9 Jan 2013 16:00:10 +0000 (16:00 +0000)]
patman: Allow use outside of u-boot tree

To make it usable in git trees not providing a patch checker
implementation, add a command line option, allowing to suppress patch
check. While we are at it, sort debug options alphabetically.

Also, do not raise an exception if checkpatch.pl is not found - just
print an error message suggesting to use the new option, and return
nonzero status.

   . unit test passes:
    $ ./patman  -t
    <unittest.result.TestResult run=7 errors=0 failures=0>
   . successfully used patman in the autotest tree to generate a patch
     email (with --no-check option)
   . successfully used patman in the u-boot tree to generate a patch
     email
   . `patman --help' now shows command line options ordered
     alphabetically

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Acked-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Add settings to the list of modules to doctest
Doug Anderson [Mon, 3 Dec 2012 14:43:19 +0000 (14:43 +0000)]
patman: Add settings to the list of modules to doctest

The settings modules now has doctests, so run them.

Signed-off-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Add the concept of multiple projects
Doug Anderson [Mon, 3 Dec 2012 14:43:18 +0000 (14:43 +0000)]
patman: Add the concept of multiple projects

There are cases that we want to support different settings (or maybe
even different aliases) for different projects.  Add support for this
by:
* Adding detection for two big projects: U-Boot and Linux.
* Adding default settings for Linux (U-Boot is already good with the
  standard patman defaults).
* Extend the new "settings" feature in .patman to specify per-project
  settings.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Add support for settings in .patman
Doug Anderson [Mon, 3 Dec 2012 14:43:17 +0000 (14:43 +0000)]
patman: Add support for settings in .patman

This patch adds support for a [settings] section in the .patman file.
In this section you can add settings that will affect the default
values for command-line options.

Support is added in a generic way such that any setting can be updated
by just referring to the "dest" of the option that is passed to the
option parser.  At the moment options that would make sense to put in
settings are "ignore_errors", "process_tags", and "verbose".  You
could override them like:

 [settings]
 ignore_errors: True
 process_tags: False
 verbose: True

The settings functionality is also used in a future change which adds
support for per-project settings.

Signed-off-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Add a call to get_maintainer.pl if it exists
Doug Anderson [Mon, 3 Dec 2012 14:43:16 +0000 (14:43 +0000)]
patman: Add a call to get_maintainer.pl if it exists

For Linux the best way to figure out where to send a patch is with the
"get_maintainer.pl" script.  Add support for calling it from patman.
Support is added unconditionally for "scripts/get_maintainer.pl" in
case it is helpful for any other projects.

Signed-off-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Add all CC addresses to the cover letter
Doug Anderson [Mon, 3 Dec 2012 14:40:43 +0000 (14:40 +0000)]
patman: Add all CC addresses to the cover letter

If we're sending a cover letter make sure to CC everyone that we're
CCing on each of the individual patches.

Signed-off-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Cache the CC list from MakeCcFile() for use in ShowActions()
Doug Anderson [Mon, 3 Dec 2012 14:40:42 +0000 (14:40 +0000)]
patman: Cache the CC list from MakeCcFile() for use in ShowActions()

Currently we go through and generate the CC list for patches twice.
This gets slow when (in a future CL) we add a call to
get_maintainer.pl on Linux.  Instead of doing things twice, just cache
the CC list when it is first generated.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Look for checkpatch in the scripts directory
Doug Anderson [Mon, 26 Nov 2012 15:23:23 +0000 (15:23 +0000)]
patman: Look for checkpatch in the scripts directory

The Linux kernel stores checkpatch.pl in the scripts directory.  Add
that to the search path to make things more automatic for kernel
development.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Allow tests to run even if patman is in the path
Doug Anderson [Mon, 26 Nov 2012 15:21:40 +0000 (15:21 +0000)]
patman: Allow tests to run even if patman is in the path

Several of the patman doctests assume that patman was run with:
  ./patman

Fix them so that they work even if patman is run with just "patman"
(because patman is in the path).

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Add spaces back into patman test
Doug Anderson [Mon, 26 Nov 2012 15:21:39 +0000 (15:21 +0000)]
patman: Add spaces back into patman test

The patman test code was failing because some extra spaces got
stripped when it was applied.  These spaces are critical to the test
code working.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-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>