commit 2a07975bf1f180777640e2e298c6cb7fdd2da314
author Haojian Zhuang <haojian.zhuang@linaro.org> Fri Aug 01 20:30:12 2014 +0800
committer Wei Xu <xuwei5@hisilicon.com> Wed Sep 03 14:10:41 2014 +0100
tree c09688242f9821b1b1f65902796b9367425814e3
parent 40c7d4414b44a75971ba7c1a4fc1371dd7a299bf

ARM: config: enable hisilicon hip04

Enable CONFIG_ARCH_HIP04 in both hi3xxx_defconfig & multi_v7_defconfig.

Since CONFIG_ARM_LPAE is disabled by default, only 3GB memory could be
support by this defconfig. User should enable CONFIG_ARM_LPAE locally to
support 16GB memory on hip04 platform.

Since hip04 doesn't belong to hi3xxx series, rename hi3xxx_defconfig to
hisi_defconfig.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

arch/arm/configs/multi_v7_defconfig

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 5fb95fb..691117b 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -28,6 +28,7 @@
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_HI3xxx=y
 CONFIG_ARCH_HIX5HD2=y
+CONFIG_ARCH_HIP04=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MXC=y
 CONFIG_SOC_IMX51=y