]> git.karo-electronics.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
9 years agoARM: UniPhier: leave the last element of boot_device_table empty
Masahiro Yamada [Thu, 5 Feb 2015 11:56:24 +0000 (20:56 +0900)]
ARM: UniPhier: leave the last element of boot_device_table empty

Checking if the pointer is NULL would be easier to know the tail
of the boot_device_table[] array.
For clarification, add the /* sentinel */ comment.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: refactor pinmon command
Masahiro Yamada [Thu, 5 Feb 2015 11:56:23 +0000 (20:56 +0900)]
ARM: UniPhier: refactor pinmon command

The return value of get_boot_mode_sel() is used as the index of
the boot_device_table[] array.  Its type should be "int" rather
than "u32".

Use only the iterator "i" for the loop in do_pinmon().

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: enable I2C input pins for PH1-sLD8
Masahiro Yamada [Thu, 5 Feb 2015 05:43:00 +0000 (14:43 +0900)]
ARM: UniPhier: enable I2C input pins for PH1-sLD8

To use I2C controllers on PH1-sLD8, the bit 10 (SCL0/SDA0)
and bit 11 (SCL1/SDA1) of IECTRL register must be set.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: do not compile unnecessary objects
Masahiro Yamada [Thu, 5 Feb 2015 05:42:58 +0000 (14:42 +0900)]
ARM: UniPhier: do not compile unnecessary objects

It is true that unused functions are removed from the ELF image
by the compiler's garbage collection but relying on it too much
does not look nice.
Currently, the build is taking more than it should.

Refactor the makefiles to compile only files that are really needed.
CONFIG_SOC_INIT and CONFIG_DRAM_INIT are no longer needed by the
optimization.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: remove unused checkboard() functions
Masahiro Yamada [Thu, 5 Feb 2015 05:42:57 +0000 (14:42 +0900)]
ARM: UniPhier: remove unused checkboard() functions

Since commit 0365ffcc0bd6 (generic-board: show model name in
board_init_f() too), checkboard() is invoked only when
show_board_info() fails to get the model name from Device Tree.
It never happens because UniPhier SoCs now only work with
CONFIG_OF_CONTROL and all the root nodes of UniPhier device trees
have the "model" property.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: revive support card info
Masahiro Yamada [Thu, 5 Feb 2015 05:42:56 +0000 (14:42 +0900)]
ARM: UniPhier: revive support card info

Since commit 0365ffcc0bd6 (generic-board: show model name in
board_init_f() too), the support card information has not been
displayed because check_support_card() is invoked only when
show_board_info() fails to get the model name from Device Tree.

This commit adds misc_init_f() function to call check_support_card()
from there.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: move SPL init functions to spl_board_init()
Masahiro Yamada [Thu, 5 Feb 2015 05:42:55 +0000 (14:42 +0900)]
ARM: UniPhier: move SPL init functions to spl_board_init()

Now init functions called from board_postclk_init() and dram_init()
are only necessary for SPL.
Move them to spl_board_init() for clean-up.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: move pin_init() to board_early_init_f()
Masahiro Yamada [Thu, 5 Feb 2015 05:42:54 +0000 (14:42 +0900)]
ARM: UniPhier: move pin_init() to board_early_init_f()

Currently, I/O pin settings are not necessary for SPL.
The board_early_init_f() seems a suitable place to call pin_init().

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: set I2C offset length of on-board EEPROM in DTS
Masahiro Yamada [Thu, 5 Feb 2015 05:30:26 +0000 (14:30 +0900)]
ARM: UniPhier: set I2C offset length of on-board EEPROM in DTS

The EEPROM chips on UniPhier reference daughter boards expect 2-byte
offset address.

Since 7132b9fd68a1 (dm: i2c: dts: Support an offset-len device tree
property), I2C sub-nodes can have "u-boot,i2c-offset-len" property.

It is convenient to set the default I2C offset address length in
Device Tree, so that we do not have to set it on the command line.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: move EEPROM device node into a separate DTS
Masahiro Yamada [Thu, 5 Feb 2015 05:30:25 +0000 (14:30 +0900)]
ARM: UniPhier: move EEPROM device node into a separate DTS

