Browse Source

remove virtualbox support

Waldemar Brodkorb 2 years ago
parent
commit
7833b797b8

+ 0 - 6
target/config/Config.in

@@ -25,12 +25,6 @@ config ADK_TARGET_QEMU
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
 
-config ADK_TARGET_VBOX
-	bool
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_NET
-	select ADK_TARGET_WITH_NETDEVICE
-
 # the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
 # allows for selecting it off (i.e., to disable it)
 config ADK_TARGET_FIXED_KERNEL

+ 1 - 4
target/config/Config.in.rootfs

@@ -28,7 +28,6 @@ config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK
 		ADK_TARGET_ARCH_SPARC || \
 		ADK_TARGET_ARCH_X86 || \
 		ADK_TARGET_ARCH_X86_64
-	depends on !ADK_TARGET_VBOX
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	help
 	  create an read-only initramfs system.
@@ -49,7 +48,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 		ADK_TARGET_ARCH_SPARC || \
 		ADK_TARGET_ARCH_X86 || \
 		ADK_TARGET_ARCH_X86_64
-	depends on !ADK_TARGET_VBOX
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_SYSTEM_QEMU_METAG
@@ -101,7 +99,6 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	select ADK_LINUX_KERNEL_IP_PNP_DHCP if ADK_TARGET_OS_LINUX
 	depends on !ADK_TARGET_QEMU && \
 		   !ADK_TARGET_SIM && \
-	           !ADK_TARGET_VBOX && \
 		   !ADK_TARGET_SYSTEM_ARANYM_M68K && \
 		   !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 
 	help
@@ -148,7 +145,7 @@ config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 
 config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for ext4 filesystems"
-	select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX
+	select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU
 	select ADK_LINUX_KERNEL_EXT4_FS if ADK_TARGET_OS_LINUX
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
 	depends on !ADK_TARGET_SIM \

+ 0 - 4
target/config/Config.in.runtime

@@ -166,7 +166,6 @@ source "target/config/Config.in.scripts"
 
 config ADK_RUNTIME_TMPFS_SIZE
 	string "size of /tmp in memory (kB)"
-	default "32768" if ADK_TARGET_SYSTEM_LENOVO_X200
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI3
@@ -174,7 +173,6 @@ config ADK_RUNTIME_TMPFS_SIZE
 	default "32768" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "16384" if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default "16384" if ADK_TARGET_SYSTEM_QEMU_X86
-	default "16384" if ADK_TARGET_VBOX
 	default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "8192" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default "1024"
@@ -302,7 +300,6 @@ config ADK_RUNTIME_GETTY_VGA
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
-	default y if ADK_TARGET_VBOX
 	default n
 	help
           Start getty on VGA console. (tty1-tty6)
@@ -322,7 +319,6 @@ config ADK_RUNTIME_GETTY_SERIAL
 	default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n if ADK_TARGET_MODEL_PCENGINES_ALIX1C
-	default n if ADK_TARGET_VBOX
 	default y
 	help
 	  Start getty on serial console.

+ 1 - 4
target/linux/config/Config.in.block

@@ -173,7 +173,6 @@ menu "SATA/PATA devices support"
 depends on ADK_TARGET_WITH_PATA \
 	|| ADK_TARGET_WITH_SATA \
 	|| ADK_TARGET_QEMU \
-	|| ADK_TARGET_VBOX \
 	|| ADK_TARGET_GENERIC
 
 config ADK_LINUX_KERNEL_PATA_RB532
@@ -231,10 +230,8 @@ config ADK_LINUX_KERNEL_SATA_AHCI
 	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on \
 		   ADK_TARGET_SYSTEM_PCENGINES_APU || \
-		   ADK_TARGET_GENERIC || \
-		   ADK_TARGET_VBOX
+		   ADK_TARGET_GENERIC
 	default y if ADK_TARGET_SYSTEM_PCENGINES_APU
-	default y if ADK_TARGET_VBOX
 	default n
 	help
 	  Enables support for AHCI Serial ATA.

+ 0 - 1
target/linux/config/Config.in.bus

@@ -6,7 +6,6 @@ config ADK_LINUX_KERNEL_PCI
 	select ADK_LINUX_KERNEL_PCI_QUIRKS
 	depends on ADK_TARGET_WITH_PCI \
 		|| ADK_TARGET_QEMU \
-		|| ADK_TARGET_VBOX \
 		|| ADK_TARGET_GENERIC
 	default n if ADK_TARGET_CPU_XTENSA_DE212
 	default n if ADK_TARGET_SYSTEM_GENERIC_NDS32

+ 0 - 2
target/linux/config/Config.in.ethernet

@@ -374,7 +374,6 @@ config ADK_LINUX_KERNEL_E1000
 		ADK_TARGET_SYSTEM_QEMU_ALPHA || \
 		ADK_TARGET_SYSTEM_QEMU_HPPA || \
 		ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
-		ADK_TARGET_VBOX || \
 		ADK_TARGET_GENERIC
 	default y if ADK_TARGET_SYSTEM_QEMU_X86
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
@@ -386,7 +385,6 @@ config ADK_LINUX_KERNEL_E1000
 	default y if ADK_TARGET_SYSTEM_QEMU_ALPHA
 	default y if ADK_TARGET_SYSTEM_QEMU_HPPA
 	default y if ADK_TARGET_SYSTEM_QEMU_SPARC64
