toolchain: configs: improve toolchain config readability

Add (or move) comment lines in toolchain-related Config.in files
to improve readability of the toolchain config section.

Source linux-headers/Config.in.host after toolchain-buildroot items.

For toolchain-buildroot case, the config file now looks like this:
*
* Toolchain
*

*
* Toolchain Buildroot Options
*

*
* Kernel Header Options
*

*
* uClibc Options
*

*
* Binutils Options
*

*
* GCC Options
*

*
* Host GDB Options
*

*
* Toolchain Generic Options
*

Signed-off-by: Petri Gynther <pgynther@google.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index 081073b9a766f391c4e6b9c5395dcfc5f9bcea57..a36dc0f0f0cee827b33d2b0e217eaa64c18e4277 100644 (file)
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -1,3 +1,5 @@
+comment "Host GDB Options"
+
 config BR2_PACKAGE_HOST_GDB
        bool "Build cross gdb for the host"
        # When the external toolchain gdbserver is used, we shouldn't

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index ae2a3cde7192ee09012097092fd0c3f8def73572..47ef25df224695125ecb860b78be7d5ebe338ca0 100644 (file)
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -1,8 +1,8 @@
+comment "Kernel Header Options"
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS
        bool
 
-comment "Kernel Header Options"
-
 choice
        prompt "Kernel Headers"
        default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index cbae096d6c93f880b3f78fc881db6cbc393419f9..fdf007e6018d47bdf174675a21ac889d0531e53d 100644 (file)
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -1,12 +1,12 @@
 if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 
+comment "uClibc Options"
+
 config BR2_PACKAGE_UCLIBC
        bool
        default y
        select BR2_PACKAGE_LINUX_HEADERS
 
-comment "uClibc Options"
-
 config BR2_UCLIBC_CONFIG
        string "uClibc configuration file to use?"
        default "package/uclibc/uClibc-ng.config"

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index c89e1816110f016b82304a1282acbcc6225c77a1..c8436cc3bef7424ecfd77137efe29bbbca9a1dfd 100644 (file)
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -2,6 +2,8 @@
 
 if BR2_TOOLCHAIN_BUILDROOT
 
+comment "Toolchain Buildroot Options"
+
 config BR2_TOOLCHAIN_BUILDROOT_VENDOR
        string "custom toolchain vendor name"
        default "buildroot"
@@ -18,8 +20,6 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR
 
          If you're not sure, just leave the default "buildroot" value.
 
-source "package/linux-headers/Config.in.host"
-
 choice
        prompt "C library"
        default BR2_TOOLCHAIN_UCLIBC
@@ -89,6 +89,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LIBC
        default "glibc"  if BR2_TOOLCHAIN_BUILDROOT_GLIBC
        default "musl"   if BR2_TOOLCHAIN_BUILDROOT_MUSL
 
+source "package/linux-headers/Config.in.host"
 source "package/linux-headers/Config.in"
 source "package/musl/Config.in"
 source "package/uclibc/Config.in"

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index b682e4d7014cd8bb78bf7ed6f55b8ea3f76de062..bf9dc7b93fdcc8fc8cc42594a08627773a1fcf3f 100644 (file)
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -5,6 +5,8 @@
 # so put it here instead
 source "package/gdb/Config.in.host"
 
+comment "Toolchain Generic Options"
+
 # https://sourceware.org/bugzilla/show_bug.cgi?id=19405
 config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
        bool

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index cdf01c9aa581fd07ae4eaa733019479831c6d081..5324599bf79016ee025776262b795cb2f40ba064 100644 (file)
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -1,5 +1,7 @@
 if BR2_TOOLCHAIN_EXTERNAL
 
+comment "Toolchain External Options"
+
 choice
        prompt "Toolchain"