This EEPROM chip is installed on the expansion board commonly used
on UniPhier platform.  To avoid duplicated description, move the
EEPROM node to a separate file and include it from other device tree
sources.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoMAINTAINERS: claim maintainership of files with "uniphier" pattern
Masahiro Yamada [Thu, 5 Feb 2015 05:30:24 +0000 (14:30 +0900)]
MAINTAINERS: claim maintainership of files with "uniphier" pattern

The pattern "N:    uniphier" can cover
  - drivers/serial/serial_uniphier.c
  - drivers/i2c/i2c-uniphier.c
  - drivers/i2c/i2c-uniphier-f.c
  - arch/arm/dts/uniphier-*

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: add a simple README file for UniPhier platform
Masahiro Yamada [Thu, 5 Feb 2015 05:30:23 +0000 (14:30 +0900)]
ARM: UniPhier: add a simple README file for UniPhier platform

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: add environment variable to update images in NAND
Masahiro Yamada [Thu, 5 Feb 2015 05:30:22 +0000 (14:30 +0900)]
ARM: UniPhier: add environment variable to update images in NAND

To boot UniPhier boards with the NAND boot mode, two images
(u-boot-spl.bin and u-boot-dtb.img) must be written at the correct
offset addresses.

TFTP downloading is useful to update such images in the NAND device.
We generally do:

  => nand erase 0 0x100000
  => tftpboot u-boot-spl.bin
  => nand write $loadaddr 0 0x10000
  => tftpboot u-boot-dtb.img
  => nand write $loadaddr 0x10000 0xf0000

It is a tedious and error-prone operation.

This commit provides the shorthand:

  => run nandupdate

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: use "&&" instead of "; " in commands
Masahiro Yamada [Thu, 5 Feb 2015 05:30:21 +0000 (14:30 +0900)]
ARM: UniPhier: use "&&" instead of "; " in commands

Run the next command only when the previous one succeeded.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agoARM: UniPhier: remove dummy gpio.h
Masahiro Yamada [Tue, 3 Feb 2015 04:51:36 +0000 (13:51 +0900)]
ARM: UniPhier: remove dummy gpio.h

This dummy header was introduced by commit 630bf80ebb34 (ARM:
UniPhier: add dummy gpio.h to enable CONFIG_OF_CONTROL).

Thanks to commit a08d643dbd85 (dm: Drop gpio.h header from
fdtdec.c), such an ugly workaround is no longer needed.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
9 years agox86: Make CAR and DRAM FSP code common
Simon Glass [Wed, 28 Jan 2015 05:13:38 +0000 (22:13 -0700)]
x86: Make CAR and DRAM FSP code common

For now this code seems to be the same for all FSP platforms. Make it
common until we see what differences are required.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: Adjust the FSP types slightly
Simon Glass [Wed, 28 Jan 2015 05:13:37 +0000 (22:13 -0700)]
x86: Adjust the FSP types slightly

To avoid casts, find_fsp_header() should return a pointer. Add asmlinkage
to two API functions which use that convention. UPD_TERMINATOR is common
so move it into a common file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: Move common FSP code into a common location
Simon Glass [Wed, 28 Jan 2015 05:13:36 +0000 (22:13 -0700)]
x86: Move common FSP code into a common location

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: bootstage: Add time measurement for vesa start-up
Simon Glass [Wed, 28 Jan 2015 05:13:35 +0000 (22:13 -0700)]
x86: bootstage: Add time measurement for vesa start-up

Since we must run a PCI BIOS ROM, and this can take a calamitous amount of
time, measure it using bootstage.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: video: Allow video ROM execution to fall back to the other method
Simon Glass [Wed, 28 Jan 2015 05:13:34 +0000 (22:13 -0700)]
x86: video: Allow video ROM execution to fall back to the other method

If the BIOS emulator is not available, allow use of native execution if
available, and vice versa. This can be controlled by the caller.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: Rename MMCONF_BASE_ADDRESS and make it common across x86
Simon Glass [Wed, 28 Jan 2015 05:13:33 +0000 (22:13 -0700)]
x86: Rename MMCONF_BASE_ADDRESS and make it common across x86

This setting will be used by more than just ivybridge so make it common.

