Clean up makefile.

Change-Id: I78a0f53b63f9174d70d95f96997e070f80894986

4 files changed, 10 insertions, 62 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5eb50df..d9c7a17 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,7 +30,7 @@ BOARD_KERNEL_CMDLINE := console=ttyS2,115200n8 androidboot.console=ttyS2 android
 TARGET_KERNEL_ARCH := $(TARGET_ARCH)
 TARGET_KERNEL_SRC := hardware/bsp/kernel/common/v4.1
 TARGET_KERNEL_DEFCONFIG := rk3036_kylin_defconfig
-TARGET_KERNEL_CONFIGS := device/rockchip/kylin/soc/soc.kconf
+TARGET_KERNEL_CONFIGS := $(PWD)/device/rockchip/kylin/soc/soc.kconf
 TARGET_KERNEL_DTB := rk3036-kylin.dtb
 TARGET_KERNEL_DTB_APPEND := true
 
diff --git a/base_product/kylin.mk b/base_product/kylin.mk
index 6339757..d3904f1 100644
--- a/base_product/kylin.mk
+++ b/base_product/kylin.mk
@@ -29,12 +29,17 @@ PRODUCT_COPY_FILES += \
   system/core/rootdir/ueventd.rc:root/ueventd.rc \
 
 PRODUCT_COPY_FILES += \
-    device/rockchip/kylin/fstab:root/fstab.${soc_name} \
-    device/rockchip/kylin/provision-device:provision-device
+  device/rockchip/kylin/fstab:root/fstab.${soc_name} \
+  device/rockchip/kylin/provision-device:provision-device
 
-# Must be defined at the end of the file
-$(call add_device_packages)
+# Default Keystore HAL
+DEVICE_PACKAGES += \
+	keystore.default \
+	bootctrl.default
 
 # TODO: Install kylin-specific config file for weaved.
 # PRODUCT_COPY_FILES += \
 #  device/rockchip/kylin/base_product/weaved.conf:system/etc/weaved/weaved.conf
+
+# Must be defined at the end of the file
+$(call add_device_packages)
diff --git a/soc/soc.kconf b/soc/soc.kconf
index 571b06d..eac711a 100644
--- a/soc/soc.kconf
+++ b/soc/soc.kconf
@@ -22,4 +22,3 @@ CONFIG_EMAC_ROCKCHIP=y
 CONFIG_SND_SOC_RT5616=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
-
diff --git a/soc/soc.mk b/soc/soc.mk
deleted file mode 100644
index 2efe077..0000000
--- a/soc/soc.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2015 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.
-#
-
-# TODO(leecam): Make this automatic.
-LOCAL_PATH := hardware/bsp/rockchip/soc/rk3036
-
-# Arm32 device.
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv7-a
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-TARGET_KERNEL_ARCH := $(TARGET_ARCH)
-
-TARGET_NO_BOOTLOADER := false
-TARGET_NO_KERNEL := false
-
-BOARD_KERNEL_CMDLINE := console=ttyS2,115200n8 androidboot.console=ttyS2 androidboot.hardware=rk3036 earlyprintk selinux=enforcing
-
-TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_FLASH_BLOCK_SIZE := 131072
-
-PRODUCT_COPY_FILES += \
-  $(LOCAL_PATH)/init.rk3036.rc:root/init.rk3036.rc \
-  system/core/rootdir/init.usb.rc:root/init.usb.rc \
-  system/core/rootdir/ueventd.rc:root/ueventd.rc \
-
-# TODO: Move common/prebuilts/sepolicy include to audio_prebuilts.mk
-BOARD_SEPOLICY_DIRS += \
-       $(LOCAL_PATH)/sepolicy \
-
-# Set up the local kernel.
-TARGET_KERNEL_SRC := hardware/bsp/kernel/common/v4.1
-TARGET_KERNEL_DEFCONFIG := rk3036_kylin_defconfig
-TARGET_KERNEL_CONFIGS := $(realpath $(LOCAL_PATH)/soc.kconf)
-TARGET_KERNEL_DTB := rk3036-kylin.dtb
-TARGET_KERNEL_DTB_APPEND := true
-
-# Default Keystore HAL
-DEVICE_PACKAGES += \
-	keystore.default \
-	bootctrl.default