From bb0e4f9fb0c101b86b1a0c2785fec9b38b19fd02 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Sun, 13 Jan 2019 21:37:47 +0100 Subject: build: remove leftovers from previous x86 commits VBoxManage is not used and the image is created with proper permisions: 0f5d0f6 image: use internal qemu-img for vmdk and vdi images drop host dependencies on qemu-utils and VirtualBox Unreachable config symbols: 9e0759e x86: merge all geode based subtargets into one No need to define those symbols since x86_64 is subtarget of x86: 196fb76 x86: make x86_64 a subtarget instead of a standalone target Unreachable config symbols, so remove GRUB_ROOT: 371b382 x86: remove the xen_domu subtarget Signed-off-by: Tomasz Maciej Nowak --- config/Config-images.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'config/Config-images.in') diff --git a/config/Config-images.in b/config/Config-images.in index bdd24ef617..6610601d55 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -197,14 +197,12 @@ menu "Target Images" config GRUB_CONSOLE bool "Use Console Terminal (in addition to Serial)" depends on GRUB_IMAGES - default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2) default y config GRUB_SERIAL string "Serial port device" depends on GRUB_IMAGES - default "hvc0" if TARGET_x86_xen_domu - default "ttyS0" if ! TARGET_x86_xen_domu + default "ttyS0" config GRUB_BAUDRATE int "Serial port baud rate" @@ -220,7 +218,6 @@ menu "Target Images" config GRUB_BOOTOPTS string "Extra kernel boot options" depends on GRUB_IMAGES - default "xencons=hvc" if TARGET_x86_xen_domu help If you don't know, just leave it blank. @@ -241,14 +238,14 @@ menu "Target Images" config VDI_IMAGES bool "Build VirtualBox image files (VDI)" - depends on TARGET_x86 || TARGET_x86_64 + depends on TARGET_x86 select GRUB_IMAGES select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 config VMDK_IMAGES bool "Build VMware image files (VMDK)" - depends on TARGET_x86 || TARGET_x86_64 + depends on TARGET_x86 select GRUB_IMAGES select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 -- cgit v1.2.3