Also rename it to PCIE_ECAM_BASE which is a more descriptive name.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: Add an option to enabling building a ROM file
Simon Glass [Wed, 28 Jan 2015 05:13:32 +0000 (22:13 -0700)]
x86: Add an option to enabling building a ROM file

Rather than requiring the Makefile to be modified, provide a build option to
enable the ROM to be built.

We cannot do this by default since it requires binary blobs. Without these
the build will fail.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agousb: pci: Add XHCI driver for PCI
Simon Glass [Wed, 28 Jan 2015 05:13:31 +0000 (22:13 -0700)]
usb: pci: Add XHCI driver for PCI

Add a driver which locates the available XHCI controllers on the PCI bus
and makes them available.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agousb: pci: Use pci_find_class() to find the device
Simon Glass [Wed, 28 Jan 2015 05:13:30 +0000 (22:13 -0700)]
usb: pci: Use pci_find_class() to find the device

Use the new utility function instead of local code.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: video: Enable video for Minnowboard Max
Simon Glass [Wed, 28 Jan 2015 05:13:29 +0000 (22:13 -0700)]
x86: video: Enable video for Minnowboard Max

This board uses a new PCI ID.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: pci: Add PCI IDs for Minnowboard Max
Simon Glass [Wed, 28 Jan 2015 05:13:28 +0000 (22:13 -0700)]
x86: pci: Add PCI IDs for Minnowboard Max

This board includes a few IDs we have not seen before.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agopci: Add a function to find a device by class
Simon Glass [Wed, 28 Jan 2015 05:13:27 +0000 (22:13 -0700)]
pci: Add a function to find a device by class

There is an existing function prototype in the header file but it is not
implemented. Implement something similar.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agox86: Enhance the microcode tool to support header files as input
Simon Glass [Wed, 28 Jan 2015 05:13:26 +0000 (22:13 -0700)]
x86: Enhance the microcode tool to support header files as input

Sometimes microcode is delivered as a header file. Allow the tool to
support this as well as collecting multiple microcode blocks into a
single update.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
9 years agoarm: Show relocated PC/LR in the register dump
Simon Glass [Fri, 30 Jan 2015 19:04:56 +0000 (12:04 -0700)]
arm: Show relocated PC/LR in the register dump

If we don't know the relocation address, the raw values are not very useful.
Show the pre-relocation values as well as these can be looked up in
System.map, etc.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
9 years agoconfigs/ls2085a: Add support for Cortex-A57 erratas
Bhupesh Sharma [Fri, 23 Jan 2015 10:20:05 +0000 (15:50 +0530)]
configs/ls2085a: Add support for Cortex-A57 erratas

This patch adds support for handling 828024 and 826974 erratas
for Cortex-A57 cores present on LS2085A SoC.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com>
9 years agoErrata/ARM57: Add basic constructs to handle and apply A57 specific erratas
Bhupesh Sharma [Fri, 23 Jan 2015 10:20:04 +0000 (15:50 +0530)]
Errata/ARM57: Add basic constructs to handle and apply A57 specific erratas

This patch adds basic constructs in the ARMv8 u-boot code
to handle and apply Cortex-A57 specific erratas.

As and example, the framework showcases how erratas 833069, 826974
and 828024 can be handled and applied.

Later on this framework can be extended to include other
erratas.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com>
9 years agoarm, imx6, aristainetos: board updates
Heiko Schocher [Tue, 20 Jan 2015 09:06:18 +0000 (10:06 +0100)]
arm, imx6, aristainetos: board updates

- use linux display timing settings
- change backlight duty cycle 500ns
- some defaultenvironment changes
- change fit_addr_r to 0x14000000 as needed if
  MAX_LOCKDEP_SUBCLASSES in linux gets increased.
- Environment now at 0xd0000 in nand flash

Signed-off-by: Heiko Schocher <hs@denx.de>
9 years agocommon: convert compulab splash load code to common code
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:54 +0000 (10:42 +0200)]
common: convert compulab splash load code to common code

Move board/compulab/common/splash.c code to
common/splash_source.c to make it available for everybody. This move
renames cl_splash_screen_prepare() to splash_source_load(), and
the compilation of this code is conditional on CONFIG_SPLASH_SOURCE.

