x86: explicitely pass staging directory to grub-mkimage instead of relying on build...

[lede.git] / target / linux / x86 / image / Config.in

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 08880e5803351b21e13b59e93a39c325fb0e1489..9ced34c93ecc50d10a927dbf8f2cda6d51952c85 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -15,15 +15,10 @@ config X86_ETHERBOOT_BOOTOPTS
 
 config X86_GRUB_IMAGES
        bool "Build GRUB images (Linux x86 or x86_64 host only)"
-       depends TARGET_x86 && !TARGET_x86_olpc
+       depends TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc)
        depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
-       select PACKAGE_grub if !X86_USE_GRUB2
-       default y
-
-config X86_USE_GRUB2
-       bool "Use grub2"
-       depends X86_GRUB_IMAGES
        select PACKAGE_grub2
+       default y
 
 config X86_GRUB_CONSOLE
        bool "Use Console Terminal (in addition to Serial)"