oweals/u-boot.git
11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Thu, 5 Sep 2013 09:15:26 +0000 (11:15 +0200)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.

11 years agoMerge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 4 Sep 2013 12:06:56 +0000 (14:06 +0200)]
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

11 years agoMerge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 4 Sep 2013 09:50:25 +0000 (11:50 +0200)]
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

11 years agoMerge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 3 Sep 2013 12:59:18 +0000 (14:59 +0200)]
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

11 years agoMerge 'u-boot-microblaze/zynq' into (u-boot-arm/master'
Albert ARIBAUD [Tue, 3 Sep 2013 12:01:02 +0000 (14:01 +0200)]
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'

Conflicts:
arch/arm/include/asm/arch-zynq/hardware.h

The conflict above was trivial and solved during merge.

11 years agoPrepare v2013.10-rc2 v2013.10-rc2
Tom Rini [Mon, 2 Sep 2013 18:20:36 +0000 (14:20 -0400)]
Prepare v2013.10-rc2

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoi.MX6: Set and clear the gating bits for Phase Fractional Dividers
Eric Nelson [Thu, 29 Aug 2013 19:41:46 +0000 (12:41 -0700)]
i.MX6: Set and clear the gating bits for Phase Fractional Dividers

This addresses silicon errata ERR006282 as described in this
document:
https://community.freescale.com/docs/DOC-94581

Also implemented in Freescale's 2009.08-based release:

http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/
Commit id: b7c5badf94ffbe6cd0845efbb75e16e05e3af404

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agoi.MX6: nitrogen6x: Don't bother setting PLL3(480) PFD1 divisor
Eric Nelson [Thu, 29 Aug 2013 19:37:36 +0000 (12:37 -0700)]
i.MX6: nitrogen6x: Don't bother setting PLL3(480) PFD1 divisor

This clock isn't feeding anything under U-Boot, so there's no
point in changing it from power-on default.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
11 years agoi.MX6: Correct ANATOP_PFD (Phase Fractional Divider) register declarations
Eric Nelson [Thu, 29 Aug 2013 19:37:35 +0000 (12:37 -0700)]
i.MX6: Correct ANATOP_PFD (Phase Fractional Divider) register declarations

Some _CLKGATE_MASK and _FRAC_MASK macros were wrong for PFD_480
and the PFD_528 macros were missing.

Fortunately, the incorrect macros weren't being used.

Since both the PFD_480 and PFD_528 registers have the same
structure, and the fields are identical for [0..3] in bytes
[0..3], so a single set of macros will suffice.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
11 years agoi.MX6: Add convenience macros cpu_type(rev) and is_cpu_type(cpu)
Eric Nelson [Thu, 29 Aug 2013 17:57:10 +0000 (10:57 -0700)]
i.MX6: Add convenience macros cpu_type(rev) and is_cpu_type(cpu)

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agoARM: mxs: rename function that sets AUTO_RESTART flag
Hector Palacios [Wed, 24 Jul 2013 14:01:39 +0000 (16:01 +0200)]
ARM: mxs: rename function that sets AUTO_RESTART flag

The AUTO_RESTART flag of HW_RTC_PERSISTENT0 register will
power up the chip automatically 180ms after power down.
This bit must be enabled by the boot loader to ensure the
target can start upon hardware reset or watchdog reset
even when powered from a battery.

Currently the function named 'mxs_power_clear_auto_restart()'
is setting this flag although the 'clear' in its name suggest
the opposite.

This patch renames the function to 'mxs_power_set_auto_restart()'
and removes the comment about EVK revision A which was confusing
because the function indeed was setting the flag.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
11 years agoARM: Congatec: README update
SARTRE Leo [Thu, 20 Jun 2013 13:46:50 +0000 (15:46 +0200)]
ARM: Congatec: README update

README: U-boot works both on SPI-NOR and SDcard

Signed-off-by: Leo Sartre <lsartre@adeneo-embedded.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agotools: mxsboot: Staticize functions
Marek Vasut [Tue, 27 Aug 2013 21:32:37 +0000 (23:32 +0200)]
tools: mxsboot: Staticize functions

Make remaining non-static functions static and the same for vars.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agotools: Sort lists of files in Makefile
Marek Vasut [Mon, 26 Aug 2013 18:43:34 +0000 (20:43 +0200)]
tools: Sort lists of files in Makefile

Fix the lists of files so they are in order again.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agoARM: mxs: tools: Add mkimage support for MXS bootstream
Marek Vasut [Mon, 26 Aug 2013 18:43:33 +0000 (20:43 +0200)]
ARM: mxs: tools: Add mkimage support for MXS bootstream

Add mkimage support for generating and verifying MXS bootstream.
The implementation here is mostly a glue code between MXSSB v0.4
and mkimage, but the long-term goal is to rectify this and merge
MXSSB with mkimage more tightly. Once this code is properly in
U-Boot, MXSSB shall be deprecated in favor of mkimage-mxsimage
support.

Note that the mxsimage generator needs libcrypto from OpenSSL, I
therefore enabled the libcrypto/libssl unconditionally.

MXSSB: http://git.denx.de/?p=mxssb.git;a=summary

The code is based on research presented at:
http://www.rockbox.org/wiki/SbFileFormat

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
11 years agoimx: add status reporting for HAB status
Stefano Babic [Thu, 27 Jun 2013 22:20:21 +0000 (00:20 +0200)]
imx: add status reporting for HAB status

Add functions to report the HAB (High Assurance Boot) status
of e.g. i.MX6 CPUs.

This is taken from

git://git.freescale.com/imx/uboot-imx.git branch imx_v2009.08_3.0.35_4.0.0
cpu/arm_cortexa8/mx6/generic.c
include/asm-arm/arch-mx6/mx6_secure.h

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agotools: add support for setting the CSF into imximage
Stefano Babic [Thu, 27 Jun 2013 09:42:38 +0000 (11:42 +0200)]
tools: add support for setting the CSF into imximage

Add support for setting the CSF (Command Sequence File) pointer
which is used for HAB (High Assurance Boot) in the imximage by
adding e.g.

CSF 0x2000

in the imximage.cfg file.

This will set the CSF pointer accordingly just after the padded
data image area. The boot_data.length is adjusted with the
value from the imximage.cfg config file.

The resulting u-boot.imx can be signed with the FSL HAB tooling.
The generated CSF block needs to be appended to the u-boot.imx.

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agotools: add padding of data image file for imximage
Stefano Babic [Mon, 19 Aug 2013 17:03:20 +0000 (19:03 +0200)]
tools: add padding of data image file for imximage

Implement function vrec_header to be able to pad the final
data image file according the what has been calculated for
boot_data.length.

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agotools: add variable padding of data image in mkimage
Stefano Babic [Mon, 19 Aug 2013 17:03:19 +0000 (19:03 +0200)]
tools: add variable padding of data image in mkimage

Use previously unused return value of function vrec_header
to return a padding size to generic mkimage. This padding
size is used in copy_files to pad with zeros after copying
the data image.

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agotools: dynamically allocate imx_header in imximage
Stefano Babic [Wed, 26 Jun 2013 21:50:06 +0000 (23:50 +0200)]
tools: dynamically allocate imx_header in imximage

Change to dynamically allocate the imx_header to correctly
allocate the IVT, Boot Data and DCD at correct locations
depending on the boot media.

Also check that the Image Vector Table Offset + IVT +
Boot Data + DCD <= Initial Load Region Size.

Previously struct imx_header was always 4096 bytes and was
not dealing correctly with the Image Vector Table Offset.

Now, the memory allocation looks for e.g. SD boot like this

 Storage   u-boot.imx                             RAM
 Device

 00000000                                         177ff000 <--------------
                                                                         |
 00000400  00000000  d1 00 20 40 IVT.header       177ff400 <-------      |
 00000404  00000004  00 00 80 17 IVT.entry        177ff404 -----------   |
 00000408  00000008  00 00 00 00 IVT.reserved1    177ff408        |  |   |
 0000040C  0000000C  2c f4 7f 17 IVT.dcd          177ff40C ------ |  |   |
 00000410  00000010  20 f4 7f 17 IVT.boot         177ff410 ---- | |  |   |
 00000414  00000014  00 f4 7f 17 IVT.self         177ff414 --------  |   |
 00000418  00000018  00 00 00 00 IVT.csf          177ff418    | |    |   |
 0000041C  0000001C  00 00 00 00 IVT.reserved2    177ff41C    | |    |   |
 00000420  00000020  00 f0 7f 17 BootData.start   177ff420 <--- |    | ---
 00000424  00000024  00 60 03 00 BootData.length  177ff424      |    |
 00000428  00000028  00 00 00 00 BootData.plugin  177ff428      |    |
 0000042C  0000002C  d2 03 30 40 DCD.header       177ff42C <-----    |
 ...                                                                 |
 00001000  00000c00  13 00 00 ea U-Boot Start     17800000 <----------

While at it also remove the unused #define HEADER_OFFSET.

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agotools: rename mximage_flash_offset to imximage_ivt_offset
Stefano Babic [Wed, 26 Jun 2013 16:08:37 +0000 (18:08 +0200)]
tools: rename mximage_flash_offset to imximage_ivt_offset

This better reflects the naming from the Reference Manual
as well as fits better since "flash" is not really applicabe
for SATA.

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agotools: imx_header should not include flash_offset
Stefano Babic [Wed, 26 Jun 2013 15:26:27 +0000 (17:26 +0200)]
tools: imx_header should not include flash_offset

Doing a  make distclean; make mx6qsabresd_config; make
and      hexdump -C u-boot.imx | less

 ...
 00000360  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 000003f0  00 00 00 00 00 00 00 00  00 00 00 00 00 04 00 00  |................|
                                                ^^^^^^^^^^^
 00000400  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00001000  13 00 00 ea 14 f0 9f e5  14 f0 9f e5 14 f0 9f e5  |...ê.ð.å.ð.å.ð.å|
 ...

shows the flash_offset value being written into the final
generated image, wich is not correct.

Instead create flash_offset as static variable such that the
generated image is "clean".

 00000360  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00001000  13 00 00 ea 14 f0 9f e5  14 f0 9f e5 14 f0 9f e5  |...ê.ð.å.ð.å.ð.å|

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agosiemens-am33x-common.h: Always build CONFIG_OMAP_GPIO support
Tom Rini [Wed, 28 Aug 2013 16:00:18 +0000 (12:00 -0400)]
siemens-am33x-common.h: Always build CONFIG_OMAP_GPIO support

The MMC driver relies on this block now.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoarm, am335x: add support for 3 siemens boards
Heiko Schocher [Mon, 19 Aug 2013 14:39:01 +0000 (16:39 +0200)]
arm, am335x: add support for 3 siemens boards

add support for the am335x based boards from siemens:

dxr2:
  - DDR3 128MiB
  - NAND 256MiB
  - Ethernet with external Switch SMSC LAN9303
  - no PMIC
  - internal Watchdog
  - DFU support

pxm2:
  - DDR2 512 MiB
  - NAND 1024 MiB
  - PMIC
  - PHY atheros ar803x
  - USB Host
  - internal Watchdog
  - DFU support

rut:
  - DDR3 256 MiB
  - NAND 256 MiB
  - PMIC
  - PHY natsemi dp83630
  - external Watchdog
  - DFU support

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Roger Meier <r.meier@siemens.com>
Signed-off-by: Samuel Egli <samuel.egli@siemens.com>
Cc: Pascal Bach <pascal.bach@siemens.com>
Cc: Tom Rini <trini@ti.com>
11 years agovideo: add formike lcd panel init
Heiko Schocher [Mon, 19 Aug 2013 14:39:00 +0000 (16:39 +0200)]
video: add formike lcd panel init

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Tom Rini <trini@ti.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
11 years agoarm, am335x: add watchdog support
Heiko Schocher [Mon, 19 Aug 2013 14:38:59 +0000 (16:38 +0200)]
arm, am335x: add watchdog support

Add TI OMAP 16xx & 24xx/34xx 32KHz (non-secure) watchdog support.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
11 years agoarm, spl: add watchdog library to SPL
Heiko Schocher [Mon, 19 Aug 2013 14:38:58 +0000 (16:38 +0200)]
arm, spl: add watchdog library to SPL

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agoarm, am335x: add some missing registers and defines for lcd and epwm support
Heiko Schocher [Mon, 19 Aug 2013 14:38:57 +0000 (16:38 +0200)]
arm, am335x: add some missing registers and defines for lcd and epwm support

- add missing register defines in struct cm_perpl
  epwmss0clkctrl
  epwmss2clkctrl
  lcdcclkstctrl
- add missing register defines in struct cm_dpll
  clklcdcpixelclk
- add struct pwmss_regs
- add struct pwmss_ecap_regs
- add LCD Controller base LCD_CNTL_BASE
- add PWM0 controller base PWMSS0_BASE

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agoarm, am33xx: add defines for gmii_sel_register bits
Heiko Schocher [Mon, 19 Aug 2013 14:38:56 +0000 (16:38 +0200)]
arm, am33xx: add defines for gmii_sel_register bits

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
11 years agodra7xx_evm: Re-order and comment the networking related config options
Tom Rini [Tue, 20 Aug 2013 12:53:54 +0000 (08:53 -0400)]
dra7xx_evm: Re-order and comment the networking related config options

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoomap5_uevm: Better comment why we have TCA642X and the reset time
Tom Rini [Tue, 20 Aug 2013 12:53:53 +0000 (08:53 -0400)]
omap5_uevm: Better comment why we have TCA642X and the reset time

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:omap5: Clarify comments about SPL and DDR timings in common config
Tom Rini [Tue, 20 Aug 2013 12:53:52 +0000 (08:53 -0400)]
TI:omap5: Clarify comments about SPL and DDR timings in common config

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:am33xx: Move SPL YMODEM support to the per-board config
Tom Rini [Tue, 20 Aug 2013 12:53:51 +0000 (08:53 -0400)]
TI:am33xx: Move SPL YMODEM support to the per-board config

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x_evm: Update README for customization
Tom Rini [Tue, 20 Aug 2013 12:53:50 +0000 (08:53 -0400)]
am335x_evm: Update README for customization

As this is a reference platform, update the README to note which IP
blocks are required for use due to design choices of the reference
rather than required by the SoC itself.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:armv7: Re-order slightly the generic CONFIG options, expand related comments
Tom Rini [Tue, 20 Aug 2013 12:53:49 +0000 (08:53 -0400)]
TI:armv7: Re-order slightly the generic CONFIG options, expand related comments

Re-group the general options to note things that can be removed safely
to reduce binary size when not required, and expand the comment about
what commands we do include to note it could be replaced with a specific
list of required one.  While at it, move the CMD parts of various
blocks IP to the end of the list for consistency.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x_evm: Regroup USB options
Tom Rini [Tue, 20 Aug 2013 12:53:48 +0000 (08:53 -0400)]
am335x_evm: Regroup USB options

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x_evm: Add comment by SPL SPI support
Tom Rini [Tue, 20 Aug 2013 12:53:47 +0000 (08:53 -0400)]
am335x_evm: Add comment by SPL SPI support

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:am335x: Better comment and organize the networking related options
Tom Rini [Tue, 20 Aug 2013 12:53:46 +0000 (08:53 -0400)]
TI:am335x: Better comment and organize the networking related options

While in here, drop CONFIG_BOOTP_DEFAULT as it is unused in the code.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoomap5: Expand CONFIG_SPL_MAX_SIZE and comment upon SRAM_SCRATCH_SPACE_ADDR
Tom Rini [Tue, 20 Aug 2013 12:53:45 +0000 (08:53 -0400)]
omap5: Expand CONFIG_SPL_MAX_SIZE and comment upon SRAM_SCRATCH_SPACE_ADDR

After examining both TRMs and doing some experimentation, we can rely on
using the start of the download area for CONFIG_SPL_TEXT_BASE and then
move SRAM_SCRATCH_SPACE_ADDR up, just like am335x.  This is required for
peripheral boot modes such as UART.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:armv7: Move CONFIG_SPL_LIBDISK_SUPPORT to MMC section
Tom Rini [Tue, 20 Aug 2013 12:53:44 +0000 (08:53 -0400)]
TI:armv7: Move CONFIG_SPL_LIBDISK_SUPPORT to MMC section

We only need this library when we're doing "disk" access to MMC/SD.
Update comment around the rest of CONFIG_SPL_LIB* to note that the
others are always required.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam33xx: Correct and expand comments on CONFIG_SPL_MAX_SIZE
Tom Rini [Tue, 20 Aug 2013 12:53:43 +0000 (08:53 -0400)]
am33xx: Correct and expand comments on CONFIG_SPL_MAX_SIZE

We had been allowing the max size to be larger than actually allowed by
the ROM.  Expand the commentary here to explain why we set these
locations.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoARM: igep00x0.h: Enable raw initrd support
Javier Martinez Canillas [Sun, 11 Aug 2013 16:20:00 +0000 (18:20 +0200)]
ARM: igep00x0.h: Enable raw initrd support

Now that IGEP base boards default environment use
the bootz command to boot a zImage instead of a
uImage, it makes sense to add support to supply a
raw initrd image to the kernel if needed.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
11 years agoarm: omap3: fix SRAM copy and execution sequence
Albert ARIBAUD [Sat, 10 Aug 2013 17:03:59 +0000 (19:03 +0200)]
arm: omap3: fix SRAM copy and execution sequence

Fix size calculation in copy of go_to_speed into SRAM.
Use SRAM_CLK_CODE in call to SRAM-based go_to_speed.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
11 years agoARM: OMAP4460: sdp: Limit TPS mux config to 4460
Taras Kondratiuk [Tue, 6 Aug 2013 12:18:51 +0000 (15:18 +0300)]
ARM: OMAP4460: sdp: Limit TPS mux config to 4460

TPS mux config is 4460 specific, so it should be limited to 4460 only.

Signed-off-by: Taras Kondratiuk <taras@ti.com>
11 years agoARM: OMAP4470: Add Elpida EDB8164B3PF memory configuration
Lubomir Popov [Tue, 6 Aug 2013 12:18:50 +0000 (15:18 +0300)]
ARM: OMAP4470: Add Elpida EDB8164B3PF memory configuration

OMAP4470 SDP SoM has EDB8164B3PF PoP memory on board.
This memory has 4Gb x 2CS = 8Gb configuration.
Add configuration for runtime calculation and precalculated cases.

Patch is based on a draft Lubomir's patch [1].

[1] http://lists.denx.de/pipermail/u-boot/2013-April/150851.html

Signed-off-by: Lubomir Popov <lpopov@mm-sol.com>
[taras@ti.com: cleaned up patch and fixed precalculated values]
Signed-off-by: Taras Kondratiuk <taras@ti.com>
11 years agoARM: OMAP4470: Add voltage and dpll data
Taras Kondratiuk [Tue, 6 Aug 2013 12:18:49 +0000 (15:18 +0300)]
ARM: OMAP4470: Add voltage and dpll data

OMAP4470 reference design uses TWL6032 PMIC
with a following connection scheme:
  VDD_CORE = TWL6032 SMPS2
  VDD_MPU  = TWL6032 SMPS1
  VDD_IVA  = TWL6032 SMPS5

Set voltage and frequency values according to
OMAP4470 Data Manual Operating Condition Addendum v0.7

Signed-off-by: Taras Kondratiuk <taras@ti.com>
11 years agoARM: OMAP4470: Add OMAP4470 identification
Taras Kondratiuk [Tue, 6 Aug 2013 12:18:48 +0000 (15:18 +0300)]
ARM: OMAP4470: Add OMAP4470 identification

Signed-off-by: Taras Kondratiuk <taras@ti.com>
11 years agosdp4430: Initialize board id using CONFIG_MACH_TYPE
Oleksandr Tyshchenko [Tue, 6 Aug 2013 11:03:27 +0000 (14:03 +0300)]
sdp4430: Initialize board id using CONFIG_MACH_TYPE

Use CONFIG_MACH_TYPE generic macro to set the machine type
number in the common arm code instead of setting it in the
board code.

Signed-off-by: Oleksandr Tyshchenko <oleksandr.tyshchenko@ti.com>
11 years agoomap5: Correct include order, drop CONFIG_SYS_PROMPT define
Tom Rini [Tue, 27 Aug 2013 14:56:18 +0000 (10:56 -0400)]
omap5: Correct include order, drop CONFIG_SYS_PROMPT define

With the new include structure for TI platforms, we need to not define
our own CONFIG_SYS_PROMPT and also need to include
<configs/omap5_common.h> much sooner, so do both of these.  Also drop
the unused CONFIG_NET_MULTI

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Tue, 27 Aug 2013 13:49:43 +0000 (09:49 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

11 years agoi2c: fix i2c dev command for not using new framework
Heiko Schocher [Fri, 23 Aug 2013 07:39:16 +0000 (09:39 +0200)]
i2c: fix i2c dev command for not using new framework

i2c dev command does not work anymore for legacy drivers
because a check is executed that is valid only
in the new framework.

Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Stefano Babic <sbabic@denx.de>
11 years agoconsole: usb: kbd: To fix slow TFTP booting
Jim Lin [Mon, 26 Aug 2013 12:21:09 +0000 (20:21 +0800)]
console: usb: kbd: To fix slow TFTP booting

TFTP booting is slow when a USB keyboard is installed and
stdin has usbkbd added.
This fix is to change Ctrl-C polling for USB keyboard to every second
when NET transfer is running.
My previous patch is expected to be put into usb_kbd_testc(). But it went
into usb_kbd_getc() after applied.
This patch is to put change in correct place.

Signed-off-by: Jim Lin <jilin@nvidia.com>
11 years agoconsole: usb: kbd: To improve TFTP booting performance
Jim Lin [Tue, 13 Aug 2013 11:04:22 +0000 (19:04 +0800)]
console: usb: kbd: To improve TFTP booting performance

TFTP booting is slow when a USB keyboard is installed and
stdin has usbkbd added.
This fix is to change Ctrl-C polling for USB keyboard to every second
when NET transfer is running.

Signed-off-by: Jim Lin <jilin@nvidia.com>
11 years agoNET: Add net_busy_flag if CONFIG_USB_KEYBOARD is defined
Jim Lin [Tue, 13 Aug 2013 11:03:05 +0000 (19:03 +0800)]
NET: Add net_busy_flag if CONFIG_USB_KEYBOARD is defined

This flag is to make console aware that NET transfer is running or not.

Signed-off-by: Jim Lin <jilin@nvidia.com>
11 years agousb: ehci-mx5: Use 'bool' instead of 'unsigned char'
Fabio Estevam [Fri, 26 Jul 2013 16:54:28 +0000 (13:54 -0300)]
usb: ehci-mx5: Use 'bool' instead of 'unsigned char'

The 'enable' argument can be better expressed as boolean.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agousb: ehci-mx5: Remove unneeded write to cscmr1 register
Fabio Estevam [Fri, 26 Jul 2013 16:54:27 +0000 (13:54 -0300)]
usb: ehci-mx5: Remove unneeded write to cscmr1 register

Currently we have the following behavior in ehci_hcd_init()

- Read csmr1 register, clear bit 26 and then set bit 26.

However a little bit later we call set_usb_phy_clk() which clears bit 26, so
let's get rid of the unnecessary code.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agousb:dfu:g_dnl: Refactoring the string definition code for g_dnl driver
Lukasz Majewski [Mon, 19 Aug 2013 15:17:19 +0000 (17:17 +0200)]
usb:dfu:g_dnl: Refactoring the string definition code for g_dnl driver

The manufacturer and product IDs are dynamically assigned when gadget is
bind.
Now the IDs aren't assigned at struct g_dnl_string_defs definition.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: "Egli, Samuel" <samuel.egli@siemens.com>
11 years agousb:dfu:g_dnl: Change number of exported configurations at composite gadget
Lukasz Majewski [Mon, 19 Aug 2013 15:17:18 +0000 (17:17 +0200)]
usb:dfu:g_dnl: Change number of exported configurations at composite gadget

USB composite gadget (g_dnl) supports only one configuration. Due to that
the corresponding field - bConfigurationValue has been changed.

Moreover more descriptive names were chosen for relevant fields.

Windows XP setup:
- Thesyscon USB Descriptor Dumper
- zadig_xp program for WinUSB installation (which is required by dfu-util)
- dfu-util for windows (version 0.6)
- TRATS target connected via USB hub to test Win XP machine.

Tested at: Trats - Exynos4210

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: "Egli, Samuel" <samuel.egli@siemens.com>
11 years agodfu, nand, ubi: add partubi alt settings for updating ubi partition
Heiko Schocher [Thu, 25 Jul 2013 04:43:11 +0000 (06:43 +0200)]
dfu, nand, ubi: add partubi alt settings for updating ubi partition

updating an ubi partition needs a completely erased mtd partition,
see:
http://lists.infradead.org/pipermail/linux-mtd/2011-May/035416.html

So, add partubi alt setting for the dfu_alt_info environment
variable to mark this partition as an ubi partition. In case we
update an ubi partition, we erase after flashing the image into the
partition, the remaining sektors.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Tom Rini <trini@ti.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
11 years agousb: Use well-known descriptor sizes when parsing configuration
Julius Werner [Fri, 19 Jul 2013 20:12:08 +0000 (13:12 -0700)]
usb: Use well-known descriptor sizes when parsing configuration

The existing USB configuration parsing code relies on the descriptors'
own length values when reading through the configuration blob. Since the
size of those descriptors is always well-defined, we should rather use
the known sizes instead of trusting device-provided values to be
correct. Also adds some safety to potential out-of-order descriptors.

Change-Id: I16f69dfdd6793aa0fe930b5148d4521f3e5c3090
Signed-off-by: Julius Werner <jwerner@chromium.org>
11 years agoARM: OMAP5-uevm: Add usb device reset API
Dan Murphy [Thu, 1 Aug 2013 19:06:02 +0000 (14:06 -0500)]
ARM: OMAP5-uevm: Add usb device reset API

Add the call back to reset the LAN9730 after
the FEAT_POWER has been called.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
11 years agoUSB: usb-hub: Add a weak function for resetting devices
Dan Murphy [Thu, 1 Aug 2013 19:06:01 +0000 (14:06 -0500)]
USB: usb-hub: Add a weak function for resetting devices

Add a __weak function that can be overridden to reset devices
attached to an ehci devices after the FEAT_POWER has been submitted

Signed-off-by: Dan Murphy <dmurphy@ti.com>
11 years agoARM: OMAP5-uevm: Add USB MAC ethernet address
Dan Murphy [Thu, 1 Aug 2013 19:06:00 +0000 (14:06 -0500)]
ARM: OMAP5-uevm: Add USB MAC ethernet address

Set the usbethaddr based on the OMAP DIE_ID registers
which should be unique for each processor.

Then set this as the usb ethernet MAC address.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
11 years agoARM: OMAP5-uevm: Add USB ehci support for the uEVM
Dan Murphy [Thu, 1 Aug 2013 19:05:59 +0000 (14:05 -0500)]
ARM: OMAP5-uevm: Add USB ehci support for the uEVM

Add the USB ehci support for the OMAP5 uEVM.

Configure the uEVM mux data
Add the flags to build the appropriate modules
Add the usb call backs to initialize the EHCI controller

Signed-off-by: Dan Murphy <dmurphy@ti.com>
11 years agoARM: OMAP: USB: Fix linker error when ULPI is not defined
Dan Murphy [Thu, 1 Aug 2013 19:05:58 +0000 (14:05 -0500)]
ARM: OMAP: USB: Fix linker error when ULPI is not defined

Fix the linker error for missing ulpi_reset when ulpi is not defined
in the board config.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agoARM: OMAP5: USB: Add OMAP5 common USB EHCI information
Dan Murphy [Thu, 1 Aug 2013 19:05:57 +0000 (14:05 -0500)]
ARM: OMAP5: USB: Add OMAP5 common USB EHCI information

* Enable the OMAP5 EHCI host clocks
* Add OMAP5 EHCI register definitions
* Add OMAP5 ES2 host revision

Signed-off-by: Dan Murphy <dmurphy@ti.com>
11 years agoomap5: uevm: Change the board name to correct name
Dan Murphy [Thu, 1 Aug 2013 19:05:56 +0000 (14:05 -0500)]
omap5: uevm: Change the board name to correct name

Change the board name for the sys info to
5432 uEVM

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agommc: mxsmmc: Enable MMC HC support
Amaury Pouly [Thu, 1 Aug 2013 14:21:00 +0000 (16:21 +0200)]
mmc: mxsmmc: Enable MMC HC support

Enable support for high-capacity eMMC and MMC cards. The MXS MMC
driver has no problem with those.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Amaury Pouly <amaury.pouly@gmail.com>
Cc: Andy Fleming <afleming@freescale.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agoenv_nand.c: support falling back to redundant env when writing
Phil Sutter [Fri, 19 Jul 2013 10:20:26 +0000 (12:20 +0200)]
env_nand.c: support falling back to redundant env when writing

Without this patch, when the currently chosen environment to be written
has bad blocks, saveenv fails completely. Instead, when there is
redundant environment fall back to the other copy. Environment reading
needs no adjustment, as the fallback logic for incomplete writes applies
to this case as well.

Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
11 years agonand_util: delete a useless variable
Masahiro Yamada [Fri, 12 Jul 2013 01:53:37 +0000 (10:53 +0900)]
nand_util: delete a useless variable

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agocmd_nand: Do not show usage when scrub is aborted
Masahiro Yamada [Thu, 11 Jul 2013 08:29:57 +0000 (17:29 +0900)]
cmd_nand: Do not show usage when scrub is aborted

When executing nand scrub, the user gets the prompt:

  Really scrub this NAND flash? <y/N>

We do not want the annoying usage displayed when saying N here.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agocmd_nand: slight optimization of nand_dump function
Masahiro Yamada [Thu, 11 Jul 2013 08:27:13 +0000 (17:27 +0900)]
cmd_nand: slight optimization of nand_dump function

If a non-zero value is given to only_oob argument,
printing the main area is skipped.

With a little modification, we can skip the whole
while loop.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agocmd_nand: fix a memory leak in nand_dump function
Masahiro Yamada [Thu, 11 Jul 2013 08:27:12 +0000 (17:27 +0900)]
cmd_nand: fix a memory leak in nand_dump function

If datbuf = memalign(ARCH_DMA_MINALIGN, nand->writesize);
succeeds and
  oobbuf = memalign(ARCH_DMA_MINALIGN, nand->oobsize);
fails, nand_dump function should free databuf.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoarm: atmel: cpux9k2: board update and enhancement
Jens Scharsig (BuS Elektronik) [Thu, 22 Aug 2013 06:11:23 +0000 (08:11 +0200)]
arm: atmel: cpux9k2: board update and enhancement

- fix adresses in env settings in config header
- add missing CONFIG_STANDALONE_LOAD_ADDR to eb_cpux9k2 config header
- remove jffs2 support, board doesn't use this anymore
- add ubifs support
- change sizes and start for partitions

Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agogpio: atmel: add copyright and remove error header info
Bo Shen [Tue, 13 Aug 2013 06:38:32 +0000 (14:38 +0800)]
gpio: atmel: add copyright and remove error header info

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Jens Scharsig <js_at_ng@scharsoft.de>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agogpio: atmel: add gpio common API support
Bo Shen [Tue, 13 Aug 2013 06:38:31 +0000 (14:38 +0800)]
gpio: atmel: add gpio common API support

add gpio common API support for gpio command

Signed-off-by: Bo Shen <voice.shen@atmel.com>
[fix unnecessary cast]
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agogpio: atmel: fix code to use pointer for pio port
Bo Shen [Thu, 22 Aug 2013 07:24:40 +0000 (15:24 +0800)]
gpio: atmel: fix code to use pointer for pio port

fix code to use pointer for pio port as the warning message suggested
remove the warning message

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: atmel: remove the config.mk file
Bo Shen [Tue, 13 Aug 2013 06:50:49 +0000 (14:50 +0800)]
arm: atmel: remove the config.mk file

remove the config.mk file
move text base define to board config file for following boards
  - at91sam9m10g45ek
  - at91sam9x5ek

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: atmel: sama5d3: fix typo error for CONFIG_ENV_IS_NOWHERE
Bo Shen [Sun, 11 Aug 2013 14:26:20 +0000 (14:26 +0000)]
arm: atmel: sama5d3: fix typo error for CONFIG_ENV_IS_NOWHERE

fix typo error for CONFIG_ENV_IS_NOWHERE from CONIG_ENV_IS_NOWHERE

Signed-off-by: Bo Shen <voice.shen@gmail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: sama5d3: remove unused define
Bo Shen [Fri, 9 Aug 2013 07:45:39 +0000 (15:45 +0800)]
arm: sama5d3: remove unused define

The CONFIG_MAX_NAND_CHIPS never used, remove it
No where define LCD_TEST_PATTERN, so no need undefine

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: sama5d3: fix smc cs related registers offset
Bo Shen [Fri, 9 Aug 2013 07:43:09 +0000 (15:43 +0800)]
arm: sama5d3: fix smc cs related registers offset

the smc cs related registers start at 0x600 and loop with 5 registers
so the reserved register should be in at91_smc structure while no in
at91_cs structure. So fix it

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoARM: at91: atmel_nand: add code to check the ONFI parameter ECC requirement
Wu, Josh [Thu, 4 Jul 2013 07:36:23 +0000 (15:36 +0800)]
ARM: at91: atmel_nand: add code to check the ONFI parameter ECC requirement

1. if CONFIG_SYS_NAND_ONFI_DETECTION is defined, driver will check NAND flash's
   ecc minimum requirement in ONFI parameter.

  a) if CONFIG_PMECC_CAP, CONFIG_PMECC_SECTOR_SIZE are defined. then use it.
     Driver will display a WARNING if the values are different from ONFI
     parameters.

  b) if CONFIG_PMECC_CAP, CONFIG_PMECC_SECTOR_SIZE are not defined, then use
      the value from ONFI parameters.
      * If ONFI ECC parameters are in ONFI extended parameter page, since we
        are not support it, so assume the minimum ecc requirement is 2 bits
        in 512 bytes.
      * For non-ONFI support nand flash, also assume the minimum ecc
        requirement is 2 bits in 512 bytes.

