summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2016-03-17 18:44:27 -0400
committerMike Frysinger <vapier@google.com>2016-03-17 23:59:30 +0000
commitfd922c5a1905f83bb51a5952007606ced3bde6dd (patch)
tree6e0764413bd8e3666b11f0d18bb8891b0c3acb26
parent2d57e1471a23826addd6b9c86e73804fc8e1fbdc (diff)
downloadkylin-fd922c5a1905f83bb51a5952007606ced3bde6dd.tar.gz
BoardConfig.mk: do not clobber TARGET_KERNEL_CONFIGS
This variable is a list of multiple kconf entries, so don't clobber it. BUG=b/27675566 TEST=built edison w/custom settings and it works now Change-Id: I490f224657d4ded57dd0d146a9fabba713bb69f4
-rw-r--r--BoardConfig.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3f9bb1d..e4a07aa 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -34,7 +34,7 @@ else
TARGET_KERNEL_SRC := hardware/bsp/kernel/common/v4.1
endif
TARGET_KERNEL_DEFCONFIG := rk3036_kylin_defconfig
-TARGET_KERNEL_CONFIGS := $(PWD)/device/rockchip/kylin/soc/soc.kconf
+TARGET_KERNEL_CONFIGS := $(TARGET_KERNEL_CONFIGS) $(PWD)/device/rockchip/kylin/soc/soc.kconf
TARGET_KERNEL_DTB := rk3036-kylin.dtb
TARGET_KERNEL_DTB_APPEND := true