From 4b72854ddeb69855e5f91b640bb75cd73f77528b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Dec 2008 08:15:58 +0000
Subject: [PATCH] target/: get rid of unneeded $(strip ..)

---
 target/Makefile.in                            |  8 +++----
 target/cloop/Makefile.in                      |  2 +-
 target/cpio/cpioroot.mk                       |  2 +-
 target/cramfs/cramfs.mk                       |  2 +-
 target/device/AMD/Makefile.in                 |  2 +-
 .../Atmel/DataFlashBoot/DataflashBoot.mk      |  5 +++--
 target/device/Atmel/Makefile.in               | 22 +++++++++----------
 .../Atmel/at91bootstrap/at91bootstrap.mk      |  2 +-
 target/device/Atmel/atngw100-base/Makefile.in |  2 +-
 .../Atmel/atngw100-expanded/Makefile.in       |  2 +-
 target/device/Atmel/atngw100/Makefile.in      |  2 +-
 target/device/Atmel/u-boot/u-boot.mk          |  2 +-
 target/device/Hitachi/Makefile.in             |  2 +-
 target/device/Sharp/Makefile.in               |  2 +-
 target/device/Soekris/Makefile.in             | 10 ++++-----
 target/device/Via/Makefile.in                 |  4 ++--
 target/device/jp/Makefile.in                  |  2 +-
 target/device/jp/q5/linux.mk                  |  2 +-
 target/device/valka/Makefile.in               |  2 +-
 target/device/x86/Makefile.in                 |  2 +-
 target/ext2/ext2root.mk                       | 10 ++++-----
 target/initramfs/initramfs.mk                 |  4 ++--
 target/iso9660/iso9660.mk                     |  4 ++--
 target/jffs2/jffs2root.mk                     |  6 ++---
 target/powerpc/yaboot/yaboot.mk               |  2 +-
 target/romfs/romfs.mk                         |  2 +-
 target/squashfs/squashfsroot.mk               |  2 +-
 target/tar/tarroot.mk                         |  8 +++----
 target/u-boot/Makefile.in                     |  8 +++----
 target/ubifs/ubifsroot.mk                     |  4 ++--
 target/x86/grub/grub.mk                       |  2 +-
 target/x86/grub2/grub2.mk                     |  2 +-
 target/x86/syslinux/syslinux.mk               |  4 ++--
 33 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/target/Makefile.in b/target/Makefile.in
index 1875032602..d5d7613466 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -11,7 +11,7 @@ include target/device/Makefile.in
 include target/x86/Makefile.in
 include target/powerpc/Makefile.in
 
-ifeq ($(strip $(BR2_TARGET_UBOOT)),y)
+ifeq ($(BR2_TARGET_UBOOT),y)
 include target/u-boot/Makefile.in
 endif
 