2. if CONFIG_SYS_NAND_ONFI_DETECTION is not defined, just use CONFIG_PMECC_CAP
   and CONFIG_PMECC_SECTOR_SIZE.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agomtd: atmel_nand: alloc memory instead of use static array for pmecc data
Wu, Josh [Wed, 3 Jul 2013 03:11:48 +0000 (11:11 +0800)]
mtd: atmel_nand: alloc memory instead of use static array for pmecc data

In this way, the pmecc corraction capbility can change in run time.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agolinux/compat.h: move dev_err, dev_info and dev_dbg from usb driver to compat.h
Wu, Josh [Wed, 3 Jul 2013 03:11:47 +0000 (11:11 +0800)]
linux/compat.h: move dev_err, dev_info and dev_dbg from usb driver to compat.h

Since kernel code current use many dev_xxx() instead of using printk. To
compatible, move those dev_xxx from usb driver to linux/compat.h. Then all
driver code can use dev_err, dev_info and dev_vdbg.

This patch also removed duplicated macro definitions in usb driver.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoARM: at91: sama5d3: remove unused definition about PMECC alpha table offset
Wu, Josh [Wed, 3 Jul 2013 03:11:46 +0000 (11:11 +0800)]
ARM: at91: sama5d3: remove unused definition about PMECC alpha table offset

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoARM: at91: atmel_nand: pmecc driver will select the galois table by sector size
Wu, Josh [Wed, 3 Jul 2013 03:11:45 +0000 (11:11 +0800)]
ARM: at91: atmel_nand: pmecc driver will select the galois table by sector size

