]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
10 years agoarm: ls102xa: Remove bit reversing for SCFG registers
Alison Wang [Fri, 17 Oct 2014 07:26:33 +0000 (15:26 +0800)]
arm: ls102xa: Remove bit reversing for SCFG registers

SCFG_SCFGREVCR is SCFG bit reverse register. This register
must be written with 0xFFFFFFFF before writing to any other
SCFG register. Then other SCFG register could be written in
big-endian mode.

Address: 157_0000h base + 200h offset = 157_0200h
Bit   0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15|16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
W/R                                   SCFGREV
Reset 0 0 0 0 0 0 0 0 0 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
0-31
SCFGREV SCFG Bit Reverse Control Filed
32'h 0000_0000 - No bit reverse is applied
32'h FFFF_FFFF - Bit reverse is applied; so 31:0 will be stored/read as
0:31

This patch removes the bit reversing for SCFG registers in
u-boot. It will be implemented through PBI commands in RCW
.pbi
write 0x570200, 0xffffffff
.end
So other SCFG register could be written in big-endian mode
in u-boot or kernel directly.

Signed-off-by: Alison Wang <alison.wang@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoarm: ls102xa: Add snoop disable for slave port 0, 1 and 2
Jason Jin [Fri, 17 Oct 2014 07:26:32 +0000 (15:26 +0800)]
arm: ls102xa: Add snoop disable for slave port 0, 1 and 2

Disable the snoop for slave interface 0, 1 and 2
to avoid the interleaving on the CCI400 BUS.

Signed-off-by: Jason Jin <Jason.Jin@freescale.com>
Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agols1: config: Enable USB EHCI Host on LS1021AQDS
Nikhil Badola [Fri, 17 Oct 2014 06:07:25 +0000 (11:37 +0530)]
ls1: config: Enable USB EHCI Host on LS1021AQDS

Enable USB EHCI Host on LS1021AQDS

Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agodrivers: usb: fsl: Define USB configs for LS102XA
Nikhil Badola [Fri, 17 Oct 2014 06:05:46 +0000 (11:35 +0530)]
drivers: usb: fsl: Define USB configs for LS102XA

Define USB configs for LS1021XA such as CONFIG_SYS_FSL_USB1_ADDR,
CONFIG_USB_MAX_CONTROLLER_COUNT

Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agodrivers : usb: fsl: Implement usb Erratum A007798 workaround
Nikhil Badola [Fri, 17 Oct 2014 03:42:07 +0000 (09:12 +0530)]
drivers : usb: fsl: Implement usb Erratum A007798 workaround

Set TXFIFOTHRESH to adjust ddr pipeline delay for successful large
usb writes

Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agodrivers: usb: fsl: Move USB Errata checking code
Nikhil Badola [Tue, 30 Sep 2014 05:52:43 +0000 (11:22 +0530)]
drivers: usb: fsl: Move USB Errata checking code

Move USB Errata checking code from "arch/powerpc" to architecture independent
file "fsl_usb.h" so that errata(s) become independent of the architecture.
For each erratum checking function for PPC arch, define a nop function for
non PPC arch for successful compilation in either case

Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agou_qe: add u_qe_upload_firmware for u_qe
Zhao Qiang [Tue, 4 Nov 2014 05:46:16 +0000 (13:46 +0800)]
u_qe: add u_qe_upload_firmware for u_qe

Signed-off-by: Zhao Qiang <B45475@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoarm: ls102xa: Fixed a register definition error
Tang Yuantian [Thu, 9 Oct 2014 08:11:37 +0000 (16:11 +0800)]
arm: ls102xa: Fixed a register definition error

There are 8 SCFG_SPARECR registers in SCFG memory block, not one.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoqe: add qe support for ls1021a-twr board
Zhao Qiang [Fri, 26 Sep 2014 08:25:33 +0000 (16:25 +0800)]
qe: add qe support for ls1021a-twr board

Signed-off-by: Zhao Qiang <B45475@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoqe: add qe support to ls1021aqds
Zhao Qiang [Fri, 26 Sep 2014 08:25:32 +0000 (16:25 +0800)]
qe: add qe support to ls1021aqds

add qe support to ls1021aqds

Signed-off-by: Zhao Qiang <B45475@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoqe: add u-qe support to arm board
Zhao Qiang [Thu, 25 Sep 2014 05:52:25 +0000 (13:52 +0800)]
qe: add u-qe support to arm board

ls1021 is arm-core and support qe which is u-qe.
add u-qe init for arm board.

Signed-off-by: Zhao Qiang <B45475@freescale.com>
[York Sun: Fix compiling error caused by u_qe_init()]
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoARM: atmel: add sama5d4 xplained ultra board support
Bo Shen [Mon, 10 Nov 2014 07:46:22 +0000 (15:46 +0800)]
ARM: atmel: add sama5d4 xplained ultra board support

The code for this board supports following features:
  - Boot media support: NAND flash/SD card/SPI flash
  - Support LCD display (optional, disabled by default)
  - Support ethernet
  - Support USB mass storage

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoARM: atmel: add sama5d4ek board support
Bo Shen [Mon, 10 Nov 2014 07:24:02 +0000 (15:24 +0800)]
ARM: atmel: add sama5d4ek board support

