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>
master
Peter Griffin 8 years ago committed by Tom Rini
parent ae4dc15d98
commit cd593ed699
  1. 1
      arch/arm/Kconfig
  2. 2
      arch/arm/dts/Makefile
  3. 3
      board/hisilicon/hikey/hikey.c
  4. 1
      configs/hikey_defconfig

@ -668,6 +668,7 @@ config TARGET_HIKEY
select DM select DM
select DM_GPIO select DM_GPIO
select DM_SERIAL select DM_SERIAL
select OF_CONTROL
help help
Support for HiKey 96boards platform. It features a HI6220 Support for HiKey 96boards platform. It features a HI6220
SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM. SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.

@ -11,6 +11,8 @@ dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
exynos4412-trats2.dtb \ exynos4412-trats2.dtb \
exynos4412-odroid.dtb exynos4412-odroid.dtb
dtb-$(CONFIG_TARGET_HIKEY) += hi6220-hikey.dtb
dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
exynos5250-snow.dtb \ exynos5250-snow.dtb \
exynos5250-spring.dtb \ exynos5250-spring.dtb \

@ -71,6 +71,8 @@ U_BOOT_DEVICES(hi6220_gpios) = {
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if !CONFIG_IS_ENABLED(OF_CONTROL)
static const struct pl01x_serial_platdata serial_platdata = { static const struct pl01x_serial_platdata serial_platdata = {
#if CONFIG_CONS_INDEX == 1 #if CONFIG_CONS_INDEX == 1
.base = HI6220_UART0_BASE, .base = HI6220_UART0_BASE,
@ -87,6 +89,7 @@ U_BOOT_DEVICE(hikey_seriala) = {
.name = "serial_pl01x", .name = "serial_pl01x",
.platdata = &serial_platdata, .platdata = &serial_platdata,
}; };
#endif
static struct mm_region hikey_mem_map[] = { static struct mm_region hikey_mem_map[] = {
{ {

@ -14,3 +14,4 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey"

Loading…
Cancel
Save