aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2013-11-22 21:38:26 -0600
committerGary S. Robertson <gary.robertson@linaro.org>2013-12-19 18:13:15 -0600
commit051840c17c4f1f0d73da201eabdc2bb7f23c40f9 (patch)
tree22d7bce9d416abed23393eb238f634ded09d215c
parentbcc691ea533e88fd2d5b2962fbe90162a9c10b53 (diff)
Resolve merge conflict vs. <configs: Add config fragments for bigendian ARMV7 Linux> patch by <Victor Kamensky <victor.kamensky@linaro.org> 2013-08-28 12:24:58>
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
-rw-r--r--linaro/configs/bigendian.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/linaro/configs/bigendian.conf b/linaro/configs/bigendian.conf
index 281fa55d91d0..6a1020299e85 100644
--- a/linaro/configs/bigendian.conf
+++ b/linaro/configs/bigendian.conf
@@ -1,5 +1,4 @@
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_ENDIAN_BE8=y
-CONFIG_CPU_BE8_BOOT_LE=y
# CONFIG_VIRTUALIZATION is not set
# CONFIG_MMC_DW_IDMAC is not set