From c5076c6330562680965ff21f81c2ea6322c845b5 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Tue, 2 Dec 2014 21:31:03 +0300 Subject: 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 --- linaro/configs/linaro-base-arm.conf | 3 +++ linaro/configs/linaro-base-arm64.conf | 3 +++ linaro/configs/linaro-base64.conf | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 linaro/configs/linaro-base-arm.conf create mode 100644 linaro/configs/linaro-base-arm64.conf mode change 100644 => 120000 linaro/configs/linaro-base64.conf 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 deleted file mode 100644 index 4ce12fd20c0..00000000000 --- a/linaro/configs/linaro-base64.conf +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 120000 index 00000000000..a5af95de3e5 --- /dev/null +++ b/linaro/configs/linaro-base64.conf @@ -0,0 +1 @@ +linaro-base-arm64.conf \ No newline at end of file -- cgit v1.2.3