Commit fbc2494a authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Peter Korsgaard
Browse files

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: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent a25e4a4c

boot/barebox/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -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"

boot/uboot/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -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"

fs/jffs2/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -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"

linux/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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

package/gcc/Config.in.host

+1 −1
Original line number Diff line number Diff line
@@ -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"