diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2016-04-20 17:13:59 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-25 15:10:34 -0400 |
| commit | cd593ed6999970cc705571332f0f3be7e40d1a96 (patch) | |
| tree | 40f69303d820e3121097c1c9b00b6ac0b9381ed0 /board | |
| parent | ae4dc15d98c0a591a41f449c6887707fa3891dd7 (diff) | |
| download | talos-obmc-uboot-cd593ed6999970cc705571332f0f3be7e40d1a96.tar.gz talos-obmc-uboot-cd593ed6999970cc705571332f0f3be7e40d1a96.zip | |
ARM: hisilicon: hikey: Enable OF_CONTROL for hikey board.
Currently only the serial pl01x driver is using DT,
and the other drivers still use platform data but
as more DT lands in the upstream kernel the aim is
to migrate the other drivers over to DT as well to
have a fully DT configured hikey u-boot.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/hisilicon/hikey/hikey.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 3b484a96e9..3f0a0cc0da 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -71,6 +71,8 @@ U_BOOT_DEVICES(hi6220_gpios) = { DECLARE_GLOBAL_DATA_PTR; +#if !CONFIG_IS_ENABLED(OF_CONTROL) + static const struct pl01x_serial_platdata serial_platdata = { #if CONFIG_CONS_INDEX == 1 .base = HI6220_UART0_BASE, @@ -87,6 +89,7 @@ U_BOOT_DEVICE(hikey_seriala) = { .name = "serial_pl01x", .platdata = &serial_platdata, }; +#endif static struct mm_region hikey_mem_map[] = { { |
