Fix rebase error introduced in 63cbf0c63b

Fixes https://bugs.launchpad.net/u-boot-linaro/+bug/1103004

Signed-off-by: John Rigby <john.rigby@linaro.org>
arndale5250: Boot in Hyp mode and enable architected timers

First, to boot in Hyp mode we need to change to non-secure mode, which
involves configuring the frequency of the arch. timers and setting all
interrupts on the gic to group 1 (this code was inspired by the boot
wrapper code).

Second, signal the secondary CPU while still in secure mode and have the
secondary CPU run the SPL.  The SPL checks the hardware cpu id, and if
it's a secondary CPU, it will initialize non-secure mode inside the SPL,
enter Hyp mode, and finally enter a new SMP pen with the same poking stick
interface as the regular kernel uses.

Third, on CPU0 we wait until u-boot is fully up to actually enter the
non-secure mode on CPU0, and stay in non-secure svc mode right up until
we actually load the kernel, where the last thing we do is enter Hyp
mode.

Let it roll...

Signed-off-by: Jeremy C. Andrus <jeremya@cs.columbia.edu>
Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>
EXYNOS5: ARNDALE: Implement board_late_init to set preboot and eth h/w address

preboot is used to start usb so that ethernet device could be found
automatically.

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
COMMAND: MMC: Extend mmc command to make emmc bootable

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
DRIVERS: DW_MMC: Correct the fifo_size

fifoth register does not have the fifo_size. For emmc to work,
fifo_size should be set 0x80.

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
ARNDALE: CONFIG: define function pointers to copy from emmc to RAM

It also defines macros for boot configuration.

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
EXYNOS5250: ARNDALE: Read operating mode and invoke copy functions accordingly

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
EXYNOS5250: ARNDALE: Check booting mode and initialize mmc/emmc accordingly

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
cmd_bootm: Add support to append MAC address to bootargs

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
ARNDALE: Enable config to append MAC address to bootargs

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
board: samsung: Update MAC address for Arndale board through GUID

There are a couple of GUID (Global Unique Identifier) registers within
EXYNOS5250 SoC. The values of these GUID registers are set as board
MAC address.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>