-	default y if ADK_TARGET_VBOX
 	default n
 	help
 	  Intel(R) PRO/1000 gigabit ethernet driver

+ 0 - 2
target/linux/config/Config.in.graphics

@@ -4,7 +4,6 @@
 menu "Graphic devices support"
 depends on ADK_TARGET_WITH_VGA \
 	|| ADK_TARGET_QEMU \
-	|| ADK_TARGET_VBOX \
 	|| ADK_TARGET_GENERIC
 
 config ADK_LINUX_KERNEL_VT
@@ -211,7 +210,6 @@ config ADK_LINUX_KERNEL_FB_VESA
 	bool "Framebuffer support for VESA"
 	select ADK_LINUX_KERNEL_FB
 	select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE
-	default y if ADK_TARGET_VBOX
  	default n
  	help
 	  Generic VESA Framebuffer support.

+ 1 - 7
target/linux/config/Config.in.input

@@ -6,8 +6,7 @@ depends on ADK_TARGET_WITH_USB \
 	|| ADK_TARGET_WITH_INPUT \
 	|| ADK_TARGET_WITH_TOUCHSCREEN \
 	|| ADK_TARGET_QEMU \
-	|| ADK_TARGET_GENERIC \
-	|| ADK_TARGET_VBOX
+	|| ADK_TARGET_GENERIC
 
 config ADK_LINUX_KERNEL_SERIO
 	bool
@@ -31,7 +30,6 @@ config ADK_LINUX_KERNEL_SERIO_I8042
 
 config ADK_LINUX_KERNEL_INPUT
 	bool
-	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -81,7 +79,6 @@ config ADK_LINUX_KERNEL_TOUCHSCREEN_ADS7846
 
 config ADK_LINUX_KERNEL_INPUT_KEYBOARD
 	bool
-	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -92,7 +89,6 @@ config ADK_LINUX_KERNEL_INPUT_KEYBOARD
 
 config ADK_LINUX_KERNEL_INPUT_MOUSE
 	bool
-	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -170,7 +166,6 @@ config ADK_LINUX_KERNEL_KEYBOARD_ATKBD
 	select ADK_LINUX_KERNEL_INPUT
 	select ADK_LINUX_KERNEL_INPUT_KEYBOARD
 	depends on !ADK_TARGET_BOARD_BCM28XX
-	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n
@@ -181,7 +176,6 @@ config ADK_LINUX_KERNEL_MOUSE_PS2
 	select ADK_LINUX_KERNEL_INPUT_MOUSEDEV
 	select ADK_LINUX_KERNEL_INPUT_MOUSE
 	depends on !ADK_TARGET_BOARD_BCM28XX
-	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n

+ 1 - 1
target/linux/config/Config.in.serial

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 menu "Serial devices support"
-depends on ADK_TARGET_WITH_SERIAL || ADK_TARGET_QEMU || ADK_TARGET_VBOX || ADK_TARGET_SIM || ADK_TARGET_GENERIC
+depends on ADK_TARGET_WITH_SERIAL || ADK_TARGET_QEMU || ADK_TARGET_SIM || ADK_TARGET_GENERIC
 
 config ADK_LINUX_KERNEL_SERIAL_8250_DMA
 	bool

+ 0 - 5
target/x86/Makefile

@@ -45,11 +45,6 @@ else
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img'
 endif
 endif
-ifeq ($(ADK_TARGET_VBOX),y)
-	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
-	@echo "Use following command to create a VirtualBox Image:"
-	@echo "./scripts/create.sh -g -T vdi vbox-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
-endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:

+ 0 - 4
target/x86/kernel/vbox-x86

@@ -1,4 +0,0 @@
-CONFIG_X86=y
-CONFIG_X86_32=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y

+ 0 - 9
target/x86/systems/vbox-x86

@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_VBOX_X86
-	bool "VirtualBox Emulator"
-	select ADK_TARGET_VBOX
-	select ADK_TARGET_KERNEL_BZIMAGE
-	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	select ADK_PACKAGE_GRUB
-	help
-	  Support for VirtualBox Emulator.
-

+ 0 - 5
target/x86_64/Makefile

@@ -44,11 +44,6 @@ else
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img'
 endif
 endif
-ifeq ($(ADK_HARDWARE_VBOX),y)
-	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
-	@echo "Use following command to create a VirtualBox Image:"
-	@echo "./scripts/create.sh -T vdi vbox-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
-endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:

+ 0 - 7
target/x86_64/kernel/asus-p5bvm

@@ -1,7 +0,0 @@
-CONFIG_X86=y
-CONFIG_X86_64=y
-CONFIG_X86_X32=y
-CONFIG_GENERIC_CPU=y
-CONFIG_PROCESSOR_SELECT=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y

+ 0 - 6
target/x86_64/kernel/lenovo-x200

@@ -1,6 +0,0 @@
-CONFIG_X86=y
-CONFIG_X86_64=y
-CONFIG_GENERIC_CPU=y
-CONFIG_PROCESSOR_SELECT=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CMDLINE_BOOL=y