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 fba5da7ad1758c3a35d9d4dec144c2f29e4928f2..9ced34c93ecc50d10a927dbf8f2cda6d51952c85 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -15,29 +15,29 @@ 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
+       select PACKAGE_grub2
        default y
 
 config X86_GRUB_CONSOLE
        bool "Use Console Terminal (in addition to Serial)"
        depends X86_GRUB_IMAGES
-       default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos)
+       default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
        default y
 
 config X86_GRUB_SERIAL
        string "Serial port device"
        depends X86_GRUB_IMAGES
-       default "hvc0" if (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
-       default "ttyS0" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+       default "hvc0" if TARGET_x86_xen_domu
+       default "ttyS0" if ! TARGET_x86_xen_domu
 
 config X86_GRUB_BAUDRATE
        int "Serial port baud rate"
        depends X86_GRUB_IMAGES
        default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
        default 38400 if TARGET_x86_alix2
-       default 115200 if TARGET_x86_geos
+       default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
        default 38400
 
 config X86_GRUB_BOOTOPTS
@@ -73,6 +73,7 @@ config OLPC_BOOTSCRIPT_IMAGES
        bool "Build images with bootscript"
        depends TARGET_x86_olpc
        depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+       default TARGET_x86_olpc
 
 
 config TARGET_IMAGES_PAD