The code for this board supports following features:
  - Boot media support: NAND flash/SD card/SPI flash
  - Support LCD display
  - Support ethernet
  - Support USB mass storage

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agonet: macb: enable GMAC IP without GE feature support
Bo Shen [Mon, 10 Nov 2014 07:24:01 +0000 (15:24 +0800)]
net: macb: enable GMAC IP without GE feature support

The User Register in GMAC IP is used to select interface type.
When with GE feature, it is used to select interface between
RGMII and GMII. If without GE feature, it is used to select
interface between MII and RMII.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agomtd: atmel_nand: runtime to build gf table for pmecc
Josh Wu [Mon, 10 Nov 2014 07:24:00 +0000 (15:24 +0800)]
mtd: atmel_nand: runtime to build gf table for pmecc

As in SAMA5D4 SoC, the gf table in ROM code can not be seen.
So, when we try to use PMECC, we need to build it when do
initialization.
Add a macro NO_GALOIS_TABLE_IN_ROM in soc header file. If it
is defined we will build gf table runtime.

The PMECC use the BCH algorithm, so based on the build_gf_tables()
function in lib/bch.c, we can build the Galois Field lookup table.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, spl, at91: add spl support for the corvus board
Heiko Schocher [Fri, 31 Oct 2014 07:31:06 +0000 (08:31 +0100)]
arm, spl, at91: add spl support for the corvus board

replaces the at91bootstrap code with SPL code.
make the spl image with:
./tools/mkimage -T atmelimage -d spl/u-boot-spl.bin spl/boot.bin

this writes the length of the spl image into the 6th
execption vector. This is needed from the ROM bootloader.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, at91, spl: add spl support for the taurus board
Heiko Schocher [Fri, 31 Oct 2014 07:31:05 +0000 (08:31 +0100)]
arm, at91, spl: add spl support for the taurus board

replaces the at91bootstrap code with SPL code.

make the spl image with:
./tools/mkimage -T atmelimage -d spl/u-boot-spl.bin spl/boot.bin

this writes the length of the spl image into the 6th
execption vector. This is needed from the ROM bootloader.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, spl, at91: add at91sam9260 and at91sam9g45 spl support
Heiko Schocher [Fri, 31 Oct 2014 07:31:04 +0000 (08:31 +0100)]
arm, spl, at91: add at91sam9260 and at91sam9g45 spl support

