oweals/u-boot.git
12 years agotools/env: allow overwrite of ethaddr on default
Grant Erickson [Thu, 22 Dec 2011 08:59:55 +0000 (08:59 +0000)]
tools/env: allow overwrite of ethaddr on default

This patch allows the U-Boot user space companion utility, fw_setenv,
to overwrite the 'ethaddr' key/value pair if the current value is set
to a per-board-configured default.

This change allows 'fw_setenv' to match the behavior of 'setenv' /
'env set' on the U-Boot command line.

Signed-off-by: Grant Erickson <marathon96@gmail.com>
Fixed excessive white space.
Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Thu, 5 Jan 2012 15:38:50 +0000 (16:38 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  tegra2: Optimize out-of-tree build for Ventana.
  tegra: Move boards over to use arch-level board UART function
  tegra: Add support for UART init in cpu board.c
  tegra: Add a function mux feature
  tegra: add clock_ll_start_uart() to enable UART prior to reloc
  tegra: Move clock_early_init() to arch_cpu_init()
  tegra: Move cpu_init_cp15() to arch_cpu_init()
  arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master
  tegra: Fix build error in plutux, medcom
  tegra2: Add Avionic Design Medcom support.
  tegra2: Add Avionic Design Plutux support.
  tegra2: Add common Avionic Design Tamonten support.
  tegra2: Move tegra2_mmc_init() prototype to public header.
  tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000.
  tegra2: Always build with USE_PRIVATE_LIBGCC=yes.
  tegra2: Plumb in SPI/UART switch code
  tegra2: spi: Support SPI / UART switch
  tegra2: Implement SPI / UART GPIO switch
  tegra2: Enable SPI environment on Seaboard
  tegra2: config: Enable SPI flash on Seaboard
  tegra2: spi: Add SPI driver for Tegra2 SOC
  tegra2: Add UARTB support
  tegra2: Tidy UART selection
  arm, davinci: Fix build warnings for cam_enc_4xx
  Devkit8000: Switch over to enable_gpmc_cs_config
  arm, davinci: Add support for generating AIS images to the Makefile
  mkimage: Fix variable length header support
  arm, da850evm: Add an SPL for SPI boot
  arm, davinci: Add SPL support for DA850 SoCs
  sf: Add spi_boot() to allow booting from SPI flash in an SPL
  spl: display_options.o is required for SPI flash support in SPL
  ARM: omap3: add support to Technexion twister board
  ARM: omap3: added common configuration for Technexion TAM3517
  vision2: Fix checkpatch warning

12 years agotools/mkenvimage.c: Fix a merge issue
Horst Kronstorfer [Sat, 24 Dec 2011 00:41:58 +0000 (00:41 +0000)]
tools/mkenvimage.c: Fix a merge issue

With bfcc40bb09b05c90cc3b1496abb270eb8aa72134 'optopt' was reverted.

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agoenv: remove value from boolean defines
Igor Grinberg [Sun, 25 Dec 2011 01:42:57 +0000 (01:42 +0000)]
env: remove value from boolean defines

Several boolean defines have a value assigned.
Remove the value as defining the symbol is enough.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agocommon.h: remove value from bool defines
Igor Grinberg [Sun, 25 Dec 2011 20:53:52 +0000 (20:53 +0000)]
common.h: remove value from bool defines

Several boolean defines have a value assigned.
Remove the value as defining the symbol is enough.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoenv: factor out the env_get_char_spec() function
Igor Grinberg [Mon, 26 Dec 2011 03:33:10 +0000 (03:33 +0000)]
env: factor out the env_get_char_spec() function

env_get_char_spec() function is duplicated across multiple environment
files.
Remove the duplication by providing a default implementation.
Add "weak" declaration, so the default implementation can be overridden.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
12 years agofpga: Spartan-3: let print the progress if configured
Stefano Babic [Wed, 28 Dec 2011 06:47:02 +0000 (06:47 +0000)]
fpga: Spartan-3: let print the progress if configured

CONFIG_SYS_FPGA_PROG_FEEDBACK was already introduced to print
the current status of FPGA loading - an undef in the code made this
CONFIG_ useless.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoFPGA: use debug() instead of module debug printf
Stefano Babic [Wed, 28 Dec 2011 06:47:01 +0000 (06:47 +0000)]
FPGA: use debug() instead of module debug printf

Replace also __FUNCTION__ with standard __func__

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agofpga: add definition for Xilinx Spartan-6 XC6SLX4
Stefano Babic [Wed, 28 Dec 2011 06:47:00 +0000 (06:47 +0000)]
fpga: add definition for Xilinx Spartan-6 XC6SLX4

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agophy: add phy_smsc_init() declaration
Vladimir Zapolskiy [Thu, 29 Dec 2011 15:18:37 +0000 (15:18 +0000)]
phy: add phy_smsc_init() declaration

This trivial change removes a compilation warning:
  ----8<----
  phy.c: In function 'phy_init':
  phy.c:448:2: warning: implicit declaration of function 'phy_smsc_init'
  ----8<----

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agofw_env.h: added a few missing defines
Frans Meulenbroeks [Thu, 1 Dec 2011 03:30:04 +0000 (03:30 +0000)]
fw_env.h: added a few missing defines

The README file lists 4 defined that were not actually present in the .h
file but that were needed to get things working with settings compiled in.
They are
Added these to the .h file
(the values above are the ones from the README file)

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
12 years agofat: reset VFAT short alias checksum on first match
Sergei Shtylyov [Mon, 2 Jan 2012 06:54:29 +0000 (06:54 +0000)]
fat: reset VFAT short alias checksum on first match

The VFAT short alias checksum read from a long file name is only overwritten
when another long file name appears in a directory list. Until then it renders
short file names invisible that have the same checksum. Reset the checksum on
first match.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Martin Mueller <martin.mueller5@de.bosch.com>
12 years agogit-mailrc: Add self to davinci/omap, add ti
Tom Rini [Wed, 14 Dec 2011 06:15:16 +0000 (06:15 +0000)]
git-mailrc: Add self to davinci/omap, add ti

Adding a 'ti' alias since not all parts are "omap" or "davinci" and
adding myself to that alias as co-custodian of u-boot-ti

Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agotegra2: Optimize out-of-tree build for Ventana.
Thierry Reding [Wed, 21 Dec 2011 23:22:54 +0000 (23:22 +0000)]
tegra2: Optimize out-of-tree build for Ventana.

As proposed by Mike Frysinger, mkdir can take more than one argument.
Instead of spawning two processes, create both the common and seaboard
directories in one go.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra: Move boards over to use arch-level board UART function
Simon Glass [Mon, 28 Nov 2011 15:04:40 +0000 (15:04 +0000)]
tegra: Move boards over to use arch-level board UART function

Now that we can set up the UART in common tegra code, make the boards
use it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra: Add support for UART init in cpu board.c
Simon Glass [Mon, 28 Nov 2011 15:04:39 +0000 (15:04 +0000)]
tegra: Add support for UART init in cpu board.c

We add a way of initialising the selected of UARTs prior to relocation.
Boards can use the board_init_uart_f() instead of repeating this code
themselves.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra: Add a function mux feature
Simon Glass [Mon, 28 Nov 2011 15:04:38 +0000 (15:04 +0000)]
tegra: Add a function mux feature

funcmux permits selection of config options for particular peripherals,
such as the pins that are used for that peripheral, if there are several
options.

Add UART selection to start with.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra: add clock_ll_start_uart() to enable UART prior to reloc
Simon Glass [Mon, 28 Nov 2011 15:04:37 +0000 (15:04 +0000)]
tegra: add clock_ll_start_uart() to enable UART prior to reloc

Most boards will want to enable a UART early. This function provides
that feature in Tegra architecture code so the code does not need to be
copied on every board.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra: Move clock_early_init() to arch_cpu_init()
Simon Glass [Mon, 28 Nov 2011 15:04:36 +0000 (15:04 +0000)]
tegra: Move clock_early_init() to arch_cpu_init()

The clock init is not board specific, so move it into
the cpu code.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra: Move cpu_init_cp15() to arch_cpu_init()
Simon Glass [Mon, 28 Nov 2011 15:04:35 +0000 (15:04 +0000)]
tegra: Move cpu_init_cp15() to arch_cpu_init()

This call is more of an architecture requirement than a board
one, so move it there.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agoarm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master
Tom Warren [Mon, 19 Dec 2011 22:58:06 +0000 (15:58 -0700)]
arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master

Seaboard changes have removed the need for common/board.o in the
Makefile. Propagate this change to the other Tegra2 builds.

Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra: Fix build error in plutux, medcom
Simon Glass [Mon, 28 Nov 2011 15:04:41 +0000 (15:04 +0000)]
tegra: Fix build error in plutux, medcom

We need to define CONFIG_ENV_IS_NOWHERE to avoid this error:

cmd_nvedit.c:69:3: error: #error Define one of CONFIG_ENV_IS_IN_...

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Add Avionic Design Medcom support.
Thierry Reding [Thu, 17 Nov 2011 00:10:26 +0000 (00:10 +0000)]
tegra2: Add Avionic Design Medcom support.

The Medcom is a 16:9 15" terminal that is used for patient infotainment
in hospitals.

Changes in v3:
  * Remove unused implementation of gpio_config_uart().
  * Implement MMC/SD card detection.
  * Drop board_mmc_getcd() which is now implemented by common Tegra2
    code.
  * Add MAINTAINERS entry.

Changes in v2:
  * No longer override the default CONFIG_SYS_TEXT_BASE setting.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Add Avionic Design Plutux support.
Thierry Reding [Thu, 17 Nov 2011 00:10:25 +0000 (00:10 +0000)]
tegra2: Add Avionic Design Plutux support.

The Plutux is a set-top box device based on the Tamonten processor
module. It can be connected to a display via an HDMI output.

Changes in v3:
  * Remove unused implementation of gpio_config_uart().
  * Implement MMC/SD card detection.
  * Drop board_mmc_getcd() which is now implemented by common Tegra2
    code.
  * Add MAINTAINERS entry.

Changes in v2:
  * No longer override the default CONFIG_SYS_TEXT_BASE setting.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Add common Avionic Design Tamonten support.
Thierry Reding [Thu, 17 Nov 2011 00:10:24 +0000 (00:10 +0000)]
tegra2: Add common Avionic Design Tamonten support.

Tamonten is an NVIDIA Tegra2-based SO-DIMM processor module that is
derived from the Harmony reference design.

Changes in v3:
  * Remove unused gpio_config_uart().
  * Remove call to tegra2_start().
  * Use new tegra2_mmc_init().

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Move tegra2_mmc_init() prototype to public header.
Thierry Reding [Thu, 17 Nov 2011 00:10:23 +0000 (00:10 +0000)]
tegra2: Move tegra2_mmc_init() prototype to public header.

tegra2_mmc_init() is implemented by the Tegra2 MMC driver. Since most of
the Tegra2-based boards will need to call it, this commit exports it in
the new public asm/arch/mmc.h header file to prevent each board from
providing its own prototype.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000.
Thierry Reding [Thu, 17 Nov 2011 00:04:06 +0000 (00:04 +0000)]
tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000.

NVIDIA's flashing tools assume that the bootloader is loaded at address
0x00108000. Instead of requiring non-standard builds of those tools
which allow a load address of 0x00E08000, this commit just switches all
Tegra2 boards to use the standard load address.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Always build with USE_PRIVATE_LIBGCC=yes.
Thierry Reding [Thu, 17 Nov 2011 00:04:05 +0000 (00:04 +0000)]
tegra2: Always build with USE_PRIVATE_LIBGCC=yes.

The AVP on Tegra2 doesn't boot properly when U-Boot is linked against
the GCC provided libgcc. To work around this, always build and link
against a private libgcc for Tegra2-based boards.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Plumb in SPI/UART switch code
Simon Glass [Sat, 5 Nov 2011 04:46:51 +0000 (04:46 +0000)]
tegra2: Plumb in SPI/UART switch code

On Seaboard the UART and SPI interfere with each other. This causes the UART
to receive spurious zero bytes after SPI transactions and also means that
SPI can corrupt a few output characters when it starts up if they are still
in the UART buffer.

This updates the board to use the SPI/UART switch to avoid the problem.

For now this feature is turned off since it needs changes to the NS16550
UART to operate.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: spi: Support SPI / UART switch
Simon Glass [Sat, 5 Nov 2011 04:46:50 +0000 (04:46 +0000)]
tegra2: spi: Support SPI / UART switch

Add the SPI / UART switch logic into the Tegra2 SPI driver so that it
can co-exist with the NS16550 UART.

We need the ns16550.h header for NS16550_t for now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Implement SPI / UART GPIO switch
Simon Glass [Sat, 5 Nov 2011 04:46:49 +0000 (04:46 +0000)]
tegra2: Implement SPI / UART GPIO switch

The Tegra2 Seaboard has the unfortunate feature that SPI and the console
UART are multiplexed on the same pins. We need to switch between one
and the other during SPI and console activity.

This new file implements a switch and keeps track of which peripheral
owns the pins. It also flips over the controlling GPIO as needed

Since we are adding a second file to board/nvidia/common, we create
a proper Makefile there and remove the direct board.o include from
board/nvidia/seaboard/Makefile

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Enable SPI environment on Seaboard
Simon Glass [Sat, 5 Nov 2011 04:46:48 +0000 (04:46 +0000)]
tegra2: Enable SPI environment on Seaboard

This uses the SPI flash on Seaboard to store an 8KB environment.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: config: Enable SPI flash on Seaboard
Simon Glass [Sat, 5 Nov 2011 04:46:47 +0000 (04:46 +0000)]
tegra2: config: Enable SPI flash on Seaboard

The Seaboard includes a Winbond 4MB flash part.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: spi: Add SPI driver for Tegra2 SOC
Tom Warren [Sat, 5 Nov 2011 09:48:11 +0000 (09:48 +0000)]
tegra2: spi: Add SPI driver for Tegra2 SOC

This driver supports SPI on Tegra2, running at 48MHz.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agotegra2: Add UARTB support
Simon Glass [Sat, 5 Nov 2011 04:46:45 +0000 (04:46 +0000)]
tegra2: Add UARTB support

UARTB is used on some boards, so support it here.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agotegra2: Tidy UART selection
Simon Glass [Sat, 5 Nov 2011 04:46:44 +0000 (04:46 +0000)]
tegra2: Tidy UART selection

UART selection is done with a lot of #ifdefs. This cleans things up
a little.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agoarm, davinci: Fix build warnings for cam_enc_4xx
Christian Riesch [Wed, 14 Dec 2011 08:54:36 +0000 (09:54 +0100)]
arm, davinci: Fix build warnings for cam_enc_4xx

This patch fixes a build warning for the cam_enc_4xx board introduced by
commit d6ec0c0dfc70447cf615ae80a952da81f73f16b4:

spl.c:35:13: warning: 'gdata' defined but not used
spl.c:36:13: warning: 'bdata' defined but not used

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Tom Rini <trini@ti.com>
Cc: Heiko Schocher <hs@denx.de>
12 years agoDevkit8000: Switch over to enable_gpmc_cs_config
Thomas Weber [Tue, 13 Dec 2011 05:54:17 +0000 (05:54 +0000)]
Devkit8000: Switch over to enable_gpmc_cs_config

Use enable_gpmc_cs_config instead of local writing
timing configuration for GPMC.

Signed-off-by: Thomas Weber <weber@corscience.de>
12 years agoarm, davinci: Add support for generating AIS images to the Makefile
Christian Riesch [Fri, 9 Dec 2011 09:47:39 +0000 (09:47 +0000)]
arm, davinci: Add support for generating AIS images to the Makefile

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
12 years agomkimage: Fix variable length header support
Christian Riesch [Fri, 9 Dec 2011 09:47:38 +0000 (09:47 +0000)]
mkimage: Fix variable length header support

Support for variable length images like AIS image was introduced
in commit f0662105b674a3874227316abf8536bebc9b5995. A parameter
"-s" was also introduced to prohibit copying of the image file
automatically in the main program. However, this parameter
was implemented incorrectly and the image file was copied
nevertheless.

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoarm, da850evm: Add an SPL for SPI boot
Christian Riesch [Fri, 9 Dec 2011 09:47:37 +0000 (09:47 +0000)]
arm, da850evm: Add an SPL for SPI boot

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Heiko Schocher <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Tom Rini <trini@ti.com>
Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
12 years agoarm, davinci: Add SPL support for DA850 SoCs
Christian Riesch [Fri, 9 Dec 2011 09:47:36 +0000 (09:47 +0000)]
arm, davinci: Add SPL support for DA850 SoCs

This code adds an SPL for booting from SPI flash on DA850 SoCs.

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Heiko Schocher <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Tom Rini <trini@ti.com>
Acked-by: Tom Rini <trini@ti.com>
12 years agosf: Add spi_boot() to allow booting from SPI flash in an SPL
Christian Riesch [Fri, 9 Dec 2011 09:47:35 +0000 (09:47 +0000)]
sf: Add spi_boot() to allow booting from SPI flash in an SPL

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Heiko Schocher <hs@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Scott Wood <scottwood@freescale.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agospl: display_options.o is required for SPI flash support in SPL
Christian Riesch [Fri, 9 Dec 2011 09:47:34 +0000 (09:47 +0000)]
spl: display_options.o is required for SPI flash support in SPL

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Heiko Schocher <hs@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
12 years agoARM: omap3: add support to Technexion twister board
Stefano Babic [Wed, 30 Nov 2011 23:56:53 +0000 (23:56 +0000)]
ARM: omap3: add support to Technexion twister board

The twister board is a development board using
the TAM3517 SOM.

Support for NAND, 2 Ethernet (EMAC and SMC911),
USB (EHCI_OMAP).

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Tapani Utrianen <tapani@technexion.com>
CC: Tom Rini <tom.rini@gmail.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoARM: omap3: added common configuration for Technexion TAM3517
Stefano Babic [Wed, 30 Nov 2011 23:56:52 +0000 (23:56 +0000)]
ARM: omap3: added common configuration for Technexion TAM3517

The TAM3517 is a SOM module that can be used on custom boards.
The patch add a common configuration file that is included
by the boards using this module.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Tapani Utrianen <tapani@technexion.com>
CC: Tom Rini <tom.rini@gmail.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>
12 years agovision2: Fix checkpatch warning
Fabio Estevam [Mon, 21 Nov 2011 05:57:39 +0000 (05:57 +0000)]
vision2: Fix checkpatch warning

Fix the following checkpatch warning:

WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoMerge branch 'next' of ../next
Wolfgang Denk [Fri, 23 Dec 2011 19:53:58 +0000 (20:53 +0100)]
Merge branch 'next' of ../next

* 'next' of ../next:
  mkenvimage: Add version info switch (-V)
  mkenvimage: Fix getopt() error handling
  mkenvimage: Fix some typos
  phy: add Micrel KS8721BL phy definition
  net: introduce per device index
  mvgbe: remove setting of ethaddr within the driver
  x86: Add support for specifying an initrd with the zboot command
  x86: Refactor the zboot innards so they can be reused with a vboot image
  x86: Add infrastructure to extract an e820 table from the coreboot tables
  x86: Add support for booting Linux using the 32 bit boot protocol
  x86: Clean up the x86 zimage code in preparation to extend it
  x86: Import code from coreboot's libpayload to parse the coreboot table
  x86: Initial commit for running as a coreboot payload
  CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c
  CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/hh405/fpgadata.c
  CHECKPATCH: ./board/esd/pci405/fpgadata.c
  CHECKPATCH: ./board/esd/tasreg/fpgadata.c
  CHECKPATCH: ./board/esd/apc405/fpgadata.c
  CHECKPATCH: ./board/esd/voh405/fpgadata.c
  CHECKPATCH: ./board/esd/ash405/fpgadata.c
  CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c
  CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c
  CHECKPATCH: ./board/esd/ar405/fpgadata.c
  CHECKPATCH: ./board/esd/plu405/fpgadata.c
  CHECKPATCH: ./board/esd/wuh405/fpgadata.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c
  CHECKPATCH: ./board/esd/canbt/fpgadata.c
  CHECKPATCH: ./board/esd/du405/fpgadata.c
  CHECKPATCH: ./board/esd/cpciiser4/fpgadata.c
  CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c
  avr32:mmu.c: fix printf() length modifier
  fat.c: fix printf() length modifier
  cmd_sf.c: fix printf() length modifier
  Make printf and vprintf safe from buffer overruns
  vsprintf: Move function documentation into header file
  Add safe vsnprintf and snprintf library functions
  Move vsprintf functions into their own header

Conflicts:
tools/mkenvimage.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoPrepare v2011.12 v2011.12
Wolfgang Denk [Fri, 23 Dec 2011 19:25:35 +0000 (20:25 +0100)]
Prepare v2011.12

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agodoc/mkimage.1: Fix -D/-f options formatting
Horst Kronstorfer [Fri, 23 Dec 2011 05:40:20 +0000 (05:40 +0000)]
doc/mkimage.1: Fix -D/-f options formatting

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agopost/lib_powerpc/multi.c: fix stack overflow error
Wolfgang Denk [Fri, 23 Dec 2011 01:29:12 +0000 (01:29 +0000)]
post/lib_powerpc/multi.c: fix stack overflow error

The code and comment disagreed: the comment claimed that r6...r31
were copied, and consequently the arrays for "src" and "dst" were
declared with 26 entries, but the actual code ("lmw r5,0(r3)" and
"stmw r5,0(r4)") copied _27_ words (r5 through r31), which resulted
in false "POST cpu Error at multi test" messages.

Fix the comment and the array sizes.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
Tested-by: Anatolij Gustschin <agust@denx.de>
12 years agopost/lib_powerpc/multi.c: code cleanup
Wolfgang Denk [Fri, 23 Dec 2011 01:29:11 +0000 (01:29 +0000)]
post/lib_powerpc/multi.c: code cleanup

Clean up and document the code:

- get rid of unneeded code block
- add comment which code is generated

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agopost/lib_powerpc/multi.c: make checkpatch clean
Wolfgang Denk [Fri, 23 Dec 2011 01:29:10 +0000 (01:29 +0000)]
post/lib_powerpc/multi.c: make checkpatch clean

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoPPC: fix "Warning: FOO uses hard float, BAR uses soft float".
Wolfgang Denk [Thu, 22 Dec 2011 04:29:41 +0000 (04:29 +0000)]
PPC: fix "Warning: FOO uses hard float, BAR uses soft float".

It appears that with recent versions of GCC the explicit
"-mhard-float" command line option takes precedence over the
``asm(".gnu_attribute 4, 2");'' in the source file, so this no longer
helps to avoid the warnings we get when linking code that uses FP
instructions with other code that was built using soft-float.

We can remove the ".gnu_attribute" (which appears to carry no other
information, at least so far) from the object files, but we also have
to make sure we don't pull in the __gcc_qsub() and __gcc_qmul()
functions from the standard libgcc, as these would again "infect" our
linking.  We copy this code from:
gcc-4.2.2/gcc/config/rs6000/darwin-ldouble.c
This old version was chosen because it was still available under a
compatible license (GCC v2+).   The file was stripped down to the
needed parts, and reformatted so it passes checkpatch with only one
warning (do not add new typedefs).

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Stefan Roese <sr@denx.de>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Kim Phillips <kim.phillips@freescale.com>
Tested-by: Stefan Roese <sr@denx.de>
Tested-by: Anatolij Gustschin <agust@denx.de>
12 years agoPrint program basename instead of whole path in usage()
Horst Kronstorfer [Wed, 21 Dec 2011 10:39:39 +0000 (10:39 +0000)]
Print program basename instead of whole path in usage()

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agotegra2: Fix out-of-tree build for Ventana.
Thierry Reding [Wed, 16 Nov 2011 23:48:22 +0000 (23:48 +0000)]
tegra2: Fix out-of-tree build for Ventana.

Since Ventana is derived from Seaboard and requires seaboard.c to build,
make sure board/nvidia/seaboard is created in the build tree.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Wolfgang Denk <wd@denx.de>
12 years agoPrepare v2011.12-rc3 v2011.12-rc3
Wolfgang Denk [Wed, 21 Dec 2011 19:39:46 +0000 (20:39 +0100)]
Prepare v2011.12-rc3

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoarm: Tegra: fix undefined instruction hang immediately after reset
Tom Warren [Tue, 6 Dec 2011 13:00:19 +0000 (13:00 +0000)]
arm: Tegra: fix undefined instruction hang immediately after reset

commit 0d479b53 (Aneesh V) added code for OMAP4 that doesn't
execute on Tegra, due to the AVP (ARM7TDI) not having a CP15.
Result was an undefined instruction hang just after reset.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@ti.com>
Acked-by: Aneesh V <aneesh@ti.com>
12 years agodoc/mkimage.1: Fix some typos
Horst Kronstorfer [Wed, 21 Dec 2011 04:31:23 +0000 (04:31 +0000)]
doc/mkimage.1: Fix some typos

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agomkenvimage: Add version info switch (-V)
Horst Kronstorfer [Mon, 5 Dec 2011 00:55:26 +0000 (00:55 +0000)]
mkenvimage: Add version info switch (-V)

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agomkenvimage: Fix getopt() error handling
Horst Kronstorfer [Mon, 5 Dec 2011 00:55:24 +0000 (00:55 +0000)]
mkenvimage: Fix getopt() error handling

Since the original implementation indicates explicit error handling
we turn off getopt()'s internal error messaging to avoid duplicate
error messages.  Additionally we add ':' (missing option argument)
error handling.

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agomkenvimage: Fix some typos
Horst Kronstorfer [Mon, 5 Dec 2011 00:55:23 +0000 (00:55 +0000)]
mkenvimage: Fix some typos

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agophy: add Micrel KS8721BL phy definition
Vladimir Zapolskiy [Tue, 6 Dec 2011 02:47:57 +0000 (02:47 +0000)]
phy: add Micrel KS8721BL phy definition

This adds support for the Micrel KS8721BL/SL PHY.

The definition is taken from the correspondent datasheet.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
12 years agokm/common: add toolchain variable
Holger Brunck [Wed, 14 Dec 2011 06:11:50 +0000 (06:11 +0000)]
km/common: add toolchain variable

Add a variable "toolchain" and configure the rootpath
for the nfsargs with this variable.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>

12 years agoMakefile: fix distclean and *_config rules to be less noise
Lauri Hintsala [Tue, 20 Dec 2011 04:23:57 +0000 (04:23 +0000)]
Makefile: fix distclean and *_config rules to be less noise

Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
12 years agoboard/eltec/elppc/misc.c: Fix GCC 4.6 build warning
Anatolij Gustschin [Tue, 20 Dec 2011 07:51:09 +0000 (07:51 +0000)]
board/eltec/elppc/misc.c: Fix GCC 4.6 build warning

Fix:
misc.c: In function 'misc_init_r':
misc.c:119:3: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agodrivers/net/e1000.c: Fix GCC 4.6 build warnings
Anatolij Gustschin [Tue, 20 Dec 2011 07:36:39 +0000 (07:36 +0000)]
drivers/net/e1000.c: Fix GCC 4.6 build warnings

Fix:
e1000.c: In function 'e1000_read_mac_addr':
e1000.c:1149:2: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

e1000.c:1149:2: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Acked-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
12 years agoboard/esd/cpci750/mv_eth.c: Fix GCC 4.6 build warnings
Anatolij Gustschin [Tue, 20 Dec 2011 05:16:45 +0000 (05:16 +0000)]
board/esd/cpci750/mv_eth.c: Fix GCC 4.6 build warnings

Fix:
mv_eth.c: In function 'mv64360_eth_real_open':
mv_eth.c:425:6: warning: variable 'port_status' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_stop':
mv_eth.c:643:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_xmit':
mv_eth.c:719:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_receive':
mv_eth.c:804:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_get_stats':
mv_eth.c:903:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_update_stat':
mv_eth.c:931:24: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
mv_eth.c:930:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_print_stat':
mv_eth.c:1012:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'eth_clear_mib_counters':
mv_eth.c:2069:15: warning: variable 'dummy' set but not used [-Wunused-but-set-variable

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd.eu>
12 years agousb: s3c_udc_otg: fix GCC 4.6 build warnings
Anatolij Gustschin [Mon, 19 Dec 2011 04:20:35 +0000 (04:20 +0000)]
usb: s3c_udc_otg: fix GCC 4.6 build warnings

Fix:
In file included from s3c_udc_otg.c:216:0:
s3c_udc_otg_xfer_dma.c: In function 'complete_tx':
s3c_udc_otg_xfer_dma.c:280:33: warning: variable 'is_short' set but not used
s3c_udc_otg_xfer_dma.c:280:6: warning: variable 'ep_tsr' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_udc_irq':
s3c_udc_otg_xfer_dma.c:469:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c:468:18: warning: variable 'gintmsk' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_queue':
s3c_udc_otg_xfer_dma.c:582:14: warning: variable 'gintsts' set but not used
s3c_udc_otg_xfer_dma.c:581:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_ep0_read':
s3c_udc_otg_xfer_dma.c:778:6: warning: variable 'ret' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_udc_set_halt':
s3c_udc_otg_xfer_dma.c:1020:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_ep0_setup':
s3c_udc_otg_xfer_dma.c:1258:13: warning: initialization from incompatible
pointer type [enabled by default]
s3c_udc_otg_xfer_dma.c:1239:16: warning: variable 'is_in' set but not used
s3c_udc_otg_xfer_dma.c:1239:9: warning: variable 'bytes' set but not used
s3c_udc_otg.c: In function 'usb_gadget_register_driver':
s3c_udc_otg.c:292:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 'usb_gadget_unregister_driver':
s3c_udc_otg.c:338:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_ep_enable':
s3c_udc_otg.c:582:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_ep_disable':
s3c_udc_otg.c:646:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_dequeue':
s3c_udc_otg.c:704:16: warning: variable 'flags' set but not used

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Remy Bohmer <linux@bohmer.net>
12 years agoboard/samsung/universal_c210/universal.c: Fix build warning
Anatolij Gustschin [Mon, 19 Dec 2011 04:20:04 +0000 (04:20 +0000)]
board/samsung/universal_c210/universal.c: Fix build warning

Fix:
universal.c: In function 's5pc210_phy_control':
universal.c:273:7: warning: 'ret' may be used uninitialized
in this function [-Wuninitialized]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoFAT: fix some issues in FAT write support code
Anatolij Gustschin [Thu, 15 Dec 2011 03:12:14 +0000 (03:12 +0000)]
FAT: fix some issues in FAT write support code

Writing a file to the FAT partition didn't work while a
test using a CF card. The test was done on mpc5200 based
board (powerpc). There is a number of problems in FAT
write code:

Compiler warning:
fat_write.c: In function 'file_fat_write':
fat_write.c:326: warning: 'counter' may be used uninitialized
in this function
fat_write.c:326: note: 'counter' was declared here

'l_filename' string is not terminated, so a file name
with garbage at the end is used as a file name as shown
by debug code.

Return value of set_contents() is not checked properly
so actually a file won't be written at all (as checked
using 'fatls' after a write attempt with 'fatwrite'
command).

do_fat_write() doesn't return the number of written bytes
if no error happened. However the return value of this
function is used to show the number of written bytes
in do_fat_fswrite().

The patch adds some debug code and fixes above mentioned
problems and also fixes a typo in error output.

NOTE: after a successful write to the FAT partition (under
U-Boot) the partition was checked under Linux using fsck.
The partition needed fixing FATs:
-bash-3.2# fsck -a /dev/sda1
fsck 1.39 (29-May-2006)
dosfsck 2.11, 12 Mar 2005, FAT32, LFN
FATs differ but appear to be intact. Using first FAT.
Performing changes.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Donggeun Kim <dg77.kim@samsung.com>
Cc: Aaron Williams <Aaron.Williams@cavium.com>
Acked-by: Donggeun Kim <dg77.kim@samsung.com>
12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 20 Dec 2011 22:14:37 +0000 (23:14 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function

12 years agoMerge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Tue, 20 Dec 2011 22:14:32 +0000 (23:14 +0100)]
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function

12 years agodrivers/net/e1000_spi.c: Fix build warnings
Anatolij Gustschin [Tue, 20 Dec 2011 02:29:03 +0000 (02:29 +0000)]
drivers/net/e1000_spi.c: Fix build warnings

Fix:
e1000_spi.c: In function 'spi_free_slave':
e1000_spi.c:115: warning: unused variable 'hw'
e1000_spi.c: In function 'do_e1000_spi':
e1000_spi.c:472: warning: 'checksum' may be used uninitialized in this function
e1000_spi.c:472: note: 'checksum' was declared here

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Acked-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
12 years agonet: Fix arguments in tftpput command
Simon Glass [Mon, 19 Dec 2011 16:10:43 +0000 (16:10 +0000)]
net: Fix arguments in tftpput command

The switch to strict_strtoul() was not done correctly - this fixes
the compile error when CONFIG_CMD_TFTPPUT is active.

There appears to very little use of strict_strtoul() in commands, so
it might be easier to switch to simple_strtoul(). If not, we should
decide the best way to use strict_strtoul(). For now I have added a
friendly message which will of course increase code size.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoAVR32: fix timer_init() function
Sven Schnelle [Tue, 4 Oct 2011 19:53:32 +0000 (21:53 +0200)]
AVR32: fix timer_init() function

timer_init() now returns an int (the error code) instead of void.
This makes compilation fail with:

interrupts.c:111: error: conflicting types for 'timer_init'
/home/svens/u-boot/u-boot/include/common.h:246: error: previous
declaration of 'timer_init' was here
make[1]: *** [interrupts.o] Error 1

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agonet: introduce per device index
Michael Walle [Thu, 27 Oct 2011 11:31:35 +0000 (11:31 +0000)]
net: introduce per device index

Instead of counting the device index everytime a functions needs it, store
it in the eth_device struct. eth_register() keeps track of the indices and
updates the device's index number. This simplifies some functions in
net/eth.c.

Additionally, a network driver can now query its index, eg. to get the
correct environment ethaddr name.

Signed-off-by: Michael Walle <michael@walle.cc>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Mike Frysinger <vapier@gentoo.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agomvgbe: remove setting of ethaddr within the driver
Michael Walle [Thu, 17 Nov 2011 12:52:29 +0000 (12:52 +0000)]
mvgbe: remove setting of ethaddr within the driver

A network driver should not touch the environment at all. This patch fixes
this behaviour by removing the code for setting a default/randomized MAC
address.

Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Eric Cooper <ecc@cmu.edu>
Cc: Jason Cooper <u-boot@lakedaemon.net>
Cc: Siddarth Gore <gores@marvell.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Simon Guinot <simon.guinot@sequanux.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
12 years agocommon/cmd_pxe.c: Fix GCC 4.6 build warnings
Heiko Schocher [Mon, 12 Dec 2011 20:37:17 +0000 (20:37 +0000)]
common/cmd_pxe.c: Fix GCC 4.6 build warnings

Fix:
cmd_pxe.c: In function 'parse_pxefile_top':
cmd_pxe.c:941:5: warning: 'err' may be used uninitialized in this
  function [-Wuninitialized]
cmd_pxe.c:921:6: note: 'err' was declared here

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Jason Hobbs <jason.hobbs@calxeda.com>
Acked-by: Jason Hobbs <jason.hobbs@calxeda.com>
12 years agoAVR32: fix timer_init() function
Sven Schnelle [Tue, 4 Oct 2011 19:53:32 +0000 (21:53 +0200)]
AVR32: fix timer_init() function

timer_init() now returns an int (the error code) instead of void.
This makes compilation fail with:

interrupts.c:111: error: conflicting types for 'timer_init'
/home/svens/u-boot/u-boot/include/common.h:246: error: previous
declaration of 'timer_init' was here
make[1]: *** [interrupts.o] Error 1

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agoPXA: Kill last remnants of set_GPIO_mode function
Marek Vasut [Mon, 12 Dec 2011 05:34:03 +0000 (05:34 +0000)]
PXA: Kill last remnants of set_GPIO_mode function

GPIO configuration shall never be done inside a driver, never.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
Anatolij Gustschin [Sat, 19 Nov 2011 01:59:13 +0000 (01:59 +0000)]
ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
from mach-types.h. Add them to the board config file.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
Anatolij Gustschin [Sat, 19 Nov 2011 01:59:12 +0000 (01:59 +0000)]
ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
Add it to the board config file.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoarm, fdt: update ethernet mac address before booting Linux
Heiko Schocher [Wed, 14 Sep 2011 19:16:30 +0000 (19:16 +0000)]
arm, fdt: update ethernet mac address before booting Linux

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Gerald van Baren <gvb.uboot@gmail.com>
Acked-by: Wolfgang Denk <wd@denx.de>
12 years agoadd print_cpuinfo to s3c24x0
David Müller (ELSOFT AG) [Fri, 3 Dec 2010 05:12:50 +0000 (05:12 +0000)]
add print_cpuinfo to s3c24x0

Hello

This patch adds support for "print_cpuinfo" on Samsung s3c24x0
based targets. If activated by "#define CONFIG_DISPLAY_CPUINFO", the
chip ID and the 3 main cpu frequencies will be displayed.

Dave

Signed-off-by: David Müller <d.mueller@elsoft.ch>
12 years agoomap4_panda: Initialize the USB phy
Chris Lalancette [Tue, 13 Dec 2011 09:41:12 +0000 (09:41 +0000)]
omap4_panda: Initialize the USB phy

During misc_init_r, make sure to setup the clocks
properly for the USB hub on the pandaboard.  With
this in place, the USB hub and the ethernet works
on the pandaboard.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Acked-by: Aneesh V <aneesh@ti.com>
12 years agodavinci: Fixed wrong timebase clock frequency.
Manfred Rudigier [Wed, 14 Dec 2011 15:20:08 +0000 (16:20 +0100)]
davinci: Fixed wrong timebase clock frequency.

Signed-off-by: Manfred Rudigier <manfred.rudigier@omicron.at>
12 years agoarm926ejs: remove noop flush_dcache_all function
Ilya Yanok [Sun, 11 Dec 2011 13:09:28 +0000 (13:09 +0000)]
arm926ejs: remove noop flush_dcache_all function

Commit 2f3427c added noop cache functions implementation for arm926ejs
to fix compilation of drivers depending on these functions (DaVinci
EMAC in particular).

Unfortunately, the bug was introduced: noop implementation calls
dcache_disable which calls flush_dcache_all which in turn calls
dcache_disable thus creating an infinite loop.

This patch removes noop implementation for flush_dcache_all, we already
have default one in arch/arm/lib/cache.c and it should be used instead.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Tested-by: Matthias Weisser <weisserm@arcor.de>
12 years agoM28: Fix tab indent in u-boot.bd
Marek Vasut [Tue, 13 Dec 2011 09:18:07 +0000 (09:18 +0000)]
M28: Fix tab indent in u-boot.bd

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
12 years agoFix building for mx51evk board
Anatolij Gustschin [Mon, 12 Dec 2011 01:25:46 +0000 (01:25 +0000)]
Fix building for mx51evk board

Fix:
mx51evk.c:206:6: error: conflicting types for 'board_ehci_hcd_init'
/u-boot/include/usb/ehci-fsl.h:254:5: note: previous declaration of
'board_ehci_hcd_init' was here

We also fix board_ehci_hcd_init() for mx53loco board.
Building for mx53loco worked since <usb/ehci-fsl.h> is
not included here.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agoPrepare v2011.12-rc2 v2011.12-rc2
Wolfgang Denk [Mon, 19 Dec 2011 11:12:54 +0000 (12:12 +0100)]
Prepare v2011.12-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoCoding Style cleanup
Wolfgang Denk [Mon, 19 Dec 2011 11:03:40 +0000 (12:03 +0100)]
Coding Style cleanup

Fix trailing white space, indentation by spaces instead of TABs,
excessive blank lines, trailing blank lines.

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agodrivers/usb/gadget/pxa27x_udc.c: Coding Style cleanup
Wolfgang Denk [Mon, 19 Dec 2011 10:52:36 +0000 (11:52 +0100)]
drivers/usb/gadget/pxa27x_udc.c: Coding Style cleanup

Commit bdbcdc89 "pxa: convert pxa27x_udc to use read and write
functions" added a number of C++ comments.  Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agocommon/cmd_nvedit.c: Fix size calculation in do_env_import()
Horst Kronstorfer [Fri, 16 Dec 2011 23:33:10 +0000 (23:33 +0000)]
common/cmd_nvedit.c: Fix size calculation in do_env_import()

do_env_import() missed the final '\0' terminator when calculating the
size of an environment data block.  This led to an erroneous 'bad CRC,
import failed' message for a checksum protected environment (-c.)

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
12 years agox86: Add support for specifying an initrd with the zboot command
Gabe Black [Mon, 5 Dec 2011 12:09:27 +0000 (12:09 +0000)]
x86: Add support for specifying an initrd with the zboot command

This change finishes plumbing the initrd support built into the zboot
mechanism out to the command interface.

It also fixes a bug in the command declaration where the kernel size could
be passed as an optional second parameter but not enough arguments were
allowed.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Refactor the zboot innards so they can be reused with a vboot image
Gabe Black [Mon, 5 Dec 2011 12:09:26 +0000 (12:09 +0000)]
x86: Refactor the zboot innards so they can be reused with a vboot image

If vboot successfully verifies a kernel, it will leave it in place and
basically ready to boot. The zeropage table which is part of the x86 boot
protocol is at the end of the kernel, though, instead of the beginning, and
because the image is already in place there's no need to copy it around.
This change refactors the code which implements the zboot command so that
the configuration of the zeropage table and loading the pieces of the
kernel into memory are done separately. Also, because the command line goes
before the zeropage table in vboot which is somewhat incompatible with the
normal protocol, where to put the command line is a now a parameter instead
of being hard coded.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Add infrastructure to extract an e820 table from the coreboot tables
Gabe Black [Mon, 5 Dec 2011 12:09:25 +0000 (12:09 +0000)]
x86: Add infrastructure to extract an e820 table from the coreboot tables

Also approximate the size of RAM using the largest RAM address available
in the tables. There may be areas which are marked as reserved which are
actually at the end of RAM.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Add support for booting Linux using the 32 bit boot protocol
Gabe Black [Mon, 5 Dec 2011 12:09:24 +0000 (12:09 +0000)]
x86: Add support for booting Linux using the 32 bit boot protocol

This change conditionally modifies the zboot command so that it can use the
32 bit boot protocol. This is necessary because the 16 bit realmode entry
point assumes that it can call BIOS services which neither coreboot nor
u-boot provide.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Clean up the x86 zimage code in preparation to extend it
Gabe Black [Mon, 5 Dec 2011 12:09:23 +0000 (12:09 +0000)]
x86: Clean up the x86 zimage code in preparation to extend it

This change cleans up some formatting issues in the zimage handling code, and
converts it from using offsets added to a base pointer to using the available
structure definitions which were already being included.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
12 years agox86: Import code from coreboot's libpayload to parse the coreboot table
Gabe Black [Mon, 5 Dec 2011 12:09:22 +0000 (12:09 +0000)]
x86: Import code from coreboot's libpayload to parse the coreboot table

This change also forces the lib_sysinfo structure to be in the .data
section. Otherwise it ends up in the .bss section. U-boot assumes that it
doesn't need to copy it over during relocation, and instead fills that
whole section with zeroes. If we really were booting from ROM that would be
appropriate, but we need some information from the coreboot tables (memory
size) before then and have to fill that structure before relocation. We
skirt u-boot's assumption by putting this in .data where it assumes there
is still read only but non-zero data.

Signed-off-by: Gabe Black <gabeblack@chromium.org>