splash_source features:
* Provide a standardized way for declaring board specific splash screen
  locations
* Provide existing routines for auto loading the splash image from the
  locations as declared by the board
* Introduce the "splashsource" environment variable, which makes it
  possible to select the splash image source.

cm-t35 and cm-fx6 are updated to use the modified version.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Tom Rini <trini@ti.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: add splash screen support
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:53 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: add splash screen support

Add support for splash screen.
The splash screen is loaded from the SPI flash and is displayed on the
HDMI display.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
[grinberg@compulab.co.il: minor code and commit message updates]
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
9 years agocompulab: splash: support loading splash from sf
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:52 +0000 (10:42 +0200)]
compulab: splash: support loading splash from sf

Add support for loading splash from sf.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
[grinberg@compulab.co.il: staticize the sf global variable]
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
9 years agocompulab: splash: support multiple splash sources
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:51 +0000 (10:42 +0200)]
compulab: splash: support multiple splash sources

Define a generic way for boards to define splash image locations:
- introduce struct splash_location
- introduce enum splash_storage
- update cl_splash_screen_prepare() to take an array of above struct
  and select the appropriate one based on the splashsource environment
  variable (if it is not defined- use the first splash location as default).

cm-t35 is updated to work with the new interface.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agocompulab: splash: refactor splash.c
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:50 +0000 (10:42 +0200)]
compulab: splash: refactor splash.c

Move storage device specific code into its own function instead of
calling it directly from an otherwise storage device independent
function (cl_splash_screen_prepare).

This is a preparation for supporting multiple splash locations.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agocompulab: splash: use errno values
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:49 +0000 (10:42 +0200)]
compulab: splash: use errno values

Use errno values to improve return reporting.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: add support for usb keyboard
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:48 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: add support for usb keyboard

Add support for usb keyboard for cm_fx6.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: display compulab logo
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:47 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: display compulab logo

Add compulab logo and display it on boot.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: add hdmi console support
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:46 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: add hdmi console support

Add support for hdmi console.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: increase size of malloc area
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:45 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: increase size of malloc area

Increase size of malloc area to make room for framebuffer
and other such big allocations.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: pass 2nd nic mac addr to Linux
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:44 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: pass 2nd nic mac addr to Linux

Obtain 2nd NIC MAC address from baseboard EEPROM and pass it to Linux.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agocompulab: eeprom: allow reading mac address from multiple eeproms
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:43 +0000 (10:42 +0200)]
compulab: eeprom: allow reading mac address from multiple eeproms

Implement the option to select the eeprom i2c bus when reading mac
address.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Ilya Ledvich <ilya@compulab.co.il>
Cc: Dmitry Lifshitz <lifshitz@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: change dtb node for ethaddr
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:42 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: change dtb node for ethaddr

When passing eth address to Linux via dtb, the "local-mac-address"
property should be set for "/soc/aips-bus@02100000/ethernet@02188000",
not "/fec".

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoarm: mx6: cm-fx6: expand boot sequence
Nikita Kiryanov [Wed, 14 Jan 2015 08:42:41 +0000 (10:42 +0200)]
arm: mx6: cm-fx6: expand boot sequence

Expand boot sequence to the following order:
1) mmc boot: mmc boot script, then mmc bootm, then mmc bootz.
2) usb boot: usb boot script.
3) sata boot: sata boot script, sata bootm, sata bootz.
4) nand boot: nand bootm, then nand bootz.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
9 years agoubifs: Enable journal replay during mount
Anton Habegger [Thu, 22 Jan 2015 21:29:11 +0000 (22:29 +0100)]
ubifs: Enable journal replay during mount

Enable ubifs_replay_journal during mount_ubifs, which was
disabled before.

This commit fix an issue with unrecoverable ubifs volumes
after power cut.

Therefor the gc.c is imported now from 1860e37 Linux 3.15

hs: added SPDX-License-Identifier for fs/ubifs/gc.c

Signed-off-by: Anton Habegger <anton.habegger@gmail.com>
9 years agoubifs: Import atomic_long operations from Linux
Anton Habegger [Thu, 22 Jan 2015 21:29:10 +0000 (22:29 +0100)]
ubifs: Import atomic_long operations from Linux

