summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2014-12-02 21:31:03 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2014-12-04 23:07:41 +0300
commitc5076c6330562680965ff21f81c2ea6322c845b5 (patch)
treee8002b9db0cba563e0676d0f527c494126f05417
parent5927ebc2be99695b8fe2abd1c533f160875dfd95 (diff)
downloadconfigs-c5076c6330562680965ff21f81c2ea6322c845b5.tar.gz
configs: reorganize linaro-base*.conf config fragments
Currently we have linaro-base.conf (all basic config options, arch/arm specific included), and linaro-base64.conf (config options we use for arm64 builds). So for arm 32-bit builds one should use linaro-base.conf, while for arm 64-bit ones - linaro-base.conf *plus* linaro-base64.conf. This is 1) confusing (some patches I receive treat linaro-base64.conf as the only linaro-base* fragment to be used for 64-bit builds, and do the same changes to both linaro-base.conf and linaro-base64.conf), and 2) not quite right to have arch/arm specific options in the config fragment used for arch/arm64 builds. Let's leave all the generic options in linaro-base.conf, and put the arch specific ones into separate config fragments. So that the use pattern would become the same for arm 32-bit and 64-bit builds: * 32-bit case: use linaro-base.conf plus linaro-base-arm.conf * 64-bit case: use linaro-base.conf plus linaro-base-arm64.conf Not to break the current builds, the options moved to linaro-base-arm.conf are not removed from linaro-base.conf by this commit. This will be done later, when all the builds are updated to use linaro-base.conf plus linaro-base-arm.conf. Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--linaro/configs/linaro-base-arm.conf3
-rw-r--r--linaro/configs/linaro-base-arm64.conf3
l---------[-rw-r--r--]linaro/configs/linaro-base64.conf4
3 files changed, 7 insertions, 3 deletions
diff --git a/linaro/configs/linaro-base-arm.conf b/linaro/configs/linaro-base-arm.conf
new file mode 100644
index 00000000000..70f771bf2c4
--- /dev/null
+++ b/linaro/configs/linaro-base-arm.conf
@@ -0,0 +1,3 @@
+CONFIG_THUMB2_KERNEL=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
diff --git a/linaro/configs/linaro-base-arm64.conf b/linaro/configs/linaro-base-arm64.conf
new file mode 100644
index 00000000000..4ce12fd20c0
--- /dev/null
+++ b/linaro/configs/linaro-base-arm64.conf
@@ -0,0 +1,3 @@
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_HUGETLBFS=y
diff --git a/linaro/configs/linaro-base64.conf b/linaro/configs/linaro-base64.conf
index 4ce12fd20c0..a5af95de3e5 100644..120000
--- a/linaro/configs/linaro-base64.conf
+++ b/linaro/configs/linaro-base64.conf
@@ -1,3 +1 @@
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_HUGETLBFS=y
+linaro-base-arm64.conf \ No newline at end of file