]> code.ossystems Code Review - bsp/u-boot.git/log
bsp/u-boot.git
10 years agommc: rmobile: Add SDHC support for Renesas rmobile ARM SoC
Nobuhiro Iwamatsu [Tue, 16 Dec 2014 23:03:00 +0000 (08:03 +0900)]
mmc: rmobile: Add SDHC support for Renesas rmobile ARM SoC

This adds Renesas rmobile ARM SoC's SD/MMC host support.
This drivers tested with Gose board and Koelsch board.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
10 years agoARM: atmel: sama5d4_xplained: enable usb ethernet gadget
Bo Shen [Wed, 3 Dec 2014 10:02:23 +0000 (18:02 +0800)]
ARM: atmel: sama5d4_xplained: enable usb ethernet gadget

Signed-off-by: Bo Shen <voice.shen@atmel.com>
10 years agoARM: atmel: sama5d4_xplained: add option for usb ethernet gadget
Bo Shen [Wed, 3 Dec 2014 10:02:22 +0000 (18:02 +0800)]
ARM: atmel: sama5d4_xplained: add option for usb ethernet gadget

Add the option for USB Ethernet gadget based on atmel usb
device.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
10 years agoARM: atmel: sama5d4ek: enable usb ethernet gadget
Bo Shen [Wed, 3 Dec 2014 10:02:21 +0000 (18:02 +0800)]
ARM: atmel: sama5d4ek: enable usb ethernet gadget

Signed-off-by: Bo Shen <voice.shen@atmel.com>
10 years agoARM: atmel: sama5d4ek: add option for usb ethernet gadget
Bo Shen [Wed, 3 Dec 2014 10:02:20 +0000 (18:02 +0800)]
ARM: atmel: sama5d4ek: add option for usb ethernet gadget

Add the option for USB Ethernet gadget based on atmel usb
device.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
10 years agoARM: atmel: sama5d4: add usb device initial code
Bo Shen [Wed, 3 Dec 2014 10:02:19 +0000 (18:02 +0800)]
ARM: atmel: sama5d4: add usb device initial code

Signed-off-by: Bo Shen <voice.shen@atmel.com>
10 years agoARM: atmel: sama5d4: add usb platform data
Bo Shen [Wed, 3 Dec 2014 10:02:18 +0000 (18:02 +0800)]
ARM: atmel: sama5d4: add usb platform data

The SAMA5D4 has the same usb platform data with SAMA5D3 SoC.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
10 years agoarm: at91: snapper9260: Drop invalid CONFIG_SKIP_RELOCATE_UBOOT
Simon Glass [Wed, 26 Nov 2014 19:30:17 +0000 (12:30 -0700)]
arm: at91: snapper9260: Drop invalid CONFIG_SKIP_RELOCATE_UBOOT

This config is not valid, so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoARM: at91: sama5d3_xplained: spl: enable PMECC header generation
Wu, Josh [Wed, 19 Nov 2014 11:03:00 +0000 (19:03 +0800)]
ARM: at91: sama5d3_xplained: spl: enable PMECC header generation

As sama5d3 xplained support the PMECC. So add the PMECC header for spl
binary. That make ROM loader can use PMECC to avoid error flips in spl
code in nandflash.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
10 years agoarm, at91, axm: add SPL support for axm
Heiko Schocher [Tue, 18 Nov 2014 10:53:54 +0000 (11:53 +0100)]
arm, at91, axm: add SPL support for axm

add SPL support also for the axm board.

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoarm, at91: corvus board updates
Heiko Schocher [Tue, 18 Nov 2014 10:53:53 +0000 (11:53 +0100)]
arm, at91: corvus board updates

- corvus board fix problems with toshiba nand chips
  on the corvus board problems with toshiba chips
  Manufacturer ID: 0x98 Chip ID: 0xdc encounterd.

  Solve this in the following way:
  - set other nand timings
  - enable CONFIG_SYS_NAND_READY_PIN

- correct the MACH_TYPE setting

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agotaurus, spl: erase also spi flash if recovery button is pressed
Heiko Schocher [Tue, 18 Nov 2014 08:41:58 +0000 (09:41 +0100)]
taurus, spl: erase also spi flash if recovery button is pressed

if in SPL mode recovery button is pressed, erase also spi flash
from offset 0 to CONFIG_SYS_NAND_U_BOOT_SIZE on the taurus board.

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoarm, at91: enable thumb mode for taurus board in SPL
Heiko Schocher [Tue, 18 Nov 2014 08:41:57 +0000 (09:41 +0100)]
arm, at91: enable thumb mode for taurus board in SPL

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoarm, arm926ejs: make thumb mode compileable
Heiko Schocher [Tue, 18 Nov 2014 08:41:56 +0000 (09:41 +0100)]
arm, arm926ejs: make thumb mode compileable

in thumb mode compiler says for example for arch/arm/lib/cache-cp15.c
when enabling CONFIG_SYS_THUMB_BUILD:

{standard input}: Assembler messages:
{standard input}:373: Error: selected processor does not support Thumb mode `mrc p15,0,r4,c1,c0,0'
{standard input}:416: Error: selected processor does not support Thumb mode `mcr p15,0,r3,c2,c0,0'

so, if caches are disabled, do not use this command on arm926ejs.
used on at91 in SPL, to reduce size of SPL.

Signed-off-by: Heiko Schocher <hs@denx.de>
10 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>
10 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>
10 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>
10 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>
10 years agousb: eth: asix88179: add ability to modify MAC address
Rene Griessl [Mon, 12 Jan 2015 16:51:16 +0000 (17:51 +0100)]
usb: eth: asix88179: add ability to modify MAC address

