aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-12-07 13:04:15 +0000
committerJon Medhurst <tixy@linaro.org>2013-01-17 09:29:16 +0000
commitf123634e1f98b56a22627dbed0951191d8cc8ccc (patch)
tree4a868b12200b2cb6f33d2cb51af9cd7b717f313f
parentc9e71f2c449b4dd347afc88eb8a04b336b06c527 (diff)
Both the Android and Ubuntu have QA tests which expect to be able to validate device-tree booting by looking in /proc/device-tree, so we should enable this for all Linaro builds. At the same time we can remove this option from ubuntu.conf as it's not an Ubuntu specific requirement. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--linaro/configs/linaro-base.conf1
-rw-r--r--linaro/configs/ubuntu.conf1
2 files changed, 1 insertions, 1 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index eaf0196a127f..23638c3d214b 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -87,3 +87,4 @@ CONFIG_CRC7=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_FUNCTION_TRACER=y
CONFIG_ENABLE_DEFAULT_TRACERS=y
+CONFIG_PROC_DEVICETREE=y
diff --git a/linaro/configs/ubuntu.conf b/linaro/configs/ubuntu.conf
index fafabe1ceb57..b65be649bb18 100644
--- a/linaro/configs/ubuntu.conf
+++ b/linaro/configs/ubuntu.conf
@@ -721,7 +721,6 @@ CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_DTC=y
CONFIG_OF=y
-CONFIG_PROC_DEVICETREE=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_ADDRESS=y