This commit is a preperation for a subsequent UBIFS commit
which needs atomic_long operations.

Therefor "include/asm-generic/atomic-long.h" is imported
from 1860e37 Linux 3.15

Signed-off-by: Anton Habegger <anton.habegger@gmail.com>
9 years agoubi: reset mtd_devs when ubi part fail
Heiko Schocher [Tue, 20 Jan 2015 08:05:23 +0000 (09:05 +0100)]
ubi: reset mtd_devs when ubi part fail

if "ubi part" fails, reset also mtd_devs to 0, as
further "ubi part" would use wrong mtd_devs.

Signed-off-by: Heiko Schocher <hs@denx.de>
9 years agoot1200: add ot1200_spl_defconfig file
Christian Gmeiner [Mon, 19 Jan 2015 16:26:50 +0000 (17:26 +0100)]
ot1200: add ot1200_spl_defconfig file

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>#
9 years agoot1200: add basic SPL support
Christian Gmeiner [Mon, 19 Jan 2015 16:26:49 +0000 (17:26 +0100)]
ot1200: add basic SPL support

Currently we only support the Micron MT41K128M16JT-125 ddr3 chip.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
9 years agoot1200: add SPL configuration
Christian Gmeiner [Mon, 19 Jan 2015 16:26:48 +0000 (17:26 +0100)]
ot1200: add SPL configuration

We will only support loading u-boot.img from SPI flash stored
at the offset of 64k.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
9 years agoot1200: enable spi clock directly in ccgr_init(..)
Christian Gmeiner [Mon, 19 Jan 2015 16:26:47 +0000 (17:26 +0100)]
ot1200: enable spi clock directly in ccgr_init(..)

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
9 years agoot1200: move ccgr and gpr init to c functions
Christian Gmeiner [Mon, 19 Jan 2015 16:26:46 +0000 (17:26 +0100)]
ot1200: move ccgr and gpr init to c functions

We need this way for SPL boot.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
9 years agoot1200: make use of imx_ddr_size(..)
Christian Gmeiner [Mon, 19 Jan 2015 16:26:45 +0000 (17:26 +0100)]
ot1200: make use of imx_ddr_size(..)

To support different ddr3 memory sizes we should start using
imx_ddr_size(..) instead of the define PHYS_SDRAM_SIZE.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
9 years agoot1200: select SUPPORT_SPL
Christian Gmeiner [Mon, 19 Jan 2015 16:26:44 +0000 (17:26 +0100)]
ot1200: select SUPPORT_SPL

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
9 years agomx6: fix warning in platinum board
Stefano Babic [Thu, 22 Jan 2015 09:09:00 +0000 (10:09 +0100)]
mx6: fix warning in platinum board

Fix warning due to missing prototype for writel

Signed-off-by: Stefano Babic <sbabic@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
9 years agoimx: mx6: Change ENV offset to 512K bytes for larger u-boot image
Ye.Li [Fri, 16 Jan 2015 08:47:44 +0000 (16:47 +0800)]
imx: mx6: Change ENV offset to 512K bytes for larger u-boot image

To align with other mx6 boards, change ENV offset from 384KB to
512KB position to fit a larger u-boot image.

Signed-off-by: Ye.Li <B37916@freescale.com>
9 years agoimx:mx6sxsabresd board spl support
Peng Fan [Tue, 30 Dec 2014 09:24:03 +0000 (17:24 +0800)]
imx:mx6sxsabresd board spl support

Add board level spl support for mx6sxsabresd board.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agoimx:mx6 add mx6sx in imx spl header file
Peng Fan [Tue, 30 Dec 2014 09:24:02 +0000 (17:24 +0800)]
imx:mx6 add mx6sx in imx spl header file

Since mx6sx's memory space is different to mx6dq, redefine the SPL
related macro for mx6sx chip.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agoimx:mx6sx add dram io configure for mx6sx
Peng Fan [Tue, 30 Dec 2014 09:24:01 +0000 (17:24 +0800)]
imx:mx6sx add dram io configure for mx6sx

