Remove redundant dollar signs in Config.in files

Some Config.in(.host) files have constructs like:

config FOO_VERSION
	string
	default "1.0" if FOO_1_0
	default "2.0" if FOO_2_0
	default $FOO_CUSTOM_VERSION if FOO_CUSTOM

The dollar sign here is not needed and confusing, so can be removed.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index eb2b0b22d995441015d1bba4e6ba38ed1246f646..a409acaca40fc63b1092e50ce14340b698cc199e 100644 (file)
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -41,9 +41,9 @@ endif
 config BR2_TARGET_BAREBOX_VERSION
        string
        default "2013.10.0"     if BR2_TARGET_BAREBOX_LATEST_VERSION
-       default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
+       default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
        default "custom"        if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
-       default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
+       default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 
 config BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR
        string "custom patch dir"

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 7a20d06d0aaceb4d4ba796522c0992e1725437c9..88c076dd7016b970ee693d653c78cad7ade11ce3 100644 (file)
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -47,9 +47,9 @@ endif
 config BR2_TARGET_UBOOT_VERSION
        string
        default "2013.10"       if BR2_TARGET_UBOOT_LATEST_VERSION
-       default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
+       default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
        default "custom"        if BR2_TARGET_UBOOT_CUSTOM_TARBALL
-       default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
+       default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
        string "custom patch dir"

diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index f15e73033d40aa13c536a111adc96e6afa397597..e2a3ee902170918d5a4e0dd50c35ecdc6f4cf5a9 100644 (file)
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -58,7 +58,7 @@ config BR2_TARGET_ROOTFS_JFFS2_PAGESIZE
        default 0x800 if BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K
        default 0x1000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_128
        default 0x1000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_64
-       default $(BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE) if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
+       default BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 
 config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
        hex
@@ -68,7 +68,7 @@ config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
        default 0x20000 if BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K
        default 0x20000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_128
        default 0x10000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_64
-       default $(BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE) if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
+       default BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 
 config BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER
        bool "Do not use Cleanmarker"

diff --git a/linux/Config.in b/linux/Config.in
index f7c53308411f17bb34a56a0c2b1bbd7435f37095..52291d8d71c8f1dfdd414eaaf1c65de34f917e35 100644 (file)
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -79,7 +79,7 @@ config BR2_LINUX_KERNEL_VERSION
        default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
        default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
        default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
-       default $BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
+       default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
 
 #
 # Patch selection

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index bd2ad8c8f6c190e9f39d413edbe2b891e2dad074..41c1213680c58a064d1245029dd5faa85e9664ea 100644 (file)
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -91,7 +91,7 @@ config BR2_GCC_VERSION
        default "4.7.3"     if BR2_GCC_VERSION_4_7_X
        default "4.8.2"     if BR2_GCC_VERSION_4_8_X
        default "4.8-arc"   if BR2_GCC_VERSION_4_8_ARC
-       default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
+       default BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
        string "Additional gcc options"

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index a32f6659b752f71f931f4d760367abac0669af50..88aa7e57373c95d6d05598a64e20b092574ec089 100644 (file)
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -89,4 +89,4 @@ config BR2_DEFAULT_KERNEL_HEADERS
        default "3.10.17"       if BR2_KERNEL_HEADERS_3_10
        default "3.11.6"        if BR2_KERNEL_HEADERS_3_11
        default "2.6"           if BR2_KERNEL_HEADERS_SNAP
-       default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
+       default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 2de0270a5224a78457a5d2fbc42a260036175c04..0e7ae545cdd9d0a05f90a6d9218f95d4c46be76e 100644 (file)
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -37,7 +37,7 @@ config BR2_UCLIBC_VERSION_STRING
        default 0.9.32.1        if BR2_UCLIBC_VERSION_0_9_32
        default 0.9.33.2        if BR2_UCLIBC_VERSION_0_9_33
        default 0.9.33-arc      if BR2_UCLIBC_VERSION_0_9_33_ARC
-       default $BR2_USE_UCLIBC_SNAPSHOT        if BR2_UCLIBC_VERSION_SNAPSHOT
+       default BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
        string "uClibc configuration file to use?"

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 0d42041e1b9227fa7096f3908d266f15f6b5d71e..48b5865103550bd0e0065f6e8946b5f1d144dcfc 100644 (file)
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -849,7 +849,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
        default "bfin-linux-uclibc"      if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FDPIC
        default "bfin-uclinux"           if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FLAT
        default "bfin-linux-uclibc"      if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FDPIC
-       default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
+       default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX \
                                         if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
 config BR2_TOOLCHAIN_EXTERNAL_GLIBC