This patch enables U-Boot to modify the MAC address of the AX88179.
Tested on RECS5250 (similar to Arndale5250)

Signed-off-by: Rene Griessl <rgriessl@cit-ec.uni-bielefeld.de>
10 years agomusb-new: Add interrupt queue support
Hans de Goede [Sun, 11 Jan 2015 19:34:54 +0000 (20:34 +0100)]
musb-new: Add interrupt queue support

Add interrupt queue support, so that a usb keyboard can be used without
causing huge latencies.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agomusb-new: Add urb and hep parameters to construct_urb
Hans de Goede [Sun, 11 Jan 2015 19:34:53 +0000 (20:34 +0100)]
musb-new: Add urb and hep parameters to construct_urb

Make construct_urb take an urb and hep parameter, rather then having it always
operate on the file global urb and hep structs. This is a preperation patch
for adding interrupt queue support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agomusb-new: Properly remove a transfer from the schedule on timeout
Hans de Goede [Sun, 11 Jan 2015 19:34:52 +0000 (20:34 +0100)]
musb-new: Properly remove a transfer from the schedule on timeout

If a transfer / urb times-out, properly remove it from the schedule, rather
then letting it sit on the ep head. This stops the musb code from getting
confused and refusing to queue further transfers after a timeout.

Tested by unplugging a usb-keyboard, replugging it and doing a usb-reset,
before this commit the keyboard would not work after the usb-reset.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agomusb-new: Fix reset sequence when in host mode
Hans de Goede [Sun, 11 Jan 2015 19:34:51 +0000 (20:34 +0100)]
musb-new: Fix reset sequence when in host mode

This commit fixes a number of issues with the reset sequence of musb-new
in host mode:

1) Our usb device probe relies on a second device reset being done after the
first descriptors read. Factor the musb reset code into a usb_reset_root_port
function (and add this as an empty define for other controllers), and call
this when a device has no parent.

2) Just like with normal usb controllers there needs to be a delay after
reset, for normal usb controllers, this is handled in hub_port_reset, add a
delay to usb_reset_root_port.

3) Sync the musb reset sequence with the upstream kernel, clear all bits of
power except bits 4-7, and increase the time reset is asserted to 50 ms.

With these fixes an usb keyboard I have now always enumerates properly, where
as earlier it would only enumerare properly once every 5 tries.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agomusb-new: Fix interrupt transfers not working
Hans de Goede [Sun, 11 Jan 2015 19:34:50 +0000 (20:34 +0100)]
musb-new: Fix interrupt transfers not working

For bulk and ctrl transfers common/usb.c sets udev->status = USB_ST_NOT_PROC,
but it does not do so for interrupt transfers.

musb_uboot.c: submit_urb() however was waiting for USB_ST_NOT_PROC to become 0,
and thus without anyone setting USB_ST_NOT_PROC would exit immediately for
interrupt urbs, returning the urb status of EINPROGRESS as error.

This commit fixes this, thereby also making usb_kbd.c work together with
musb_new and CONFIG_SYS_USB_EVENT_POLL.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agomusb-new: Use time based timeouts rather then cpu-cycles based timeouts
Hans de Goede [Sun, 11 Jan 2015 19:34:49 +0000 (20:34 +0100)]
musb-new: Use time based timeouts rather then cpu-cycles based timeouts

CPU cycle based timeouts are no good, because how long they use depends on
CPU speed. Instead use time based timeouts, and wait one second for a
device connection to show up (per the USB spec), and wait USB_TIMEOUT_MS
for various urbs to complete.

This fixes "usb start" taking for ever when no device is plugged into the
otg port.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agomusb-new: Add sunxi musb controller support
Hans de Goede [Sun, 11 Jan 2015 19:34:48 +0000 (20:34 +0100)]
musb-new: Add sunxi musb controller support

This is based on Jussi Kivilinna's work for the linux-sunxi-3.4 kernel to use
the kernels musb driver instead of Allwinners own custom driver.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agomusb-new: Add register defines for different reg layout on sunxi
Hans de Goede [Sun, 11 Jan 2015 19:34:47 +0000 (20:34 +0100)]
musb-new: Add register defines for different reg layout on sunxi

The sunxi SoCs also have a musb controller, but with a different register
layout.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agousb: Do not log an error when no devices is plugged into a root-hub-less hcd
Hans de Goede [Sun, 11 Jan 2015 19:34:46 +0000 (20:34 +0100)]
usb: Do not log an error when no devices is plugged into a root-hub-less hcd

Before this commit u-boot would print the following on boot with musb and
no usb device plugged in:

starting USB...
USB0:   Port not available.
USB error: all controllers failed lowlevel init

This commit changes this to:

starting USB...
USB0:   Port not available.

Which is the correct thing to do since the low-level init went fine.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agousb: Fix usb_kbd_deregister when console-muxing is used
Hans de Goede [Sun, 11 Jan 2015 19:34:44 +0000 (20:34 +0100)]
usb: Fix usb_kbd_deregister when console-muxing is used

When iomuxing is used we must not only deregister the device with stdio.c,
but also remove the reference to the device in the console_devices array
used by console-muxing. Add a call to iomux_doenv to usb_kbd_deregister to
update console_devices, which will drop the reference.