Define the galois index table offset in chip head file. So user do not need
to set by himself. Driver will set it correctly according to sector_size.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Scott Wood <scottwood@freescale.com>
[rebased on master]
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: atmel: add nand trimffs subcommand for at91sam9n12 and at91sam9x5
Bo Shen [Wed, 26 Jun 2013 02:48:53 +0000 (10:48 +0800)]
arm: atmel: add nand trimffs subcommand for at91sam9n12 and at91sam9x5

as the at91sam9n12 and at91sam9x5 soc support PMECC, when use u-boot
to flash the rootfs, in order to avoid flash one sector with all 0xff
into NAND, so use nand trimffs subcommand to avoid it

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: atmel: add gmac support for sama5d3xek board
Bo Shen [Wed, 26 Jun 2013 02:11:06 +0000 (10:11 +0800)]
arm: atmel: add gmac support for sama5d3xek board

add gmac support for sama5d3xek board, the gmac embedded in:
  - sama5d33, sama5d34, sama5d35

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agonet: macb: fix the following building warning
Bo Shen [Mon, 19 Aug 2013 02:35:47 +0000 (10:35 +0800)]
net: macb: fix the following building warning

fix the following building warning
---8>---
macb.c: In function 'macb_init':
macb.c:400:14: warning: 'phydev' may be used uninitialized in this function
macb.c:377:21: note: 'phydev' was declared here
---<8---

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Tom Rini [Wed, 21 Aug 2013 20:27:47 +0000 (16:27 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

11 years agofec_mxc: set ethaddr if fuses burned and not previously set
Eric Nelson [Fri, 2 Aug 2013 17:37:00 +0000 (10:37 -0700)]
fec_mxc: set ethaddr if fuses burned and not previously set

Without this change, the following message is generated:
Warning: FEC using MAC address from net device

See doc/README.enetaddr for details.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
11 years agoARM: mxs: Add mx28evk_auart_console target
Andreas Wass [Fri, 16 Aug 2013 16:24:37 +0000 (18:24 +0200)]
ARM: mxs: Add mx28evk_auart_console target

The target uses AUART 3 instead of the DUART for console output.

Signed-off-by: Andreas Wass <andreas.wass@dalelven.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
11 years agoARM: mxs: Added application UART driver
Andreas Wass [Wed, 14 Aug 2013 21:45:03 +0000 (23:45 +0200)]
ARM: mxs: Added application UART driver

The driver makes it possible to use an application UART as
the U-Boot output console for Freescale i.MX23/i.MX28 devices.

Signed-off-by: Andreas Wass <andreas.wass@dalelven.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>
11 years agoi.MX6: nitrogen6x: force HDMI onto IPU0/DI0
Eric Nelson [Tue, 20 Aug 2013 18:44:43 +0000 (11:44 -0700)]
i.MX6: nitrogen6x: force HDMI onto IPU0/DI0

Our Linux kernel switches the HDMI connector onto IPU0/DI1,
but the U-Boot display driver only supports IPU0/DI0 for the
time being.

Because of this, a soft re-boot will leave the HDMI output
connected to the wrong display port and prevent video from
being displayed.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
11 years agoMakefile: Fix build in a separated directory tree
York Sun [Wed, 21 Aug 2013 16:03:29 +0000 (09:03 -0700)]
Makefile: Fix build in a separated directory tree

Fix a bug introduced by commit 3aa29dee
TPL : introduce the TPL based on the SPL

Signed-off-by: York Sun <yorksun@freescale.com>
11 years agoFix for incorrect conversion hex string to number (FMAN firmware address).
Николай Пузанов [Wed, 19 Jun 2013 07:48:44 +0000 (11:48 +0400)]
Fix for incorrect conversion hex string to number (FMAN firmware address).

Signed-off-by: Николай Пузанов <punzik@gmail.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/sec: Add workaround for SEC A-003571
Shengzhou Liu [Thu, 15 Aug 2013 01:31:47 +0000 (09:31 +0800)]
powerpc/sec: Add workaround for SEC A-003571

Multiple read/write transactions initiated by security
engine may cause system to hang.
Workaround: set MCFGR[AXIPIPE] to 0 to avoid hang.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/p1010rdb: fix calculating ddr_freq_mhz
Shengzhou Liu [Tue, 13 Aug 2013 08:41:19 +0000 (16:41 +0800)]
powerpc/p1010rdb: fix calculating ddr_freq_mhz

There was a bug for calculating ddr_freq_mhz,
it should be divided by 1000000 rather than 0x1000000.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/t4240: add QSGMII interface support
Shaohui Xie [Mon, 19 Aug 2013 10:58:52 +0000 (18:58 +0800)]
powerpc/t4240: add QSGMII interface support

Also some fix for QSGMII.
1. fix QSGMII configure of Serdes2.
2. fix PHY address of QSGMII MAC9 & MAC10 for each FMAN.
3. fix dtb for QSGMII interface.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/t4240: fix lanes routing for QSGMII protocols
Shaohui Xie [Mon, 19 Aug 2013 10:57:57 +0000 (18:57 +0800)]
powerpc/t4240: fix lanes routing for QSGMII protocols

When using QSGMII protocols, the first lane and third lane on each slot
need to be swapped.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>