@@ -22,13 +22,11 @@ include target/*/*.mk
 # We already did add the kernel target to TARGETS and now just pull in the rules
 # to actually build this target.
 
-ifeq ($(strip $(subst ",,$(BR2_KERNEL_LINUX))),y)
-#"))
+ifeq ($(BR2_KERNEL_LINUX),y)
 include target/linux/Makefile.in
 endif
 
-ifeq ($(strip $(subst ",,$(BR2_KERNEL_LINUX_ADVANCED))),y)
-#"))
+ifeq ($(BR2_KERNEL_LINUX_ADVANCED),y)
 include target/linux/Makefile.in.advanced
 endif
 
diff --git a/target/cloop/Makefile.in b/target/cloop/Makefile.in
index ee332beede..0afc58f87d 100644
--- a/target/cloop/Makefile.in
+++ b/target/cloop/Makefile.in
@@ -1,3 +1,3 @@
-ifeq ($(strip $(BR2_TARGET_ROOTFS_CLOOP)),y)
+ifeq ($(BR2_TARGET_ROOTFS_CLOOP),y)
 TARGETS+=clooproot
 endif
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index 89bb9a52eb..d0c522545f 100644
--- a/target/cpio/cpioroot.mk
+++ b/target/cpio/cpioroot.mk
@@ -91,6 +91,6 @@ cpioroot-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_CPIO)),y)
+ifeq ($(BR2_TARGET_ROOTFS_CPIO),y)
 TARGETS+=cpioroot
 endif
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 2e9e65124c..17a3f00b6b 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -91,6 +91,6 @@ cramfsroot-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_CRAMFS)),y)
+ifeq ($(BR2_TARGET_ROOTFS_CRAMFS),y)
 TARGETS+=cramfsroot
 endif
diff --git a/target/device/AMD/Makefile.in b/target/device/AMD/Makefile.in
index 32dd4707f4..ab724b5540 100644
--- a/target/device/AMD/Makefile.in
+++ b/target/device/AMD/Makefile.in
@@ -1,5 +1,5 @@
 # Override the default uClibc configuration
-ifeq ($(strip $(BR2_TARGET_AMD_ALCHEMY_DBAU1500)),y)
+ifeq ($(BR2_TARGET_AMD_ALCHEMY_DBAU1500),y)
 
 include target/device/AMD/DBAu1500/Makefile.in
 include target/device/AMD/DBAu1500/linux.mk
diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
index 23930a330a..0a2ffcbbc8 100644
--- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
+++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
@@ -5,7 +5,8 @@
 #############################################################
 DATAFLASHBOOT_VERSION:=1.05
 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION)
-ATMEL_MIRROR:=$(strip  $(subst ",, $(BR2_ATMEL_MIRROR)))
+ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR)))
+# "))
 DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)/Source
 DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2
 DATAFLASHBOOT_DIR:=$(PROJECT_BUILD_DIR)/$(DATAFLASHBOOT_NAME)
@@ -42,6 +43,6 @@ endif
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_DATAFLASHBOOT)),y)
+ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
 TARGETS+=dataflash
 endif
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index 8ad35c62c0..117a7c2523 100644
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -1,11 +1,11 @@
 # *******************************************************************
 
-ifeq ($(strip $(BR2_TARGET_ATMEL)),y)
+ifeq ($(BR2_TARGET_ATMEL),y)
 ATMEL_PATH:=target/device/Atmel
 
-BOARD_NAME:=$(strip  $(subst ",, $(BR2_BOARD_NAME)))
+BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME)))
 #"))
-BOARD_PATH:=$(strip  $(subst ",, $(BR2_BOARD_PATH)))
+BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH)))
 #"))
 
 ATMEL_TARGET:=$(ATMEL_PATH)/root
@@ -13,22 +13,22 @@ TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton
 TARGET_DEVICE_TABLE:=$(ATMEL_TARGET)/device_table.txt
 TARGET_SKELETON_LINKS:=$(ATMEL_TARGET)/skel.tar.gz
 
-TARGET_ATMEL_COPYTO:=$(strip  $(subst ",, $(BR2_TARGET_ATMEL_COPYTO)))
+TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO)))
 
 # These are set by Config.in
-DOWNLOAD_LINUX26_VERSION:=$(strip  $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION)))
+DOWNLOAD_LINUX26_VERSION:= $(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION)))
 #"))
 ifeq ($(DOWNLOAD_LINUX26_VERSION),)
 DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
 endif
 
-LINUX26_VERSION:=$(strip  $(subst ",, $(BR2_LINUX26_VERSION)))
+LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION)))
 #"))
 ifeq ($(LINUX26_VERSION),)
 LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
 endif
 
-LINUX26_RC_PATCH:=$(strip  $(subst ",, $(BR2_LINUX26_RC_PATCH)))
+LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH)))
 #"))
 
 # These are set by "new" Config.in
@@ -39,7 +39,7 @@ LINUX26_BUILD_DIR:=$(PROJECT_BUILD_DIR)
 
 #LINUX26_BINLOC=$(LINUX26_FORMAT)
 #LINUX26_BINLOC:=$(BINARIES_DIR)/$(LINUX26_KERNEL)
-ifeq ($(strip $(BR2_avr32)),y)
+ifeq ($(BR2_avr32),y)
 LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(BR2_PACKAGE_LINUX_FORMAT)
 endif
 
@@ -63,15 +63,15 @@ include target/device/Atmel/*/Makefile.in
 UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config
 UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h
 
-ifeq ($(strip $(BR2_TARGET_UBOOT_AT91)),y)
+ifeq ($(BR2_TARGET_UBOOT_AT91),y)
 include $(ATMEL_PATH)/u-boot/u-boot.mk
 endif
 
-ifeq ($(strip $(BR2_TARGET_DATAFLASHBOOT)),y)
+ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
 include $(ATMEL_PATH)/DataFlashBoot/DataflashBoot.mk
 endif
 
-ifeq ($(strip $(BR2_TARGET_AT91BOOTSTRAP)),y)
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk
 endif
 
diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
index 66558107d9..facee12f34 100644
--- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk
+++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
@@ -86,6 +86,6 @@ at91bootstrap-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_AT91BOOTSTRAP)),y)
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 TARGETS+=at91bootstrap
 endif
diff --git a/target/device/Atmel/atngw100-base/Makefile.in b/target/device/Atmel/atngw100-base/Makefile.in
index 5af1ebf9a9..c80a0bc2c6 100644
--- a/target/device/Atmel/atngw100-base/Makefile.in
+++ b/target/device/Atmel/atngw100-base/Makefile.in
@@ -1,4 +1,4 @@
-ifeq ($(strip $(BR2_TARGET_AVR32_ATNGW100_BASE)),y)
+ifeq ($(BR2_TARGET_AVR32_ATNGW100_BASE),y)
 ATNGW100_BASE_PATH=target/device/Atmel/atngw100-base
 
 TARGET_SKELETON=$(ATNGW100_BASE_PATH)/target_skeleton
diff --git a/target/device/Atmel/atngw100-expanded/Makefile.in b/target/device/Atmel/atngw100-expanded/Makefile.in
index f7cb822ae9..7ea35e02e3 100644
--- a/target/device/Atmel/atngw100-expanded/Makefile.in
+++ b/target/device/Atmel/atngw100-expanded/Makefile.in
@@ -1,4 +1,4 @@
-ifeq ($(strip $(BR2_TARGET_AVR32_ATNGW100_EXPANDED)),y)
+ifeq ($(BR2_TARGET_AVR32_ATNGW100_EXPANDED),y)
 ATNGW100_EXPANDED_PATH=target/device/Atmel/atngw100-expanded
 
 TARGET_SKELETON=$(ATNGW100_EXPANDED_PATH)/target_skeleton
diff --git a/target/device/Atmel/atngw100/Makefile.in b/target/device/Atmel/atngw100/Makefile.in
index 165a2513f1..cd506e9e3d 100644
--- a/target/device/Atmel/atngw100/Makefile.in
+++ b/target/device/Atmel/atngw100/Makefile.in
@@ -1,4 +1,4 @@
-ifeq ($(strip $(BR2_TARGET_AVR32_ATNGW100)),y)
+ifeq ($(BR2_TARGET_AVR32_ATNGW100),y)
 ATNGW100_PATH=target/device/Atmel/atngw100
 
 TARGET_SKELETON=$(ATNGW100_PATH)/target_skeleton
diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk
index 0096337a25..cf7b974f1f 100644
--- a/target/device/Atmel/u-boot/u-boot.mk
+++ b/target/device/Atmel/u-boot/u-boot.mk
@@ -247,7 +247,7 @@ ubootroot-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_UBOOT_AT91)),y)
+ifeq ($(BR2_TARGET_UBOOT_AT91),y)
 TARGETS+=uboot
 endif
 
diff --git a/target/device/Hitachi/Makefile.in b/target/device/Hitachi/Makefile.in
index e9af5ebae8..73e854d364 100644
--- a/target/device/Hitachi/Makefile.in
+++ b/target/device/Hitachi/Makefile.in
@@ -1,5 +1,5 @@
 # Override the default uClibc configuration
-ifeq ($(strip $(BR2_TARGET_HITACHI_MS7206SE01)),y)
+ifeq ($(BR2_TARGET_HITACHI_MS7206SE01),y)
 
 include target/device/Hitachi/MS7206SE01/Makefile.in
 
diff --git a/target/device/Sharp/Makefile.in b/target/device/Sharp/Makefile.in
index cffae25a64..f1c467149c 100644
--- a/target/device/Sharp/Makefile.in
+++ b/target/device/Sharp/Makefile.in
@@ -1,5 +1,5 @@
 # Override the default uClibc configuration
-ifeq ($(strip $(BR2_TARGET_SHARP_LNODE80)),y)
+ifeq ($(BR2_TARGET_SHARP_LNODE80),y)
 
 include target/device/Sharp/LNode80/Makefile.in
 include target/device/Sharp/LNode80/linux.mk
diff --git a/target/device/Soekris/Makefile.in b/target/device/Soekris/Makefile.in
index ce0de96d1f..ba52574003 100644
--- a/target/device/Soekris/Makefile.in
+++ b/target/device/Soekris/Makefile.in
@@ -1,11 +1,11 @@
 # Override the default uClibc configuration