This fixes the console filling with "Failed to enqueue URB to controller"
messages after a "usb stop force", or when the USB keyboard is gone after a
"usb reset".

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agousb: Add an interval parameter to create_int_queue
Hans de Goede [Sun, 11 Jan 2015 19:38:28 +0000 (20:38 +0100)]
usb: Add an interval parameter to create_int_queue

Currently create_int_queue is only implemented by the ehci code, and that
does not honor interrupt intervals, but other drivers which might also want
to implement create_int_queue may honor intervals, so add an interval param.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agoconfig_distro_bootcmd.h: Remove unnecessary magic to avoid repeated USB scans
Hans de Goede [Tue, 6 Jan 2015 13:27:42 +0000 (14:27 +0100)]
config_distro_bootcmd.h: Remove unnecessary magic to avoid repeated USB scans

Now that "usb start" will only start usb if not already started, we can simply
call "usb start" whenever we (may) need access to usb devices, and it will only
actually scan the bus at the first call.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agoUSB: make "usb start" start usb only once
Hans de Goede [Tue, 6 Jan 2015 13:27:41 +0000 (14:27 +0100)]
USB: make "usb start" start usb only once

Currently we've this magic in include/config_distro_bootcmd.h to avoid
scanning the usb bus multiple times.

And it does not work when also using an usb keyboard because then the
preboot command has already scanned the bus, so we're still scanning it
twice.

This commit makes "usb start" only start usb if it is no already started,
allowing us to remove all the magic for it from include/config_distro_bootcmd.h
and just call it unconditionally.

This also causes "usb start" and "usb reset" to actually do what their
different names suggest, rather then both of them doing exactly the same.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 years agousb: gadget: pxa25x_udc: fix use-before-initialized bug
Alex Sadovsky [Thu, 8 Jan 2015 17:51:10 +0000 (20:51 +0300)]
usb: gadget: pxa25x_udc: fix use-before-initialized bug

Fix use-before-initialized bug in pxa25x_udc driver.

Function usb_gadget_register_driver calls udc_disable,
and udc_disable calls pullup_off that uses dev->mach->udc_command.
But dev->mach is initialized in usb_gadget_register_driver after
calling udc_disable. This patch fixes the order of initialization.

Signed-off-by: Alex Sadovsky <Nable.MainInbox@googlemail.com>
10 years agousb: gadget: f_dfu: Add get_alt function to pass the USB compliance test
Stefan Roese [Fri, 9 Jan 2015 13:54:56 +0000 (14:54 +0100)]
usb: gadget: f_dfu: Add get_alt function to pass the USB compliance test

Without this function the USB compliance test (USB 2.0 Command Verifier) will
fail in the "Interface Descriptor Test" with this error message:

FAIL
(1.2.51) A successful GetInterface request must return the alternate setting
set by a prior call to SetInterface.

Lets add this function to read back the value so that the DFU device fully
passes the USB compliance test.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Roger Meier <r.meier@siemens.com>
Cc: Samuel Egli <samuel.egli@siemens.com>
Cc: Enrico Leto <enrico.leto@siemens.com>
Acked-by: Heiko Schocher <hs@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
10 years agousb: gadget: composite: Fix NULL pointer crash in USB compliance test
Stefan Roese [Fri, 9 Jan 2015 13:54:55 +0000 (14:54 +0100)]
usb: gadget: composite: Fix NULL pointer crash in USB compliance test

On the DXR2 board (AM335x using MUSB) the USB compliance test suite
(USB 2.0 Command Verifier) will cause the board to crash and reset
upon the "BOS Descriptor Test - Addressed state". Here the output
from the DRX2 while running this test:

GADGET DRIVER: usb_dnl_dfu
musb-hdrc: peripheral reset irq lost!
composite_setup (776)
data abort
pc : [<87f693ac>]          lr : [<87f6911c>]
sp : 86f33a58  ip : 00000000     fp : 86f3bbac
r10: 00000f00  r9 : 86f33ef4     r8 : 86f37da8
r7 : 00000005  r6 : 86f33a90     r5 : 00000000  r4 : 86f37e30
r3 : 00000000  r2 : 00000000     r1 : 87f9c888  r0 : 00000016
Flags: Nzcv  IRQs off  FIQs on  Mode SVC_32
Resetting CPU ...

resetting ...

By adding the case statement for USB_DT_BOS and therefore not running
into the default case (jump to unkown label) this crash is fixed.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Roger Meier <r.meier@siemens.com>
Cc: Samuel Egli <samuel.egli@siemens.com>
Cc: Enrico Leto <enrico.leto@siemens.com>
Acked-by: Heiko Schocher <hs@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
10 years agosunxi: Drop use of lowlevel_init()
Simon Glass [Tue, 23 Dec 2014 19:04:53 +0000 (12:04 -0700)]
sunxi: Drop use of lowlevel_init()

This does nothing now, so drop it. We have SPL anyway to do our low-level
init.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
10 years agosunxi: Move SPL s_init() code to board_init_f()
Simon Glass [Tue, 23 Dec 2014 19:04:52 +0000 (12:04 -0700)]
sunxi: Move SPL s_init() code to board_init_f()

The current sunxi implementation uses gdata, which is going away. It also
sets up DRAM before board_init_f() in SPL.

There is really no reason to do much in s_init() since board_init_f() is
called immediately afterwards. The only change is that we need our own
implementation of board_init_f() which sets up DRAM before the BSS (which
is in DRAM) is cleared.

