summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-23 09:59:56 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-23 09:59:56 +0000
commit476060c78a81934587965bba56287f33b0439226 (patch)
tree6213e59a7f057f6ab77babb224566b2b991684bd /target
parent6a31a701e2372ba3549c7e3c48da0a2520232943 (diff)
x86: avoid using grub prepare when using grub2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33525 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86/image/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index ebe0788593..547f0839fd 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -237,7 +237,7 @@ endef
define Image/Prepare
$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
$(call Image/Prepare/bootscript)
- $(call Image/Prepare/grub)
+ $(call Image/Prepare/$(if $(CONFIG_X86_USE_GRUB2),grub2,grub))
endef
define Image/Build