hikey: restructure hikey device configuration

No functional changes. Just moved around the configuration files and
restructured them to support future hikey family devices. Similar to
how Marlin and Sailfish devices are configured.

Split the board configuration into BoardConfigCommon.mk (for common
configuration) and hikey/BoardConfig.mk (for hikey specific
configuration e.g. Image sizes and kernel commandline).
Similarly split device.mk into device-common.mk and hikey/device-hikey.mk.
Updated hikey.mk to include both device-common.mk and hikey/device-hikey.mk.
Renamed init.hikey.rc to init.common.rc and modified it to import
init.${ro.hardware}.usb.rc and mount fstab.${ro.hardware} instead.

Changes to be committed:
renamed:	BoardConfig.mk => BoardConfigCommon.mk (68%)
renamed:	hikey.kl => common.kl (100%)
renamed:	device.mk => device-common.mk (74%)
modified:	hikey.mk
new file:	hikey/BoardConfig.mk
renamed:	board-info.txt => hikey/board-info.txt (100%)
new file:	hikey/device-hikey.mk
renamed:	fstab.hikey => hikey/fstab.hikey (100%)
renamed:	fstab.hikey-4.1 => hikey/fstab.hikey-4.1 (100%)
renamed:	init.hikey.rc => init.common.rc (97%)
renamed:	init.hikey.usb.rc => init.common.usb.rc (100%)
renamed:	ueventd.hikey.rc => ueventd.common.rc (100%)

Test: Manual

Change-Id: I032323aa8846a3bc144e40b4b5e5348c8f8d11c5
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

5 files changed, 92 insertions, 0 deletions

diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
new file mode 100644
index 00000000..6d171308
--- /dev/null
+++ b/hikey/BoardConfig.mk
@@ -0,0 +1,17 @@
+include device/linaro/hikey/BoardConfigCommon.mk
+
+TARGET_BOARD_PLATFORM := hikey
+ifeq ($(TARGET_KERNEL_USE_4_1), true)
+BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
+else
+BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
+endif
+
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
+ifeq ($(TARGET_USERDATAIMAGE_4GB), true)
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 1595915776
+else
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 5588893184
+endif
+BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
+BOARD_FLASH_BLOCK_SIZE := 131072
diff --git a/hikey/board-info.txt b/hikey/board-info.txt
new file mode 100644
index 00000000..f0547217
--- /dev/null
+++ b/hikey/board-info.txt
@@ -0,0 +1,2 @@
+require board=hikey
+require version-bootloader=0.4
diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk
new file mode 100644
index 00000000..03473582
--- /dev/null
+++ b/hikey/device-hikey.mk
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2011 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ifeq ($(TARGET_PREBUILT_KERNEL),)
+LOCAL_KERNEL := device/linaro/hikey-kernel/Image-dtb
+LOCAL_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb
+LOCAL_FSTAB := fstab.hikey
+else
+LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
+LOCAL_DTB := $(TARGET_PREBUILT_DTB)
+LOCAL_FSTAB := $(TARGET_FSTAB)
+endif
+
+PRODUCT_COPY_FILES +=   $(LOCAL_KERNEL):kernel \
+                        $(LOCAL_DTB):hi6220-hikey.dtb \
+			$(LOCAL_PATH)/$(LOCAL_FSTAB):root/fstab.hikey \
+			device/linaro/hikey/init.common.rc:root/init.hikey.rc \
+			device/linaro/hikey/init.common.usb.rc:root/init.hikey.usb.rc \
+			device/linaro/hikey/ueventd.common.rc:root/ueventd.hikey.rc \
+			device/linaro/hikey/common.kl:system/usr/keylayout/hikey.kl
+
+# Build HiKey HDMI audio HAL
+PRODUCT_PACKAGES += audio.primary.hikey
+
+# Include USB speed switch App
+PRODUCT_PACKAGES += UsbSpeedSwitch
+
+# Build libion
+PRODUCT_PACKAGES += libion
+
+# Build gralloc for hikey
+PRODUCT_PACKAGES += gralloc.hikey
+
+# PowerHAL
+PRODUCT_PACKAGES += power.hikey
+
+# Include vendor binaries
+$(call inherit-product-if-exists, vendor/linaro/hikey/device-vendor.mk)
diff --git a/hikey/fstab.hikey b/hikey/fstab.hikey
new file mode 100644
index 00000000..a2458eb6
--- /dev/null
+++ b/hikey/fstab.hikey
@@ -0,0 +1,11 @@
+# Android fstab file.
+#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/system      /system             ext4      ro                                                                   wait
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/system      /system             squashfs  ro                                                                   wait
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/cache       /cache              ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+/devices/platform/soc/f723e000.dwmmc1/mmc_host/mmc*                   auto               auto      defaults  voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/soc/f72c0000.usb/usb*               auto               auto      defaults  voldmanaged=usbdisk:auto,encryptable=userdata
diff --git a/hikey/fstab.hikey-4.1 b/hikey/fstab.hikey-4.1
new file mode 100644
index 00000000..ceab636d
--- /dev/null
+++ b/hikey/fstab.hikey-4.1
@@ -0,0 +1,11 @@
+# Android fstab file.
+#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             ext4      ro                                                                   wait
+/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             squashfs  ro                                                                   wait
+/dev/block/platform/f723d000.dwmmc0/by-name/cache       /cache              ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+/dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+/devices/platform/f723e000.dwmmc1/mmc_host/mmc*                   auto               auto      defaults  voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/f72c0000.usb/usb*               auto               auto      defaults  voldmanaged=usbdisk:auto,encryptable=userdata