Define two structure mx6sx_iomux_ddr_regs and mx6sx_iomux_grp_regs.
Add a new function mx6sx_dram_iocfg to configure dram io.

Since mx6sx only have one channel mmdc0, define a new empty macro MMDC1
to replace mmdc1->entry=value for mx6sx. And to other mx6 soc, MMDC1
effects as "mmdc1->entry=value".

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agoimx:mx6sxsabresd spl support in header file
Peng Fan [Tue, 30 Dec 2014 09:24:00 +0000 (17:24 +0800)]
imx:mx6sxsabresd spl support in header file

Add SPL support in mx6sxsabresd header file.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agoimx:mx6sxsabresd select SUPPORT_SPL
Peng Fan [Tue, 30 Dec 2014 09:23:59 +0000 (17:23 +0800)]
imx:mx6sxsabresd select SUPPORT_SPL

select SUPPORT_SPL for mx6sxsabresd.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agoimx:mx6sxsabresd add spl config file
Peng Fan [Tue, 30 Dec 2014 09:23:58 +0000 (17:23 +0800)]
imx:mx6sxsabresd add spl config file

Add a SPL default configuration file for mx6sxsabresd board.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agomxsboot : Support of 224-bytes OOB area length
Alexandre Coffignal [Thu, 8 Jan 2015 16:14:42 +0000 (17:14 +0100)]
mxsboot : Support of 224-bytes OOB area length

Add support for the NAND Flash chip with page size of 4096+224-bytes OOB area length

For example Micron MT29F4G08 NAND flash device defines a OOB area which is
224 bytes long (oobsize).

Signed-off-by: Alexandre Coffignal <acoffignal@geral.com>
9 years agoarm: mx6: Add Barco platinum-picon and platinum-titanium
Stefan Roese [Wed, 10 Dec 2014 09:15:23 +0000 (10:15 +0100)]
arm: mx6: Add Barco platinum-picon and platinum-titanium

This patch adds the new Barco platinum platform. It currently
includes those two boards:

platinum-titanium
-----------------
This is the same board as the titanium that is already supported in
mainline U-Boot. But its now moved to this new platform to support
multiple "flavors" of imx6 boards in one directory. Its also moved
to support SPL booting. And with this we use the run-time DDR
configuration of this SPL support. The board is equipped with the
Micron MT41J128M16JT-125 DDR chips. We now can remove the DDR
related registers tuples from the imximage.cfg file. As all this
is done in the SPL at run-time.

platinum-picon
--------------
This board is new and based on the MX6DL with 1GiB DDR using the
Micron MT41K256M16HA DDR3 chips. Its also equipped with 2 NAND
chips (each 512MiB).

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Pieter Ronsijn <pieter.ronsijn@barco.com>
9 years agomx6sxsabresd: Remove unneeded board_late_init()
Fabio Estevam [Mon, 29 Dec 2014 18:23:17 +0000 (16:23 -0200)]
mx6sxsabresd: Remove unneeded board_late_init()