The s_init() code runs once for SPL and again for U-Boot proper. We
shouldn't need to init the clock/timer/gpio/i2c init twice, so just have it
in SPL.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoarm: Add warnings about using gdata
Simon Glass [Tue, 23 Dec 2014 19:04:51 +0000 (12:04 -0700)]
arm: Add warnings about using gdata

We need to get rid of this SPL-specific setting of the global_data pointer.
It is already set up in start.S immediately before board_init_f() is called,
and there may be information there that is needed (e.g. pre-reloc malloc
info).

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoTI ARMv7: Don't use GD before crt0.S has set it
Tom Rini [Fri, 19 Dec 2014 21:53:24 +0000 (16:53 -0500)]
TI ARMv7: Don't use GD before crt0.S has set it

Prior to this change we set the gd pointer early so that we can store
data in it.  This becomes problematic for DM changes as well as being
odd in general.  Re-work the code paths so that we don't need to set the
gd pointer so early and instead can rely upon the normal setting of it.

In order to do this we do need to move certain calls from s_init into
spl_board_init(), mainly preloader_console_init and
save_omap_boot_params.

Tested on: Beaglebone Black, AM43xx GP EVM, Beagleboard, Beagleboard xM,
OMAP5 uEVM, DRA7xx EVM
Signed-off-by: Tom Rini <trini@ti.com>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
10 years agonet/vsc9953: Add driver for Vitesse VSC9953 L2 Switch IP
Codrin Ciubotariu [Mon, 12 Jan 2015 12:08:33 +0000 (14:08 +0200)]
net/vsc9953: Add driver for Vitesse VSC9953 L2 Switch IP

This patch adds a driver for VSC9953 L2 Switch. This Vitesse IP
is integrated in Freescale T1040 and T1020 SoCs.
The L2 switch has 10 Ethernet ports: 2 internal fixed-links
(ports 8 and 9) at 2.5 Gbps and and 8 external ports at 1 Gbps.
The external ports may be connected to PHYs over QSGMII and SGMII.

Commands have also been added to enable/disable a port and to
check a port's link speed, duplexity and status. The commands are:

ethsw port <port_nr> enable|disable - enable/disable an l2 switch port
ethsw port <port_nr> show - show an l2 switch port's configuration

port_nr=0..9; use "all" for all ports

For more detailse please see doc/README.t1040-l2switch

Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agonet/fm: Enable FMAN ports if l2switch ports are connected over SGMII
Codrin Ciubotariu [Mon, 12 Jan 2015 12:08:32 +0000 (14:08 +0200)]
net/fm: Enable FMAN ports if l2switch ports are connected over SGMII

If SerDes is configured to connect L2 Switch ports from T1040
over SGMII or QSGMII, the two FMAN fixed ports (FM1@DTSEC1 and FM2@DTSEC2)
that are connected to two L2 swtch ports must be enabled. These
ports don't have PHYs and must be treated accordingly.

Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoarch/powerpc: Add SGMII support for the L2 Switch ports
Codrin Ciubotariu [Mon, 12 Jan 2015 12:08:31 +0000 (14:08 +0200)]
arch/powerpc: Add SGMII support for the L2 Switch ports

Some Freescale SoCs like T1020 and T1040 have an integrated
L2 Switch. The L2 Switch ports may be connected to Ethernet PHYs
over SGMII and QSGMII.

Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoarch/powerpc: Fix mapping of Freescale SerDes protocols
Codrin Ciubotariu [Mon, 12 Jan 2015 12:08:30 +0000 (14:08 +0200)]
arch/powerpc: Fix mapping of Freescale SerDes protocols

The number of supported serdes protocols on Freescale SoCs
has increased over time. Until now, an u64 variable have been
initialized on boot with the configured protocols. However,
since this number has increased (enum srds_prtcl has more
than 64 values), 64 bits are no longer sufficient to hold track
of all the configured protocols.
This patch replaces the u64 map values with static arrays.
To keep track of the number of serdes protocols, the
SERDES_PRCTL_COUNT vale has been added at the end of
enum srds_prtcl. This value must always be the last one.

Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agonet/fm: Fix error when FMAN MAC has no PHY
Codrin Ciubotariu [Mon, 12 Jan 2015 12:08:29 +0000 (14:08 +0200)]
net/fm: Fix error when FMAN MAC has no PHY

U-boot assumes that all FMAN ports have a PHY. Some SoCs (like T1040)
have fixed links. This means that the ports are connected MAC to MAc
and there is no Ethernet PHY attatched. This patch initializes a
FMAN MAC even if it doesn't have a PHY attached.

Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agophylib: add support for aquantia PHYs
Shaohui Xie [Tue, 30 Dec 2014 10:32:04 +0000 (18:32 +0800)]
phylib: add support for aquantia PHYs

This patch supports AQ1202, AQ2104, AQR105 PHY.

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 agompc85xx: clean up the old deep sleep framework
tang yuantian [Thu, 18 Dec 2014 02:26:34 +0000 (10:26 +0800)]
mpc85xx: clean up the old deep sleep framework

All the boards that support deep sleep feature are converted
to deep sleep generic board interface. The old interface which
support non-generic board is not used anymore. So clean it up.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agompc85xx/t1040qds: convert deep sleep to generic board interface
tang yuantian [Thu, 18 Dec 2014 02:20:07 +0000 (10:20 +0800)]
mpc85xx/t1040qds: convert deep sleep to generic board interface

A new deep sleep interface is introduced to support generic
board structure. Converts it to use new interface.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agompc85xx/t102xqds: convert deep sleep to generic board interface
tang yuantian [Thu, 18 Dec 2014 01:55:07 +0000 (09:55 +0800)]
mpc85xx/t102xqds: convert deep sleep to generic board interface