-ifeq ($(strip $(BR2_TARGET_SOEKRIS)),y)
+ifeq ($(BR2_TARGET_SOEKRIS),y)
 
-ifeq ($(strip $(BR2_TARGET_SOEKRIS_NET4521)),y)
+ifeq ($(BR2_TARGET_SOEKRIS_NET4521),y)
 UCLIBC_CONFIG_FILE:=target/device/Soekris/net4521/uClibc.config
 BR2_PACKAGE_BUSYBOX_CONFIG:=target/device/Soekris/net4521/busybox.config
 
-ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
+ifeq ($(BR2_PACKAGE_LINUX),y)
 TARGETS+=linux
 include target/device/Soekris/net4521/linux.mk
 endif
@@ -15,11 +15,11 @@ endif
 #SOEKRIS_NET4801_PATH=target/device/Soekris/net4801
 BOARD_PATH=target/device/Soekris/net4801
 
-ifeq ($(strip $(BR2_TARGET_SOEKRIS_NET4801)),y)
+ifeq ($(BR2_TARGET_SOEKRIS_NET4801),y)
 UCLIBC_CONFIG_FILE:=$(BOARD_PATH)/uClibc.config
 BR2_PACKAGE_BUSYBOX_CONFIG:=$(BOARD_PATH)/busybox.config
 
-ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
+ifeq ($(BR2_PACKAGE_LINUX),y)
 TARGETS+=linux26
 include target/device/Soekris/soekris_gpio/soekris_gpio.mk
 LINUX26_KCONFIG=$(BOARD_PATH)/linux26.config
diff --git a/target/device/Via/Makefile.in b/target/device/Via/Makefile.in
index c25b7e6de3..3b37a3d71f 100644
--- a/target/device/Via/Makefile.in
+++ b/target/device/Via/Makefile.in
@@ -1,7 +1,7 @@
 # Override the default uClibc configuration
-ifeq ($(strip $(BR2_TARGET_VIA_EPIA_MII)),y)
+ifeq ($(BR2_TARGET_VIA_EPIA_MII),y)
 
-ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
+ifeq ($(BR2_PACKAGE_LINUX),y)
 TARGETS+=linux
 include target/device/Via/epia-mii/linux.mk
 endif
diff --git a/target/device/jp/Makefile.in b/target/device/jp/Makefile.in
index acb173d1a1..3490b244f5 100644
--- a/target/device/jp/Makefile.in
+++ b/target/device/jp/Makefile.in
@@ -1,5 +1,5 @@
 # Override the default uClibc configuration
-ifeq ($(strip $(BR2_TARGET_Q5)),y)
+ifeq ($(BR2_TARGET_Q5),y)
 
 include target/device/jp/q5/Makefile.in
 include target/device/jp/q5/linux.mk
diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk
index 0658596b08..a086028cab 100644
--- a/target/device/jp/q5/linux.mk
+++ b/target/device/jp/q5/linux.mk
@@ -84,7 +84,7 @@ $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked
 	$(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile
 	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
 	-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
-ifeq ($(strip $(BR2_mips)),y)
+ifeq ($(BR2_mips),y)
 	$(SED) "s,CONFIG_CPU_LITTLE_ENDIAN=y,# CONFIG_CPU_LITTLE_ENDIAN is not set\n# CONFIG_BINFMT_IRIX is not set," $(LINUX_DIR)/.config
 endif
 	$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) oldconfig include/linux/version.h
diff --git a/target/device/valka/Makefile.in b/target/device/valka/Makefile.in
index f43cadaf63..56ae1d2855 100644
--- a/target/device/valka/Makefile.in
+++ b/target/device/valka/Makefile.in
@@ -1,4 +1,4 @@
-ifeq ($(strip $(BR2_TARGET_VALKA)),y)
+ifeq ($(BR2_TARGET_VALKA),y)
 VALKA_PATH= target/device/valka
 
 TARGET_SKELETON=$(VALKA_PATH)/target_skeleton
diff --git a/target/device/x86/Makefile.in b/target/device/x86/Makefile.in
index e3a995a7f7..9c2495e345 100644
--- a/target/device/x86/Makefile.in
+++ b/target/device/x86/Makefile.in
@@ -1,3 +1,3 @@
-ifeq ($(strip $(BR2_i386)),y)
+ifeq ($(BR2_i386),y)
 include target/device/x86/i386/Makefile.in
 endif
diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 574f30cbf6..fc8c4a84e2 100644
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -42,20 +42,20 @@ genext2fs: $(GENEXT2_DIR)/genext2fs
 
 EXT2_OPTS :=
 
-ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_SQUASH)),y)
+ifeq ($(BR2_TARGET_ROOTFS_EXT2_SQUASH),y)
 EXT2_OPTS += -U
 endif
 
 ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
-EXT2_OPTS += -b $(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS))
+EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)
 endif
 
 ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0)
-EXT2_OPTS += -N $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES))
+EXT2_OPTS += -N $(BR2_TARGET_ROOTFS_EXT2_INODES)
 endif
 
 ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),)
-EXT2_OPTS += -m $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS))
+EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
 endif
 
 EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT))
@@ -155,6 +155,6 @@ ext2root-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2)),y)
+ifeq ($(BR2_TARGET_ROOTFS_EXT2),y)
 TARGETS+=ext2root
 endif
diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk
index 07f5ec356f..830d309950 100644
--- a/target/initramfs/initramfs.mk
+++ b/target/initramfs/initramfs.mk
@@ -6,7 +6,7 @@
 #
 #############################################################
 
-ifeq ($(strip $(BR2_TARGET_ROOTFS_INITRAMFS)),y)
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 INITRAMFS_TARGET:=$(IMAGE).initramfs_list
 else
 INITRAMFS_TARGET:= #nothing
@@ -41,7 +41,7 @@ endif
 initramfs-source:
 
 initramfs-clean:
-ifeq ($(strip $(BR2_TARGET_ROOTFS_INITRAMFS)),y)
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 	-rm -f $(INITRAMFS_TARGET)
 endif
 initramfs-dirclean:
diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index 74b33b812f..778df0365c 100644
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -50,7 +50,7 @@ ISO9660_BOOT_MENU:=$(subst ",,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
 #")
 ISO9660_OPTS:=
 
-ifeq ($(strip $(BR2_TARGET_ROOTFS_ISO9660_SQUASH)),y)
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
 ISO9660_OPTS+=-U
 endif
 
@@ -90,6 +90,6 @@ iso9660root-dirclean: mkisofs-dirclean
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_ISO9660)),y)
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
 TARGETS+=iso9660root
 endif
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 41b129ddc3..dc176cde52 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-JFFS2_OPTS := -e $(strip $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE))
+JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE)
 SUMTOOL_OPTS := $(JFFS2_OPTS)
 
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PAD)),y)
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y)
 ifneq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)),0x0)
 JFFS2_OPTS += --pad=$(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE))
 else
@@ -110,6 +110,6 @@ jffs2root-dirclean: mtd-host-dirclean
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y)
 TARGETS+=jffs2root
 endif
diff --git a/target/powerpc/yaboot/yaboot.mk b/target/powerpc/yaboot/yaboot.mk
index efb6381ff5..a89155cdc1 100644
--- a/target/powerpc/yaboot/yaboot.mk
+++ b/target/powerpc/yaboot/yaboot.mk
@@ -38,7 +38,7 @@ endif
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_YABOOT)),y)
+ifeq ($(BR2_TARGET_YABOOT),y)
 TARGETS+=yaboot
 endif
 
diff --git a/target/romfs/romfs.mk b/target/romfs/romfs.mk
index 8fa4c9afda..fba6792a08 100644
--- a/target/romfs/romfs.mk
+++ b/target/romfs/romfs.mk
@@ -74,6 +74,6 @@ romfsroot-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_ROMFS)),y)
+ifeq ($(BR2_TARGET_ROOTFS_ROMFS),y)
 TARGETS+=romfsroot
 endif
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 8de238b654..51ba7665c0 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -85,6 +85,6 @@ squashfsroot-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y)
+ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS),y)
 TARGETS+=squashfsroot
 endif
diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index b47259e2dd..d88346635e 100644
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-TAR_OPTS:=$(strip $(BR2_TARGET_ROOTFS_TAR_OPTIONS))
+TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS)
 TAR_TARGET:=$(IMAGE).tar
 
 TAR_COMPRESSOR:=
@@ -21,7 +21,7 @@ ifeq ($(BR2_TARGET_ROOTFS_TAR_LZMA),y)
 TAR_COMPRESSOR:=lzma -9 -c
 TAR_COMPRESSOR_EXT:=lzma
 endif