Since commit 1f98e31bc0b2c37a ("imx: mx6sxsabresd: Use the pfuze common init
function") board_late_init() became empty, so we can safely remove this unneeded
function.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
9 years agowandboard: Use 32bit color depth for Fusion LCD
Otavio Salvador [Thu, 15 Jan 2015 15:32:29 +0000 (13:32 -0200)]
wandboard: Use 32bit color depth for Fusion LCD

The Fusion LCD needs the 32bit color depth to properly work; the
default is different on the 3.10.17 kernels and it is better to ensure
it work out of box using proper default color setting.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9 years agofdt: fixup changes from commit 7a172ae7a3fc
Lothar Waßmann [Tue, 25 Aug 2015 08:32:43 +0000 (10:32 +0200)]
fdt: fixup changes from commit 7a172ae7a3fc

commit 7a172ae7a3fc "fdt: fix incorrect placement of partition information for atmel_nand"
breaks the placement of the mtd partitions for other nand drivers.
Correct the condition to break out of the loop searching for subnodes
to fix this.

9 years agokaro: tx6: add missing secure_boot config for various modules
Lothar Waßmann [Mon, 24 Aug 2015 19:13:56 +0000 (21:13 +0200)]
karo: tx6: add missing secure_boot config for various modules

9 years agokaro: tx6: add missing module variants TX6Q-1033
Lothar Waßmann [Mon, 24 Aug 2015 19:12:28 +0000 (21:12 +0200)]
karo: tx6: add missing module variants TX6Q-1033

9 years agokaro: tx6: add missing config options to various module variants
Lothar Waßmann [Mon, 24 Aug 2015 19:11:13 +0000 (21:11 +0200)]
karo: tx6: add missing config options to various module variants

9 years agokaro: tx6: write FDT to same eMMC partition that is selected for boot
Lothar Waßmann [Mon, 24 Aug 2015 14:57:39 +0000 (16:57 +0200)]
karo: tx6: write FDT to same eMMC partition that is selected for boot

9 years agokaro: tx6: fix MFG-U-Boot environment setting
Lothar Waßmann [Mon, 24 Aug 2015 14:56:51 +0000 (16:56 +0200)]
karo: tx6: fix MFG-U-Boot environment setting

9 years agokaro: tx6: set 'CONFIG_ENV_IS_... appropriately for _mfg U-Boot
Lothar Waßmann [Mon, 24 Aug 2015 14:55:49 +0000 (16:55 +0200)]
karo: tx6: set 'CONFIG_ENV_IS_... appropriately for _mfg U-Boot

9 years agoMerge branch 'karo-tx-uboot' into kc-merge
Lothar Waßmann [Mon, 24 Aug 2015 11:45:51 +0000 (13:45 +0200)]
Merge branch 'karo-tx-uboot' into kc-merge

Conflicts:
board/karo/common/mmc.c
board/karo/tx6/Makefile
board/karo/tx6/pmic.c
board/karo/tx6/pmic.h
board/karo/tx6/tx6qdl.c
boards.cfg
include/configs/tx6.h

9 years agoMerge remote-tracking branch 'remotes/tx6/tx6' into karo-tx-uboot
Lothar Waßmann [Fri, 21 Aug 2015 14:51:29 +0000 (16:51 +0200)]
Merge remote-tracking branch 'remotes/tx6/tx6' into karo-tx-uboot

9 years agoMerge remote-tracking branch 'remotes/tx28/tx28' into karo-tx-uboot
Lothar Waßmann [Fri, 21 Aug 2015 14:51:29 +0000 (16:51 +0200)]
Merge remote-tracking branch 'remotes/tx28/tx28' into karo-tx-uboot

9 years agoARM: mxs: use CONFIG_SPL_STACK to set up SPL stack pointer
Lothar Waßmann [Fri, 21 Aug 2015 14:49:20 +0000 (16:49 +0200)]
ARM: mxs: use CONFIG_SPL_STACK to set up SPL stack pointer

9 years agoARM: mxs: various bug fixes for power init code
Lothar Waßmann [Fri, 21 Aug 2015 14:45:39 +0000 (16:45 +0200)]
ARM: mxs: various bug fixes for power init code

- use correct register for bo_irq in mxs_power_set_vddx()
- limit BO values to legal values in mxs_power_set_vddx()
- disable charger in mxs_is_batt_good() independent from the measured
  voltage

9 years agokaro: tx28: reduce batt_bo_level to 2.4V
Lothar Waßmann [Fri, 21 Aug 2015 14:44:45 +0000 (16:44 +0200)]
karo: tx28: reduce batt_bo_level to 2.4V

9 years agotools: elftosb: use legacy elftosb instead of mkimage
Lothar Waßmann [Fri, 21 Aug 2015 14:44:44 +0000 (16:44 +0200)]
tools: elftosb: use legacy elftosb instead of mkimage

9 years agoimx: add missing definition for hw_bch_debug0 reg
Lothar Waßmann [Fri, 21 Aug 2015 14:44:43 +0000 (16:44 +0200)]
imx: add missing definition for hw_bch_debug0 reg

9 years agoimx: add missing definitions for hw_gpmi_debug[23] regs
Lothar Waßmann [Fri, 21 Aug 2015 14:44:43 +0000 (16:44 +0200)]
imx: add missing definitions for hw_gpmi_debug[23] regs

9 years agokaro: tx28: change fdtaddr to 40800000
Lothar Waßmann [Fri, 21 Aug 2015 14:44:42 +0000 (16:44 +0200)]
karo: tx28: change fdtaddr to 40800000

9 years agokaro: tx28: remove CONFIG_ENV_IS_NOWHERE from configs
Lothar Waßmann [Fri, 21 Aug 2015 14:44:42 +0000 (16:44 +0200)]
karo: tx28: remove CONFIG_ENV_IS_NOWHERE from configs

This setting is now selected in board/karo/tx28/Kconfig

9 years agokaro: tx28: romupdate: update to match tx6 version
Lothar Waßmann [Fri, 21 Aug 2015 14:44:41 +0000 (16:44 +0200)]
karo: tx28: romupdate: update to match tx6 version

9 years agokaro: tx28: adjust parameters to mxs_common_spl_init() to match new U-Boot version
Lothar Waßmann [Fri, 21 Aug 2015 14:44:40 +0000 (16:44 +0200)]
karo: tx28: adjust parameters to mxs_common_spl_init() to match new U-Boot version

9 years agonet: fec: remove obsolete FEC_MXC_MULTI
Lothar Waßmann [Fri, 21 Aug 2015 14:44:40 +0000 (16:44 +0200)]
net: fec: remove obsolete FEC_MXC_MULTI

9 years agoARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_...
Lothar Waßmann [Fri, 21 Aug 2015 14:44:39 +0000 (16:44 +0200)]
ARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_bo'" error

9 years agokaro: tx28: spl: export CONFIG_SPL_TEXT_BASE via CPPFLAGS to make it available in...
Lothar Waßmann [Fri, 21 Aug 2015 14:44:38 +0000 (16:44 +0200)]
karo: tx28: spl: export CONFIG_SPL_TEXT_BASE via CPPFLAGS to make it available in linker script

9 years agotx28: config.mk: fix build error: "No rule to make target `.u-boot.sb"'
Lothar Waßmann [Fri, 21 Aug 2015 14:44:38 +0000 (16:44 +0200)]
tx28: config.mk: fix build error: "No rule to make target `.u-boot.sb"'

9 years agokaro: tx28: use CONFIG_SYS_SDRAM_SIZE instead of CONFIG_SDRAM_SIZE
Lothar Waßmann [Fri, 21 Aug 2015 14:44:37 +0000 (16:44 +0200)]
karo: tx28: use CONFIG_SYS_SDRAM_SIZE instead of CONFIG_SDRAM_SIZE

9 years agokaro: tx28: replace SETUP_IOMUX_PAD macro with mxs_iomux_setup_pad() call
Lothar Waßmann [Fri, 21 Aug 2015 14:44:37 +0000 (16:44 +0200)]
karo: tx28: replace SETUP_IOMUX_PAD macro with mxs_iomux_setup_pad() call

9 years agokaro: tx28: update Kconfig
Lothar Waßmann [Fri, 21 Aug 2015 14:44:36 +0000 (16:44 +0200)]
karo: tx28: update Kconfig

9 years agogpio: mxs: fix prototype of gpio_set_value()
Lothar Waßmann [Fri, 21 Aug 2015 14:44:35 +0000 (16:44 +0200)]
gpio: mxs: fix prototype of gpio_set_value()

9 years agoKconfig: add Kconfig option for MXS_MMC
Lothar Waßmann [Fri, 21 Aug 2015 14:44:35 +0000 (16:44 +0200)]
Kconfig: add Kconfig option for MXS_MMC

9 years agoARM: mxs: add missing ';' after mxs_reg_32() macro calls
Lothar Waßmann [Fri, 21 Aug 2015 14:44:34 +0000 (16:44 +0200)]
ARM: mxs: add missing ';' after mxs_reg_32() macro calls

9 years agoarm: mxs: remove conflict markers from merge
Lothar Waßmann [Fri, 21 Aug 2015 14:44:32 +0000 (16:44 +0200)]
arm: mxs: remove conflict markers from merge

9 years agommc: improve error handling of emmc bootpart related subcommands
Lothar Waßmann [Fri, 21 Aug 2015 14:30:15 +0000 (16:30 +0200)]
mmc: improve error handling of emmc bootpart related subcommands