add support for using spl code on at91sam9260 and at91sam9g45
based boards.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
[adopt Bo's change in spl.c]
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agospl, mtd, nand, atmel_nand: invert device ready pin logic
Heiko Schocher [Fri, 31 Oct 2014 07:31:03 +0000 (08:31 +0100)]
spl, mtd, nand, atmel_nand: invert device ready pin logic

device ready pin is signalling that the device is ready on state 1
not on 0. Simmiliar as it is in drivers/mtd/nand/nand_spl_simple.c

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agospl, nand, atmel_nand: add erase one block function
Heiko Schocher [Fri, 31 Oct 2014 07:31:02 +0000 (08:31 +0100)]
spl, nand, atmel_nand: add erase one block function

erase one nand block in spl code. keep it simple, as size matters
This is used on the upcoming taurus spl support.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agomtd: atmel_nand: add missing include
Heiko Schocher [Fri, 31 Oct 2014 07:31:01 +0000 (08:31 +0100)]
mtd: atmel_nand: add missing include

using this driver in SPL code with CONFIG_SPL_NAND_ECC
configured leads in an compileerror. Fix this.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
[fix subject]
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agospl, nand: add option to boot raw u-boot.bin image only
Heiko Schocher [Fri, 31 Oct 2014 07:31:00 +0000 (08:31 +0100)]
spl, nand: add option to boot raw u-boot.bin image only

enable to boot only a raw u-boot.bin image from nand with the
CONFIG_SPL_NAND_RAW_ONLY define. This option saves space on
boards where spl space is low.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, at91: add missing ddr2 cr register MPDDRC_CR_EBISHARE define
Heiko Schocher [Fri, 31 Oct 2014 07:30:59 +0000 (08:30 +0100)]
arm, at91: add missing ddr2 cr register MPDDRC_CR_EBISHARE define

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, at91: compile mpddrc ram init code also for AT91SAM9M10G45
Heiko Schocher [Fri, 31 Oct 2014 07:30:58 +0000 (08:30 +0100)]
arm, at91: compile mpddrc ram init code also for AT91SAM9M10G45

- compile mpddrc ram init code also for AT91SAM9M10G45
  based boards.
- in CONFIG_SAMA5D3 case, look for the ATMEL_MPDDRC_CR_DECOD_INTERLEAVED
  in the cr configuration

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, at91, mpddrc: fix typo in ddr2_init()
Heiko Schocher [Fri, 31 Oct 2014 07:30:57 +0000 (08:30 +0100)]
arm, at91, mpddrc: fix typo in ddr2_init()

use the configure value for computing the ba_off value
not the value from the cr register. This leaded in a
wrong ram configuration on the upcoming corvus spl board
support.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, at91: add spi dataflash support for the taurus board
Heiko Schocher [Fri, 31 Oct 2014 07:30:56 +0000 (08:30 +0100)]
arm, at91: add spi dataflash support for the taurus board

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agospi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header
Heiko Schocher [Fri, 31 Oct 2014 07:30:55 +0000 (08:30 +0100)]
spi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header

move CONFIG_SYS_SPI_WRITE_TOUT into drivers/spi/atmel_spi.h
and define a default value. Delete this define in the board
config files, where it is possible (all boards use currently
the same value).

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoarm, at91: generate boot.bin file for all atmel SoC
Heiko Schocher [Thu, 30 Oct 2014 08:59:59 +0000 (09:59 +0100)]
arm, at91: generate boot.bin file for all atmel SoC

generate the boot.bin file for all atmel SoC (arm920, arm926, armv7)

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
[fix subject]
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoARM: atmel: spl: make css field configurable
Bo Shen [Fri, 24 Oct 2014 08:13:26 +0000 (16:13 +0800)]
ARM: atmel: spl: make css field configurable

The clock source for master clock can be slow clock, main clock,
plla clock or upll clock. So, make the clock source selection
field in mckr can be configured.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoARM: atmel: spl: make initialization more stable
Bo Shen [Fri, 24 Oct 2014 08:13:25 +0000 (16:13 +0800)]
ARM: atmel: spl: make initialization more stable

We need to make sure the main clock ready field in MCFR is set
after switch to main crystal oscillator.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoARM: at91 series: convert to generic board
Bo Shen [Wed, 22 Oct 2014 10:01:23 +0000 (18:01 +0800)]
ARM: at91 series: convert to generic board

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agonet: macb: write mac address when initialization
Bo Shen [Wed, 22 Oct 2014 06:45:56 +0000 (14:45 +0800)]
net: macb: write mac address when initialization

When boot up without mac address setting, it will give the warning
message like: "Warning: failed to set MAC address", however when
execute network related command, it still execute them without any
warning information.

With this patch, it will exit directly with following information:
"gmac0: mac address is not valid"

It also solve the problem after bootup then set mac address and the
mac address won't set to net device issue.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Tested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Tom Rini [Mon, 17 Nov 2014 13:43:40 +0000 (08:43 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

10 years agoMerge branch 'rmobile' of git://git.denx.de/u-boot-sh
Tom Rini [Mon, 17 Nov 2014 13:43:21 +0000 (08:43 -0500)]
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

10 years agoarm: rmobile: replacement of common parts of config by rcar-gen2-common.h
Nobuhiro Iwamatsu [Mon, 10 Nov 2014 05:34:07 +0000 (14:34 +0900)]
arm: rmobile: replacement of common parts of config by rcar-gen2-common.h

Common part of config for lager, koelsch, alt and gose board will be able to
replace rcar-gen2-common.h.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: rmobile: configs: Collect up common part of config for R-Car SoCs
Nobuhiro Iwamatsu [Thu, 6 Nov 2014 07:30:56 +0000 (16:30 +0900)]
arm: rmobile: configs: Collect up common part of config for R-Car SoCs

The lager, koelsch, alt, gose board supported in rmobile is
distinguished as the R-Car Gen2 series and has much common setting.
This collect up the common part of config as rcar-gen2-common.h.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: rmobile: gose: Remove dram_init_banksize function
Nobuhiro Iwamatsu [Mon, 10 Nov 2014 04:58:50 +0000 (13:58 +0900)]
arm: rmobile: gose: Remove dram_init_banksize function

Gose board is defined CONFIG_SYS_SDRAM_BASE, and this can use a basic function of
dram_init_banksize instead.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: rmobile: lager: Remove dram_init_banksize function
Nobuhiro Iwamatsu [Mon, 10 Nov 2014 04:58:50 +0000 (13:58 +0900)]
arm: rmobile: lager: Remove dram_init_banksize function

Lager board is defined CONFIG_SYS_SDRAM_BASE, and this can use a basic function of
dram_init_banksize instead.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: rmobile: koelsch: Remove dram_init_banksize function
Nobuhiro Iwamatsu [Mon, 10 Nov 2014 04:58:50 +0000 (13:58 +0900)]
arm: rmobile: koelsch: Remove dram_init_banksize function

Koesch board is defined CONFIG_SYS_SDRAM_BASE, and this can use a basic function of
dram_init_banksize instead.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: rmobile: alt: Remove dram_init_banksize function
Nobuhiro Iwamatsu [Mon, 10 Nov 2014 04:58:50 +0000 (13:58 +0900)]
arm: rmobile: alt: Remove dram_init_banksize function

Alt board is defined CONFIG_SYS_SDRAM_BASE, and this can use a basic function of
dram_init_banksize instead.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agosh: Move SH_32BIT to Kconfig
Nobuhiro Iwamatsu [Fri, 14 Nov 2014 03:52:47 +0000 (12:52 +0900)]
sh: Move SH_32BIT to Kconfig

This moves SH_32BIT to Kconfig, and removes SH_32BIT from config
files.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Tom Rini [Fri, 14 Nov 2014 21:39:32 +0000 (16:39 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Tom Rini [Fri, 14 Nov 2014 20:05:53 +0000 (15:05 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-video

10 years agopowerpc/85xx: enable some P1/P2 boards mtdparts for nor flash
Yangbo Lu [Thu, 16 Oct 2014 02:58:55 +0000 (10:58 +0800)]
powerpc/85xx: enable some P1/P2 boards mtdparts for nor flash

Enable these boards mtdparts for nor flash:
p1020rdb-pd, p1021rdb-pc, p1022ds, p1025twr, and p2020rdb-pc.

Signed-off-by: Xie Xiaobo <X.Xie@freescale.com>
Signed-off-by: Yangbo Lu <yangbo.lu@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Scott Wood <scottwood@freescale.com>
10 years agokeymile/powerpc: move to the architecture-generic board system
Valentin Longchamp [Fri, 3 Oct 2014 09:45:24 +0000 (11:45 +0200)]
keymile/powerpc: move to the architecture-generic board system

This converts all the Keymile powerpc boards to the generic board
initialization.

This includes the 3 Keymile powerpc subsystems: km82xx, km83xx,
and kmp204x.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/mpc83xx: Zero boot_flags arg for calling board_init_f()
Valentin Longchamp [Fri, 3 Oct 2014 09:45:23 +0000 (11:45 +0200)]
powerpc/mpc83xx: Zero boot_flags arg for calling board_init_f()

The argument boot_flags of board_init_f() is not used at all in the
powerpc specific board.c init sequence. Now with the generic init
sequence, this boot_flags arg is used by board_init_f().

This patch sets the r3 register that is used to pass the boot_flags
argument from the start.S board_init_f() call to 0 prior to the function
call to avoid unknown content to end up in gd->flags.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/BSC9131RDB: Enable creation of dynamic partitions for NAND
Ashish Kumar [Tue, 7 Oct 2014 12:32:23 +0000 (18:02 +0530)]
powerpc/BSC9131RDB: Enable creation of dynamic partitions for NAND

* fdt_fixup_mtdparts is called from ft_board_setup
 * Run "mtdparts default" to create NAND partition on uboot
 * Use mtdparts to create partitions dynamically rather
    than using static partitions in device tree

Signed-off-by: Ashish Kumar <Ashish.Kumar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR
Ashish Kumar [Mon, 6 Oct 2014 12:54:56 +0000 (18:24 +0530)]
powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

* fdt_fixup_mtdparts is called from ft_board_setup
 * run "mtdparts default" to create NAND, NOR partition on uboot
 * Use mtdparts to create partitions dynamically rather
    than using static partitions in device tree

Signed-off-by: Ashish Kumar <Ashish.Kumar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/mpc85xx: Use IFC accessor function
Prabhakar Kushwaha [Tue, 23 Sep 2014 05:27:12 +0000 (10:57 +0530)]
powerpc/mpc85xx: Use IFC accessor function

IFC registers can be of type Little Endian or big Endian depending upon
Freescale SoC. Here SoC defines the register type of IFC IP.

So use IFC acessor functions instead of in_be32().

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agot104xrdb: Add Errata A_007662, A_008007 workaround in pbi.cfg
Priyanka Jain [Wed, 17 Sep 2014 10:27:54 +0000 (15:57 +0530)]
t104xrdb: Add Errata A_007662, A_008007 workaround in pbi.cfg

-A_007662 states that for x1 link width, PCIe2 controller trains in
 Gen1 speed while configured for Gen2 speed.
 Workaround:Set the width to x1 and speed to Gen2 by writing to
 CCSR registers in PBI phase

-A_008007 states that PVR register may show random value.
 Workaround: Reset PVR register using DCSR space in PBI phase

Add PBI based software workaround for A_007662 and A_008007
in t104x_pbi.cfg. This is required for SPL-based bootloaders
like NAND-boot, SD-boot, SPI-boot

Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/t4rdb: Add support of CPLD
Chunhe Lan [Fri, 12 Sep 2014 06:47:09 +0000 (14:47 +0800)]
powerpc/t4rdb: Add support of CPLD

This support of CPLD includes

    - Files and register definitions
    - Command to switch alternate bank
    - Command to switch default bank

Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years ago85xx/b4:Correct USB DR controller liodn entry
ramneek mehresh [Thu, 21 Aug 2014 12:22:17 +0000 (17:52 +0530)]
85xx/b4:Correct USB DR controller liodn entry

LIODN entry for B4860/B4420 mentions USB controller as "mph"
insread of "dr". This results in PAMU not permitting bus
transactions for USB DR controller on B4860 resulting in
USB function failure. Replacing "fsl-usb2-mph" with
"fsl-usb2-dr" allows USB DR controller bus transactions

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Reviewed-by: Sethi Varun-B16395 <Varun.Sethi@freescale.com>
Reviewed-by: Sun Yusong-R58495 <yorksun@freescale.com>
10 years agosbc8548: enable and test CONFIG_SYS_GENERIC_BOARD
Paul Gortmaker [Thu, 14 Aug 2014 14:42:52 +0000 (10:42 -0400)]
sbc8548: enable and test CONFIG_SYS_GENERIC_BOARD

Tested on the following baseline (note "dirty" since I enabled
ALT_BOOT in the config in order to use the alternate boot bank.)

Everything seems to work fine with no additional changes.  The
banner warning message is now gone.

 ---

U-Boot 2014.10-rc1-00075-ge49f14af1349-dirty (Aug 14 2014 - 10:26:15)

CPU:   8548E, Version: 2.1, (0x80390021)
Core:  e500, Version: 2.2, (0x80210022)
Clock Configuration:
       CPU0:990  MHz,
       CCB:396  MHz,
       DDR:198  MHz (396 MT/s data rate), LBC:99   MHz
L1:    D-cache 32 KiB enabled
       I-cache 32 KiB enabled
I2C:   ready
DRAM:  Detected UDIMM
    SDRAM: 128 MiB
256 MiB (DDR2, 64-bit, CL=3, ECC off)
Flash: 72 MiB
L2:    512 KiB enabled
*** Warning - bad CRC, using default environment

PCI: Host, 64 bit, 66 MHz, sync, arbiter
  00:01.0     - 8086:1026 - Network controller
PCI1: Bus 00 - 00

PCIe1: Root Complex, x1 gen1, regs @ 0xe000a000
  02:00.0     - 1148:9e00 - Network controller
PCIe1: Bus 01 - 02
In:    serial
Out:   serial
Err:   serial
Net:   eTSEC0 [PRIME], eTSEC1
Hit any key to stop autoboot:  0
=> ver

U-Boot 2014.10-rc1-00075-ge49f14af1349-dirty (Aug 14 2014 - 10:26:15)
powerpc-linux-gcc (GCC) 4.5.2
GNU ld (GNU Binutils) 2.21
=>

 ---

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agodriver/net/fm/memac_phy: set NEG bit for external MDIOs
Shaohui Xie [Wed, 13 Aug 2014 10:38:09 +0000 (18:38 +0800)]
driver/net/fm/memac_phy: set NEG bit for external MDIOs

NEG bit default is '1' for external MDIOs as per FMAN-v3 RM, but on some
platforms, e.g. T2080QDS, this bit is '0', which leads to MDIO failure
on XAUI PHY, so set this bit definitely to align with the RM.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoFman/mEMAC: mEMAC fix for 10G MAC and PHY
Shaohui Xie [Wed, 13 Aug 2014 10:32:19 +0000 (18:32 +0800)]
Fman/mEMAC: mEMAC fix for 10G MAC and PHY

1. use Payload length check disable when enable MAC;
2. add XGMII support for setting MAC interface mode;
3. only enable auto negotiation for Non-XGMII mode;
4. return 0xffff if clause 22 is used to read 10G phy_id;

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Acked-By: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agompc85xx/kmp204x: raise u-boot size to 768KB
Valentin Longchamp [Fri, 24 Oct 2014 08:11:16 +0000 (10:11 +0200)]
mpc85xx/kmp204x: raise u-boot size to 768KB

Until now this defined to be 512KB and the total binary size actually
was on the edge of this limit. Most of the powerpc boards have thus
moved to 768KB.

Since on the current kmp204x boards there is 1MB reserved for u-boot on
the SPI boot flash, there is no problem to set the limit to 768KB as
well to be on line with the other powerpc boards and to eventually
configure in some additional features (and binary size) to u-boot.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Fri, 14 Nov 2014 18:53:49 +0000 (13:53 -0500)]
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

10 years agoarm: mx6: add support for TBS2910 Matrix ARM miniPC
Soeren Moch [Mon, 3 Nov 2014 12:57:01 +0000 (13:57 +0100)]
arm: mx6: add support for TBS2910 Matrix ARM miniPC

Add initial support for TBS2910 Matrix ARM miniPC.
Support includes MMC, Ethernet, UARTs, HDMI, USB, SATA, PCI, I2C, RTC.

Signed-off-by: Soeren Moch <smoch@web.de>
10 years agomx6sabresd: Staticize when possible
Fabio Estevam [Thu, 6 Nov 2014 14:24:25 +0000 (12:24 -0200)]
mx6sabresd: Staticize when possible

Annotate 'static' when appropriate for the variables used locally.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agomx6sabresd: Fix error handling in board_mmc_init()
Fabio Estevam [Thu, 6 Nov 2014 14:24:24 +0000 (12:24 -0200)]
mx6sabresd: Fix error handling in board_mmc_init()

When an invalid USDHC port is passed we should return -EINVAL instead of 0.

Also, return the error immediately on fsl_esdhc_initialize() failure.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agomx6: video_skip: Fix crash on NULL pointer
Nikolay Dimitrov [Wed, 5 Nov 2014 08:55:33 +0000 (10:55 +0200)]
mx6: video_skip: Fix crash on NULL pointer

Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
Cc: Stefano Babic <sbabic@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-sunxi
Tom Rini [Thu, 13 Nov 2014 15:35:13 +0000 (10:35 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

10 years agoimx6: SPL support for iMX6 SabreSD
John Tobias [Wed, 12 Nov 2014 22:27:45 +0000 (14:27 -0800)]
imx6: SPL support for iMX6 SabreSD

This patch will enable the support for SPL on iMX6 SabreSD.
It tested on SD2 and SD3 mmc port (Switch 1 or 2 of SW6)

Signed-off-by: John Tobias <john.tobias.ph@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
10 years agoimx6: add spl in the header file
John Tobias [Wed, 12 Nov 2014 22:27:44 +0000 (14:27 -0800)]
imx6: add spl in the header file

add the spl info in the header file.
Also, added a macro statement in m6sabre_common.h to avoid compiler
warning.

Signed-off-by: John Tobias <john.tobias.ph@gmail.com>
10 years agokconfig: imx6: add SUPPORT_SPL
John Tobias [Wed, 12 Nov 2014 22:27:43 +0000 (14:27 -0800)]
kconfig: imx6: add SUPPORT_SPL

add SUPPORT_SPL feature for iMX6 SabreSD. It need to use
mx6sabresd_spl_defconfig to compile it.

Signed-off-by: John Tobias <john.tobias.ph@gmail.com>
10 years agoimx6: add data configuration file for SPL
John Tobias [Wed, 12 Nov 2014 22:27:42 +0000 (14:27 -0800)]
imx6: add data configuration file for SPL

It's a trim version of mx6q_4x_mt41j128.cfg. It just removed
the related settings for DDR

Signed-off-by: John Tobias <john.tobias.ph@gmail.com>
10 years agoimx6: add spl config for mx6sabresd
John Tobias [Wed, 12 Nov 2014 22:27:41 +0000 (14:27 -0800)]
imx6: add spl config for mx6sabresd

add a build configuration file for mx6sabresd with spl support

Signed-off-by: John Tobias <john.tobias.ph@gmail.com>
10 years agoimx: mx6q/dlsabreauto: And NAND flash support
Ye.Li [Wed, 12 Nov 2014 06:02:05 +0000 (14:02 +0800)]
imx: mx6q/dlsabreauto: And NAND flash support

The i.MX6Q/DL sabreauto board has one NAND socket, set the
CONFIG_NAND_MXS and relevant NAND configurations to enable the
MXS NAND flash driver.
Add board level codes to set IOMUX and clock for GPMI-NAND and
BCH module.

Signed-off-by: Ye.Li <B37916@freescale.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agoimx: mx6q/dl sabre_common: Move MMC ENV offset to 512KB position
Ye.Li [Wed, 12 Nov 2014 06:02:04 +0000 (14:02 +0800)]
imx: mx6q/dl sabre_common: Move MMC ENV offset to 512KB position

Set the CONFIG_ENV_OFFSET from 384KB to 512KB offset, so we will have larger space
for u-boot image.
When enabling NAND flash support feature, the u-boot image size has exceeded the
384KB, which causes overlay to the environment variables storage.

Signed-off-by: Ye.Li <B37916@freescale.com>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agoot1200: fix card detect for usdhc4
Christian Gmeiner [Tue, 11 Nov 2014 11:57:05 +0000 (12:57 +0100)]
ot1200: fix card detect for usdhc4

Today I got the final board and found out that a different
connector is used as the one on my development board. The
new connector has swaped pins for cd and wp.

This change is tested on a production ready board.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
10 years agomx53loco: Change 'fdt_file' dynamically
Fabio Estevam [Mon, 10 Nov 2014 19:38:19 +0000 (17:38 -0200)]
mx53loco: Change 'fdt_file' dynamically

Since kernel 3.15 there are two dtb's for the imx53-qsb board:

imx53-qsb.dtb - For the boards with DA9053 PMIC
imx53-qsrb.dtb - For the boards with MC34708 PMIC

Change the 'fdt_file' dynamically, so that the correct dtb can be used depending
on the board variant.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
10 years agoot1200: add support for EHCI
Christian Gmeiner [Mon, 10 Nov 2014 13:35:48 +0000 (14:35 +0100)]
ot1200: add support for EHCI

U-Boot 2014.10-17457-g0b23780-dirty (Nov 10 2014 - 11:41:04)

CPU:   Freescale i.MX6D rev1.2 at 792 MHz
Reset cause: WDOG
Board: ot1200
I2C:   ready
DRAM:  1 GiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1
SF: Detected M25P16 with page size 256 Bytes, erase size 64 KiB, total 2 MiB
In:    serial
Out:   serial
Err:   serial
Net:   using phy at 0
FEC [PRIME]
Hit any key to stop autoboot:  0
=> usb start
(Re)start USB...
USB0:   Port not available.
USB1:   USB EHCI 1.00
scanning bus 1 for devices... 4 USB Device(s) found
=> usb tree
USB device tree:
  1  Hub (480 Mb/s, 0mA)
  |  u-boot EHCI Host Controller
  |
  +-2  Hub (480 Mb/s, 2mA)
    |
    +-3  Mass Storage (480 Mb/s, 80mA)
    |    USBest Technology USB Mass Storage Device 0000000000028B
    |
    +-4  Vendor specific (480 Mb/s, 2mA)

=>

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Thu, 13 Nov 2014 14:32:45 +0000 (09:32 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

10 years agoarm: mx6: Fix missing Kconfig option for Novena
Marek Vasut [Thu, 13 Nov 2014 10:06:21 +0000 (11:06 +0100)]
arm: mx6: Fix missing Kconfig option for Novena

Add two missing Kconfig options for Novena and drop the SPL
from the Novena config.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Sean Cross <xobs@kosagi.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
10 years agosunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_<BOARD> structure
Zoltan HERPAI [Tue, 11 Nov 2014 12:21:26 +0000 (13:21 +0100)]
sunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_<BOARD> structure

The magic bit toucher needs to be updated to reflect the new board Kconfig structure

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agosun6i: ehci: Add sun6i ehci support
Hans de Goede [Fri, 7 Nov 2014 13:51:12 +0000 (14:51 +0100)]
sun6i: ehci: Add sun6i ehci support

Add support for the 2 ehci controllers found on the sun6i (A31) soc.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Acked-by: Marek Vasut <marex@denx.de>
10 years agosunxi: ehci: Add proper Kconfig options to select the usb Vbus gpio-s
Hans de Goede [Fri, 7 Nov 2014 15:09:00 +0000 (16:09 +0100)]
sunxi: ehci: Add proper Kconfig options to select the usb Vbus gpio-s

Add proper Kconfig options to select the usb Vbus gpio-s, besides moving to
Kconfig being the right thing to do, an added advantage of this is that it
allows for boards without Vbus gpio-s.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun6i: Add Mele M9 board
Hans de Goede [Mon, 27 Oct 2014 22:29:49 +0000 (23:29 +0100)]
sun6i: Add Mele M9 board

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun6i: Enable SPL
Hans de Goede [Sat, 25 Oct 2014 18:18:10 +0000 (20:18 +0200)]
sun6i: Enable SPL

Enable the SPL now that we've all the necessary bits in place.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun6i: Poke magic sram controller register to avoid cache issues
Hans de Goede [Sun, 2 Nov 2014 15:55:09 +0000 (16:55 +0100)]
sun6i: Poke magic sram controller register to avoid cache issues

Without this the cache will only work in write-through mode, and as soon as
it is put in write-back mode things break.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun6i: Add dram initialization code
Hans de Goede [Sat, 25 Oct 2014 18:27:23 +0000 (20:27 +0200)]
sun6i: Add dram initialization code

Add full support for dram initialization, using a fixed clock and autodetection
of the memory organization (numbers of channels, bus-width, etc.).

This is based on dram_sun6i.c and dram.h from u-boot in the Allwinner A31 SDK,
extended with extra initialization sequences and the autodetect algorithm
from boot0.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun4i: Rename dram files to dram_sun4i.x
Hans de Goede [Sun, 2 Nov 2014 19:31:16 +0000 (20:31 +0100)]
sun4i: Rename dram files to dram_sun4i.x

In preparation for adding sun6i dram support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun6i: Add cpucfg register definitions
Hans de Goede [Mon, 27 Oct 2014 22:59:27 +0000 (23:59 +0100)]
sun6i: Add cpucfg register definitions

Not used atm, for future use (e.g. PSCI).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun6i: Add clock functions needed for SPL / DRAM init
Hans de Goede [Sat, 25 Oct 2014 18:16:33 +0000 (20:16 +0200)]
sun6i: Add clock functions needed for SPL / DRAM init

Add clock_init_safe and clockset_pll5 functions, as these are needed for
SPL support resp. DRAM init (which is needed for SPL too).

Also add some extra clock register constant defines.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosun6i: Add basic axp221 driver
Oliver Schinagl [Fri, 26 Jul 2013 10:56:58 +0000 (12:56 +0200)]
sun6i: Add basic axp221 driver

The A31 uses the AXP221 pmic for various voltages.

Signed-off-by: Oliver Schinagl <oliver@schinagl.nl>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
--
Changes in v2:
-Rebase
Changes in v3:
-Add support for all dldo and aldo-s
-Add Kconfig option to select building AXP221 and to select voltage of
 dldo and aldo-s
Changes in v4:
-Add axp221_setbits helper function
-Use symbolic names for enabled bits in CTRL1 - CTRL3 registers

10 years agosun6i: Add new p2wi controller driver
Oliver Schinagl [Thu, 25 Jul 2013 12:07:42 +0000 (14:07 +0200)]
sun6i: Add new p2wi controller driver

The A31 uses a new push-pull two wire interface, which features higher
transfer speeds (upto 6 MHz) in theory. While the hardware can burst 8
bytes each time, this driver will only see very little use and thus is
limited to single byte transmission only.

Signed-off-by: Oliver Schinagl <oliver@schinagl.nl>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agozynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig
Michal Simek [Thu, 13 Nov 2014 12:22:40 +0000 (13:22 +0100)]
zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig

This is a MIME GnuPG-signed message.  If you see this text, it means that
your E-mail or Usenet software does not support MIME signed messages.
The Internet standard for MIME PGP messages, RFC 2015, was published in 1996.
To open this message correctly you will need to install E-mail or Usenet
software that supports modern Internet standards.

Move CONFIG_DEFAULT_DEVICE_TREE from board config
directly to defconfig.

This patch removes compilation warning:
include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE"
redefined [enabled by default]
 #define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
10 years agoMerge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Thu, 13 Nov 2014 13:38:17 +0000 (08:38 -0500)]
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

10 years agokconfig: arm: move "armv8" define to arch/arm/Kconfig
Masahiro Yamada [Thu, 6 Nov 2014 02:39:27 +0000 (11:39 +0900)]
kconfig: arm: move "armv8" define to arch/arm/Kconfig

Commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs)
collected the default values of CONFIG_SYS_CPU into arch/arm/Kconfig.

This commit moves "armv8" to there for consistency.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Georges Savoundararadj <savoundg@gmail.com>
10 years agokconfig: arm: select CPU_V7 for some new boards
Masahiro Yamada [Thu, 6 Nov 2014 02:39:26 +0000 (11:39 +0900)]
kconfig: arm: select CPU_V7 for some new boards

This commit adds "select CPU_V7" for some new boards that were not
covered by commit 2e07c249a67e
(kconfig: arm: introduce symbol for ARM CPUs).

Redundant "SYS_CPU" defines and "string" directives should be removed.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Georges Savoundararadj <savoundg@gmail.com>
10 years agoARM: remove unused CPU directory
Masahiro Yamada [Thu, 13 Nov 2014 09:40:07 +0000 (18:40 +0900)]
ARM: remove unused CPU directory

There is no board with CPU "arm_intcm".

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
10 years agosh: define CONFIG_CPU_SH4A for some boards
Masahiro Yamada [Thu, 6 Nov 2014 06:55:23 +0000 (15:55 +0900)]
sh: define CONFIG_CPU_SH4A for some boards

Precisely, these boards are SH4A rather than SH4.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agosh: consolidate CONFIG_SYS_CPU defines
Masahiro Yamada [Thu, 6 Nov 2014 06:55:22 +0000 (15:55 +0900)]
sh: consolidate CONFIG_SYS_CPU defines

Now each board selects one of CONFIG_CPU_SH2, CONFIG_CPU_SH3,
CONFIG_CPU_SH4, so let's move CONFIG_SYS_CPU definition to
arch/sh/Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agosh: move CONFIG_{SH2, SH2A, SH3, SH4} to Kconfig
Masahiro Yamada [Thu, 6 Nov 2014 06:55:21 +0000 (15:55 +0900)]
sh: move CONFIG_{SH2, SH2A, SH3, SH4} to Kconfig

This commit moves CONFIG_SH2, CONFIG_SH2A, CONFIG_SH3, CONFIG_SH4
to Kconfig renaming into CONFIG_CPU_SH2, CONFIG_CPU_SH2A,
CONFIG_CPU_SH3, CONFIG_CPU_SH4, respectively because
arch/sh/Kconfig of Linux uses CONFIG_CPU_SH* convention.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agosh: use more descriptive prompts for board select menu
Masahiro Yamada [Thu, 6 Nov 2014 06:55:20 +0000 (15:55 +0900)]
sh: use more descriptive prompts for board select menu

The current prompts were added by a conversion tool
based on board directory names when switching to Kconfig.

Use better prompts mostly taken from from arch/sh/boards/*
of Linux Kernel.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agokbuild: Make scripts executable
Masahiro Yamada [Thu, 30 Oct 2014 02:06:14 +0000 (11:06 +0900)]
kbuild: Make scripts executable

The Makefiles call the respective interpreter explicitly, but this makes
it easier to use the scripts manually.

(This commit follows commit 06ed5c2bfaca of Linux Kernel)

Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: remove orphaned boards mcc200 and prs200
Nikita Kiryanov [Tue, 11 Nov 2014 13:46:05 +0000 (15:46 +0200)]
powerpc: remove orphaned boards mcc200 and prs200

mcc200 and prs200 are old and have no maintainer. Remove the boards.

This also removes the mcc200 specific 1bpp BMP support from
common/lcd.c

Cc: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: York Sun <yorksun@freescale.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
10 years agokm_arm: convert the km_arm boards to the generic board support
Valentin Longchamp [Fri, 3 Oct 2014 09:46:53 +0000 (11:46 +0200)]
km_arm: convert the km_arm boards to the generic board support

This implies that all the km_kirkwood boards and their variants now are
using the generic board init sequence.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
10 years agomx28evk: README: Revision C is also supported
Fabio Estevam [Mon, 10 Nov 2014 12:34:26 +0000 (10:34 -0200)]
mx28evk: README: Revision C is also supported

Adjust the text to mention that rev C of the board is also supported.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agoarm: imx: make bmode command work with SPL/U-Boot combo
Nikita Kiryanov [Wed, 29 Oct 2014 17:28:33 +0000 (19:28 +0200)]
arm: imx: make bmode command work with SPL/U-Boot combo

The bmode command forces the SoC to use a specific boot device
by writing its boot mode into SRC_GPR9, and notifying the SoC of
the change using SRC_GPR10[28] bit: if the bit is on, bootROM
uses the value in SRC_GPR9 instead of SRC_SMBR1 to determine
the boot device.

SPL on the other hand is oblivious to this distinction, so once
the bootROM loads SPL from the device configured in SRC_GPR10,
SPL will attempt to load U-Boot from the device configured in
SRC_SMBR1, which is not updated by the bootROM to the value in
SRC_GPR9.

The result is that the selected boot device is not used across all
the boot stages.

Update spl_boot_device() to look at gpr9 when necessary.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Troy Kisky <troy.kisky@boundarydevices.com>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Eric Nelson <eric.nelson@boundarydevices.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Heiko Schocher <hs@denx.de>