A new deep sleep interface is introduced to support generic
board structure. Converts it to use new interface.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/t1024rdb: Add support for T1024RDB-PB
Shengzhou Liu [Wed, 17 Dec 2014 08:51:08 +0000 (16:51 +0800)]
powerpc/t1024rdb: Add support for T1024RDB-PB

T1024RDB-PB board adds 2.5G SGMII support with AQR105 PHY.
rcw_0x095 is used for 10G XFI + 3x PCIex1
rcw_0x135 is used for 2.5G SGMII + 2x PCIex1

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agompc85xx/t102xrdb: convert deep sleep to generic board interface
tang yuantian [Wed, 17 Dec 2014 07:42:54 +0000 (15:42 +0800)]
mpc85xx/t102xrdb: convert deep sleep to generic board interface

A new deep sleep interface is introduced to support generic
board structure. Converts it to use new interface.

Besides, added SPI/SD/NAND boot deep sleep support.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agot1024qds: add missing T1024QDS_defconfig
Shengzhou Liu [Wed, 17 Dec 2014 07:39:21 +0000 (15:39 +0800)]
t1024qds: add missing T1024QDS_defconfig

Add missing T1024QDS_defconfig for NOR boot on T1024QDS.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/t1024: add serdes protocol 0x40 and 0x5f
Shengzhou Liu [Wed, 17 Dec 2014 07:38:13 +0000 (15:38 +0800)]
powerpc/t1024: add serdes protocol 0x40 and 0x5f

Add serdes protocol 0x40 and 0x5f.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc: SECURE BOOT- Add secure boot target for T1042RDB
gaurav rana [Tue, 16 Dec 2014 06:18:43 +0000 (11:48 +0530)]
powerpc: SECURE BOOT- Add secure boot target for T1042RDB

Secure boot target is added for T1042RDB platform.

Signed-off-by: Gaurav Rana <gaurav.rana@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/913x: Add config flag for bootdelay
harninder rai [Mon, 15 Dec 2014 07:28:45 +0000 (12:58 +0530)]
powerpc/913x: Add config flag for bootdelay

CONFIG_BOOTDELAY is missing from board header file. Add this macro
to enable counting down of auto boot.

Signed-off-by: Harninder Rai <harninder.rai@freescale.com>
[York Sun: Add commit message]
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/mpc85xx: Define PBI Flash Base for C29XPCIE Secure Boot
Aneesh Bansal [Fri, 12 Dec 2014 10:05:04 +0000 (15:35 +0530)]
powerpc/mpc85xx: Define PBI Flash Base for C29XPCIE Secure Boot

CONFIG_SYS_PBI_FLASH_BASE is defined for Secure Boot on C29X

Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agob4860: Correct LIODN assignment for PCIe
Tudor Laurentiu [Fri, 12 Dec 2014 08:41:26 +0000 (10:41 +0200)]
b4860: Correct LIODN assignment for PCIe

For B4 the LIODN register for PCIe is in PCIe address space and not in
GUTs

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Shaveta Leekha <shaveta@freescale.com>
Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/t4240rdb: Add alternate SerDes 2 protocol to align with RCW
Chunhe Lan [Wed, 10 Dec 2014 12:00:39 +0000 (20:00 +0800)]
powerpc/t4240rdb: Add alternate SerDes 2 protocol to align with RCW

SerDes 2 protocol 56 is not valid any longer due to
the new RCW; protocol 55 is used instead, so add
SerDes 2 protocol 55 to align with RCW.

Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc: mpc85xx: Add dummy gpio.h to enable CONFIG_OF_CONTROL
Ruchika Gupta [Wed, 10 Dec 2014 06:22:50 +0000 (11:52 +0530)]
powerpc: mpc85xx: Add dummy gpio.h to enable CONFIG_OF_CONTROL

If CONFIG_OF_CONTROL is enabled, lib/fdtdec.c is compiled.
It includes <asm/gpio.h> and then <asm/gpio.h> includes
<asm/arch/gpio.h>.  As a result, all the SoCs that enable
CONFIG_OF_CONTROL must have <asm/arch/gpio.h>.

The right fix would be to split the lib/fdtdec.c to remove
dependency on GPIO.

This commit adds a dummy <asm/arch/gpio.h> to support OF_CONTROL
for mpc85xx platform. A file mpc85xx_gpio.h exists in
arch/powerpc/include/asm. The defintions in that file conflict
with the ones in asm-generic/gpio.h. Hence a dummy header file
has been added. This will be removed after FDT-GPIO stuff is
fixed correctly.

Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/mpc85xx: SECURE BOOT- Add secure boot target for P5040DS
gaurav rana [Wed, 3 Dec 2014 08:47:50 +0000 (14:17 +0530)]
powerpc/mpc85xx: SECURE BOOT- Add secure boot target for P5040DS

Secure boot target is added for P5040DS platform.

Signed-off-by: Gaurav Rana <gaurav.rana@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/c29xpcie: Add secure boot support
Po Liu [Wed, 26 Nov 2014 01:38:48 +0000 (09:38 +0800)]
powerpc/c29xpcie: Add secure boot support

Add NOR and SPI flash secure boot target for C29XPCIE board.

