summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2016-03-17 18:43:06 -0400
committerMike Frysinger <vapier@google.com>2016-03-17 18:43:06 -0400
commit819860d88b8ad2b59276934a5415ff626bf41ab1 (patch)
tree5220211d7bd0c3c35a63277d21a8090240701fca
parentf77dfd511a2aede9b7139cbffadddda65c44460d (diff)
downloadimagination-819860d88b8ad2b59276934a5415ff626bf41ab1.tar.gz
soc.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: If6bdf872a6431b06c4cb5d1811db111a05d98995
-rw-r--r--soc/fs1130/soc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/soc/fs1130/soc.mk b/soc/fs1130/soc.mk
index 687bb31..4be2955 100644
--- a/soc/fs1130/soc.mk
+++ b/soc/fs1130/soc.mk
@@ -46,7 +46,7 @@ BOARD_SEPOLICY_DIRS += \
TARGET_KERNEL_SRC := hardware/bsp/kernel/imagination/v4.1
TARGET_KERNEL_DEFCONFIG := pistachio_defconfig
-TARGET_KERNEL_CONFIGS := $(realpath $(LOCAL_PATH)/soc.kconf)
+TARGET_KERNEL_CONFIGS := $(TARGET_KERNEL_CONFIGS) $(realpath $(LOCAL_PATH)/soc.kconf)
# Keystore HAL
DEVICE_PACKAGES += \