aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorGravatar Thomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:44 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 18:54:16 +0200
commitaaffd209fae91a733fe0becb72268f87bf4ea369 (patch)
tree40569895ef8a09c605060e2164d86567a12f9889 /boot
parent1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff)
downloadbuildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.gz
buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.bz2
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'boot')
-rw-r--r--boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk2
-rw-r--r--boot/grub/grub.mk2
-rw-r--r--boot/grub2/grub2.mk2
-rw-r--r--boot/gummiboot/gummiboot.mk2
4 files changed, 4 insertions, 4 deletions
diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
index f4e1e1f02f..a9d69a9b6c 100644
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -26,7 +26,7 @@ endef
BOOT_WRAPPER_AARCH64_PRE_PATCH_HOOKS += BOOT_WRAPPER_AARCH64_FIX_DTB_NAME
-BOOT_WRAPPER_AARCH64_CONF_OPT = \
+BOOT_WRAPPER_AARCH64_CONF_OPTS = \
--with-kernel-dir=$(LINUX_DIR) \
--with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 55a605c852..f01b02d305 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -75,7 +75,7 @@ GRUB_CONF_ENV = \
$(HOST_CONFIGURE_OPTS) \
CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS) -m32"
-GRUB_CONF_OPT = \
+GRUB_CONF_OPTS = \
--disable-auto-linux-mem-opt \
$(GRUB_CONFIG-y)
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 12aac9a5db..697f0adc14 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -50,7 +50,7 @@ GRUB2_CONF_ENV = \
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)"
-GRUB2_CONF_OPT = \
+GRUB2_CONF_OPTS = \
--target=$(GRUB2_TARGET) \
--with-platform=$(GRUB2_PLATFORM) \
--disable-grub-mkfont \
diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk
index 165a1b0ff3..72f9c53ca6 100644
--- a/boot/gummiboot/gummiboot.mk
+++ b/boot/gummiboot/gummiboot.mk
@@ -21,7 +21,7 @@ else ifeq ($(BR2_x86_64),y)
GUMMIBOOT_IMGARCH = x64
endif
-GUMMIBOOT_CONF_OPT = \
+GUMMIBOOT_CONF_OPTS = \
--host=$(BR2_ARCH) \
--with-efi-libdir=$(STAGING_DIR)/usr/lib \
--with-efi-ldsdir=$(STAGING_DIR)/usr/lib \