Signed-off-by: Po Liu <Po.Liu@freescale.com>
Signed-off-by: Mingkai.Hu <Mingkai.Hu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-ti
Tom Rini [Thu, 15 Jan 2015 19:05:31 +0000 (14:05 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-ti

10 years agopowerpc: 74xx_7xx: remove 74xx_7xx cpu support
Masahiro Yamada [Thu, 15 Jan 2015 08:13:24 +0000 (17:13 +0900)]
powerpc: 74xx_7xx: remove 74xx_7xx cpu support

All the 74xx_7xx boards are still non-generic boards:
P3G4, ZUMA, ppmc7xx, ELPPC, mpc7448hpc2

Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: York Sun <yorksun@freescale.com>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Nye Liu <nyet@zumanetworks.com>
Cc: Roy Zang <tie-fei.zang@freescale.com>
10 years agompc8xx: remove unused linker script
Masahiro Yamada [Thu, 15 Jan 2015 08:12:19 +0000 (17:12 +0900)]
mpc8xx: remove unused linker script

Now TQM8xx is the only remaining board family of mpc8xx.
It uses its own linker script, board/tqc/tqm8xx/u-boot.lds.

arch/powerpc/cpu/mpc8xx/u-boot.lds is not used by any boards.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
10 years agoppc4xx: remove dead code
Masahiro Yamada [Thu, 15 Jan 2015 08:10:56 +0000 (17:10 +0900)]
ppc4xx: remove dead code

Since commit 843125daebd7 (ppc4xx: remove HH405 board), CONFIG_HH405
is not defined.

Since commit d52633047913 (ppc4xx: remove PMC405), CONFIG_PMC405
is not defined.

Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Matthias Fuchs <matthias.fuchs@esd.eu>
10 years agobfin: make env offset sector aligned for bct-brettl2 and ibf-dsp561 boards
Sonic Zhang [Fri, 16 Jan 2015 04:52:59 +0000 (12:52 +0800)]
bfin: make env offset sector aligned for bct-brettl2 and ibf-dsp561 boards

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agobfin: enlarge the monitor size for ip04 board to avoid oversize link error
Sonic Zhang [Fri, 16 Jan 2015 04:46:51 +0000 (12:46 +0800)]
bfin: enlarge the monitor size for ip04 board to avoid oversize link error

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agoarc: rename "arc700" in "arcv1"
Alexey Brodkin [Thu, 25 Dec 2014 15:54:58 +0000 (18:54 +0300)]
arc: rename "arc700" in "arcv1"

As a preparation to ARCv2 port submission we rename "arc700" folder to
"arcv1" which stands for ARCv1 ISA also known as ARCompact.

This will allow us to add more flavours of binary-compatible ARCv1 CPUs
like ARC600 if needed later on and all required ARCv2 CPUs (which are
binary incompatible with ARCv1) in "arcv2" folder in subsequent commits.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Igor Guryanov <guryanov@synopsys.com>
10 years agoboard/synopsys: remove selection of CPU from the board
Alexey Brodkin [Thu, 25 Dec 2014 15:47:45 +0000 (18:47 +0300)]
board/synopsys: remove selection of CPU from the board

Both ARCangel4 and AXS10x are FPGA-based boards so they may have
different CPUs. For now we have only 1 option (ARC700) and we define
this as default in arch Kconfig.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
10 years agoarc: move common sources in library
Alexey Brodkin [Sat, 27 Dec 2014 23:42:12 +0000 (02:42 +0300)]
arc: move common sources in library

"reset.c" and "cpu.c" have no architecture-specific code at all.
Others are applicable to either ARC CPU.

This change is a preparation to submission of ARCv2 architecture port.

Even though ARCv1 and ARCv2 ISAs are not binary compatible most of
built-in modules still have the same programming model - AUX registers
are mapped in the same addresses and hold the same data (new featues
extend existing ones).

So only low-level assembly code (start-up, interrupt handlers) is left
as CPU(actually ISA)-specific. This significantyl simplifies maintenance
of multiple CPUs/ISAs.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Igor Guryanov <guryanov@synopsys.com>
10 years agoarc: move linker script in arch/arc/cpu folder
Alexey Brodkin [Sat, 27 Dec 2014 23:45:37 +0000 (02:45 +0300)]
arc: move linker script in arch/arc/cpu folder

This way we'll be able to use the same one script for either ARC CPU.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
10 years agoarc: relocate - minor refactoring and clean-up
Alexey Brodkin [Fri, 26 Dec 2014 16:36:30 +0000 (19:36 +0300)]
arc: relocate - minor refactoring and clean-up

 * use better symbols for relocatable region boundaries
("__image_copy_start" instead of "CONFIG_SYS_TEXT_BASE")
 * remove useless debug messages because they will only show up in case
of both problem (when normal "if" branch won't be taken) and DEBUG take
place which is pretty rare situation.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
10 years agoarc: introduce separate section for interrupt vector table
Igor Guryanov [Wed, 24 Dec 2014 14:17:11 +0000 (17:17 +0300)]
arc: introduce separate section for interrupt vector table

Even though existing implementation works fine in preparation to
submission of ARCv2 architecture we need this change.

In case of ARCv2 interrupt vector table consists of just addresses
of corresponding handlers. And if those addresses will be in .text
section then assembler will encode them as everything in .text section
as middle-endian and then on real execution CPU will read swapped
addresses and will jump into the wild.

Once introduced new section is situated so .text section remains the
first which allows us to use common linker option for linking everything
to a specified CONFIG_SYS_TEXT_BASE.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Igor Guryanov <guryanov@synopsys.com>
10 years agoarc: add dependences on MMU presence
Alexey Brodkin [Wed, 24 Dec 2014 14:00:29 +0000 (17:00 +0300)]
arc: add dependences on MMU presence

Depending on MMU presence in CPU there're differences in HW behavior.
For example address of instruction that caused exception is put in
ECR register if MMU exists and in ERET register otherwise.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Igor Guryanov <guryanov@synopsys.com>
10 years agoarc: interrupts - fix mask setup
Igor Guryanov [Wed, 24 Dec 2014 13:31:26 +0000 (16:31 +0300)]
arc: interrupts - fix mask setup

To disable interrupts we need to reset corresponding flags in STATUS32
register. For this we need to OR flags for interrupts level1 and level2
and then AND with current value in STATUS32.

Before that implementation was incorrect.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Igor Guryanov <guryanov@synopsys.com>
10 years agoarc: add ECR (exception cause register) output
Igor Guryanov [Wed, 24 Dec 2014 13:26:14 +0000 (16:26 +0300)]
arc: add ECR (exception cause register) output

Exception cause register (ECR) contains value that describes a reason
for exception that has happened. This helps a lot to figure-out what
went wrong.

Now we print this register contents when dumping registers.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Igor Guryanov <guryanov@synopsys.com>
10 years agoarc: check caches existence before use
Igor Guryanov [Wed, 24 Dec 2014 13:07:07 +0000 (16:07 +0300)]
arc: check caches existence before use

Some cache operations ({i|d}cache_{enable|disable|status} or
flush_dcache_all) are built and used even if CONFIG_SYS_{I|D}CACHE_OFF
is set.

This is required for force disable of caches on early boot.
What if something was executed before U-boot and enabled caches
(low-level bootloaders, previously run kernel etc.)?

But if CPU doesn't really have caches any attempt to access
cache-related AUX registers triggers instruction error exception.

So for convenience we'll try to avoid exceptions by checking if CPU
actually has caches (we check separately data and instruction cache
existence) at all.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Igor Guryanov <guryanov@synopsys.com>
10 years agoMerge branch 'buildman' of git://git.denx.de/u-boot-x86
Tom Rini [Thu, 15 Jan 2015 15:18:05 +0000 (10:18 -0500)]
Merge branch 'buildman' of git://git.denx.de/u-boot-x86

10 years agobuildman: Add an option to write the full build output
Simon Glass [Tue, 2 Dec 2014 00:34:07 +0000 (17:34 -0700)]
buildman: Add an option to write the full build output

Normally buildman runs with 'make -s' meaning that only errors and warnings
appear in the log file. Add a -V option to run make in verbose mode, and
with V=1, causing a full build log to be created.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Add the option to download toolchains from kernel.org
Simon Glass [Tue, 2 Dec 2014 00:34:06 +0000 (17:34 -0700)]
buildman: Add the option to download toolchains from kernel.org

The site at https://www.kernel.org/pub/tools/crosstool/ is a convenient
repository of toolchains which can be used for U-Boot. Add a feature to
download and install a toolchain for a selected architecture automatically.

It isn't clear how long this site will stay in the current place and
format, but we should be able to rely on bug reports if it changes.

Suggested-by: Marek VaĊĦut <marex@denx.de>
Suggested-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Allow architecture to alias to multiple toolchains
Simon Glass [Tue, 2 Dec 2014 00:34:05 +0000 (17:34 -0700)]
buildman: Allow architecture to alias to multiple toolchains

Some archs have need than one alias, so support a list of alises in the
..buildman file.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Don't use the local settings when running tests
Simon Glass [Tue, 2 Dec 2014 00:34:04 +0000 (17:34 -0700)]
buildman: Don't use the local settings when running tests

We should create a test setting file when running testes, not use whatever
happens to be on the local machine.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Don't complain about missing sections in ~/.buildman
Simon Glass [Tue, 2 Dec 2014 00:34:03 +0000 (17:34 -0700)]
buildman: Don't complain about missing sections in ~/.buildman

Silently ignore this since it is valid to have missing sections.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Add documentation about the .buildman file
Simon Glass [Tue, 2 Dec 2014 00:34:02 +0000 (17:34 -0700)]
buildman: Add documentation about the .buildman file

This file is only partially documented. Add some more details.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Wolfgang Denk <wd@denx.de>
10 years agobuildman: Add a note about Python pre-requisites
Simon Glass [Tue, 2 Dec 2014 00:34:01 +0000 (17:34 -0700)]
buildman: Add a note about Python pre-requisites

Since we need a few modules which might not be available in a bare-bones
distribution, add a note about that to the README.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Wolfgang Denk <wd@denx.de>
10 years agobuildman: Add an option to use the full tool chain path
Simon Glass [Tue, 2 Dec 2014 00:34:00 +0000 (17:34 -0700)]
buildman: Add an option to use the full tool chain path

In some cases there may be multiple toolchains with the same name in the
path. Provide an option to use the full path in the CROSS_COMPILE
environment variable.

Note: Wolfgang mentioned that this is dangerous since in some cases there
may be other tools on the path that are needed. So this is set up as an
option, not the default. I will need test confirmation (i.e. that this
commit fixes a real problem) before merging it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Steve Rae <srae@broadcom.com>
10 years agobuildman: Put the toolchain path first instead of last in PATH
Simon Glass [Tue, 2 Dec 2014 00:33:59 +0000 (17:33 -0700)]
buildman: Put the toolchain path first instead of last in PATH

If:

1. Toolchains A and B have the same filename
2. Toolchain A is in the PATH
3. Toolchain B is given in ~/.buildman and buildman uses it to build

then buildman will add toolchain B to the end of its path but will not
necessarily use it since U-Boot will find toolchain A first in the PATH.

Try to fix this by putting the toolchain first in the path instead of
last.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Try to avoid hard-coded string parsing
Simon Glass [Tue, 2 Dec 2014 00:33:58 +0000 (17:33 -0700)]
buildman: Try to avoid hard-coded string parsing

The assumption that the compiler name will always end in gcc is incorrect
for clang and apparently on BSD.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Allow specifying a range of commits to build
Simon Glass [Tue, 2 Dec 2014 00:33:57 +0000 (17:33 -0700)]
buildman: Allow specifying a range of commits to build

Adjust the -b flag to permit a range expression as well as a branch.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Tested-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
10 years agobuildman: Don't remove entire output directory when testing
Simon Glass [Tue, 2 Dec 2014 00:33:56 +0000 (17:33 -0700)]
buildman: Don't remove entire output directory when testing

When running tests the output directory is often wiped. This is only safe if
a branch is being built. The output directory may contain other things
besides the buildman test output.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Add an option to flatten output directory trees
Simon Glass [Tue, 2 Dec 2014 00:33:55 +0000 (17:33 -0700)]
buildman: Add an option to flatten output directory trees

When building current source for a single board, buildman puts the output
in <output_dir>/current/current/<board>. Add an option to make it use
<output_dir>/<board> instead. This removes the unnecessary directories
in that case, controlled by the --no-subdirs/-N option.

Suggested-by: Tom Rini <trini@ti.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Try to guess the upstream commit
Simon Glass [Tue, 2 Dec 2014 00:33:54 +0000 (17:33 -0700)]
buildman: Try to guess the upstream commit

Buildman normally obtains the upstream commit by asking git. Provided that
the branch was created with 'git checkout -b <branch> <some_upstream>' then
this normally works.

When there is no upstream, we can try to guess one, by looking up through
the commits until we find a branch. Add a function to try this and print
a warning if buildman ends up relying on it.

Also update the documentation to match.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Wolfgang Denk <wd@denx.de>
10 years agobuildman: Don't prune output space for 'current source' build
Simon Glass [Tue, 2 Dec 2014 00:33:53 +0000 (17:33 -0700)]
buildman: Don't prune output space for 'current source' build

This is not needed since we always do a full (non-incremental) build. Also
it might be dangerous since it will try to delete everything below the
base directory.

Fix this potentially nasty bug.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Put build in 'current', not 'current/current'
Simon Glass [Tue, 2 Dec 2014 00:33:52 +0000 (17:33 -0700)]
buildman: Put build in 'current', not 'current/current'

Buildman currently puts current-source builds in a current/current
subdirectory, but there is no need for the extra depth.

Suggested-by: Albert Aribaud <albert.u.boot@aribaud.net>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agobuildman: Add tests that check the correct output directory is used
Simon Glass [Tue, 2 Dec 2014 00:33:51 +0000 (17:33 -0700)]
buildman: Add tests that check the correct output directory is used

Add a few tests of the output directory logic.

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoMerge branch 'next' of git://git.denx.de/u-boot-video
Tom Rini [Wed, 14 Jan 2015 21:26:15 +0000 (16:26 -0500)]
Merge branch 'next' of git://git.denx.de/u-boot-video

10 years agonet: Declare physical address as phys_addr_t unsigned type
Michal Simek [Wed, 14 Jan 2015 15:00:39 +0000 (16:00 +0100)]
net: Declare physical address as phys_addr_t unsigned type

Use phys_addr_t instead of int for addresses.
Addresses can't be < 0.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
10 years agoARM: armv8: Fix typo in commentary
Michal Simek [Wed, 14 Jan 2015 14:36:35 +0000 (15:36 +0100)]
ARM: armv8: Fix typo in commentary

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
10 years agodoc: ARM: Use the right function name
Michal Simek [Wed, 14 Jan 2015 14:36:34 +0000 (15:36 +0100)]
doc: ARM: Use the right function name

Trivial fix.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
10 years agoKconfig: move CONFIG_SYS_CLK_FREQ to Kconfig
Alexey Brodkin [Tue, 13 Jan 2015 15:49:01 +0000 (18:49 +0300)]
Kconfig: move CONFIG_SYS_CLK_FREQ to Kconfig

It makes sense to specify CONFIG_SYS_CLK_FREQ in "configs/xx_defconfig"
instead of "include/configs/xxx.h" because then header will be reusable
across boards with different CPU clocks.

Also this nice to have an ability for end user to tune this value
himself via "menuconfig".

For now I'm only applying this change to all ARC configs because
otherwise scope of change will be huge.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Tom Rini <trini@ti.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Hans de Goede <hdegoede@redhat.com>
cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agospl: spl_nor: surround Linux-load code with #ifdef CONFIG_SPL_OS_BOOT
Masahiro Yamada [Thu, 8 Jan 2015 10:23:35 +0000 (19:23 +0900)]
spl: spl_nor: surround Linux-load code with #ifdef CONFIG_SPL_OS_BOOT

If CONFIG_SPL_NOR_SUPPORT is defined, spl_nor_load_image() requires
spl_start_uboot(), CONFIG_SYS_OS_BASE, CONFIG_SYS_SPL_ARGS_ADDR,
CONFIG_SYS_FDT_BASE to be defined even if users just want to run
U-Boot, not Linux.  This is inconvenient.

This patch is following the codying style of common/spl/spl_nand.c.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>