-ROOTFS_TAR_COPYTO:=$(strip $(subst ",,$(BR2_TARGET_ROOTFS_TAR_COPYTO)))
+ROOTFS_TAR_COPYTO:=$(subst ",,$(BR2_TARGET_ROOTFS_TAR_COPYTO))
 # "))
 
 tarroot: host-fakeroot makedevs
@@ -57,7 +57,7 @@ ifneq ($(ROOTFS_TAR_COPYTO),)
 endif
 	-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 
-EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)))
+EXT2_COPYTO := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO))
 # "))
 
 
@@ -72,6 +72,6 @@ tarroot-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_TAR)),y)
+ifeq ($(BR2_TARGET_ROOTFS_TAR),y)
 TARGETS+=tarroot
 endif
diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index 4df575ac66..001bc88813 100644
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -21,10 +21,10 @@ U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
 endif
 
 U_BOOT_TARGET_TOOLS:=
-ifeq ($(strip $(BR2_TARGET_UBOOT_TOOL_MKIMAGE)),y)
+ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
 U_BOOT_TARGET_TOOLS+=$(TARGET_DIR)/usr/bin/mkimage
 endif
-ifeq ($(strip $(BR2_TARGET_UBOOT_TOOL_ENV)),y)
+ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
 U_BOOT_TARGET_TOOLS+=$(TARGET_DIR)/usr/sbin/fw_printenv
 endif
 
@@ -106,7 +106,7 @@ endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"")
 	$(call insert_define, CONFIG_BOOTCOMMAND, $(BR2_TARGET_UBOOT_BOOTCMD))
 endif
-ifeq ($(strip $(BR2_TARGET_UBOOT_SILENT)),y)
+ifeq ($(BR2_TARGET_UBOOT_SILENT),y)
 	$(call insert_define, CONFIG_SILENT_CONSOLE,)
 endif
 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
@@ -154,7 +154,7 @@ u-boot-source: $(DL_DIR)/$(U_BOOT_SOURCE)
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_UBOOT)),y)
+ifeq ($(BR2_TARGET_UBOOT),y)
 TARGETS+=u-boot
 endif
 
diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk
index 85f67a5be1..d4d9d91732 100644
--- a/target/ubifs/ubifsroot.mk
+++ b/target/ubifs/ubifsroot.mk
@@ -113,7 +113,7 @@ $(UBIFS_BASE).$(UBIFS_ROOTFS_COMPRESSOR_EXT): $(UBIFS_ROOTFS_COMPRESSOR_PREREQ)
 	$(UBIFS_ROOTFS_COMPRESSOR) $(UBIFS_BASE) > $(UBIFS_TARGET)
 endif
 
-UBIFS_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_UBIFS_COPYTO)))
+UBIFS_COPYTO := $(subst ",,$(BR2_TARGET_ROOTFS_UBIFS_COPYTO))
 # "))
 
 ubifsroot: $(UBIFS_TARGET)
@@ -135,7 +135,7 @@ ubifsroot-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_ROOTFS_UBIFS)),y)
+ifeq ($(BR2_TARGET_ROOTFS_UBIFS),y)
 TARGETS+=ubifsroot
 endif
 
diff --git a/target/x86/grub/grub.mk b/target/x86/grub/grub.mk
index 402333e9be..b7484cb431 100644
--- a/target/x86/grub/grub.mk
+++ b/target/x86/grub/grub.mk
@@ -132,6 +132,6 @@ endif
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_GRUB)),y)
+ifeq ($(BR2_TARGET_GRUB),y)
 TARGETS+=grub
 endif
diff --git a/target/x86/grub2/grub2.mk b/target/x86/grub2/grub2.mk
index fcbbc2cc61..95db8ec421 100644
--- a/target/x86/grub2/grub2.mk
+++ b/target/x86/grub2/grub2.mk
@@ -129,6 +129,6 @@ endif
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_GRUB2)),y)
+ifeq ($(BR2_TARGET_GRUB2),y)
 TARGETS+=grub2
 endif
diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk
index 1d8ac18db6..b7603caee4 100644
--- a/target/x86/syslinux/syslinux.mk
+++ b/target/x86/syslinux/syslinux.mk
@@ -62,9 +62,9 @@ endif
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_TARGET_SYSLINUX)),y)
+ifeq ($(BR2_TARGET_SYSLINUX),y)
 TARGETS+=syslinux
 endif
-ifeq ($(strip $(BR2_TARGET_PXELINUX)),y)
+ifeq ($(BR2_TARGET_PXELINUX),y)
 TARGETS+=pxelinux
 endif
-- 
2.30.2