X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ea8823c99319e5c11b975d14c95b487d25ec0f3f..e63ae33477df6783e8399b4bfb8eed5a607c7888:/target/linux/x86/image/Makefile

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 699dcfe6a..b412873c3 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk
 
 export PATH=$(TARGET_PATH):/sbin
 
-ifeq ($(CONFIG_TARGET_x86_generic),y)
+ifneq ($(CONFIG_TARGET_x86_olpc),y)
 BOOTOPTS=$(strip $(subst ",, $(CONFIG_X86_GRUB_BOOTOPTS)))
 ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
 #"))")) # fix vim's broken syntax highlighting
@@ -120,14 +120,13 @@ endif
 
 define Image/Prepare
 	$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
-ifeq ($(CONFIG_TARGET_x86_generic),y)
-	$(call Image/Prepare/grub)
-endif
 ifeq ($(CONFIG_TARGET_x86_olpc),y)
 	$(call Image/Prepare/bootscript)
+else
+	$(call Image/Prepare/grub)
 endif
 endef
-  
+
 define Image/Build/squashfs
     $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef