From 371b382a40e98d73aa71acb23b1bfbd216512510 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 13 Jan 2017 15:04:17 +0100 Subject: [PATCH] x86: remove the xen_domu subtarget Signed-off-by: Felix Fietkau --- target/linux/x86/Makefile | 2 +- .../linux/x86/xen_domu/base-files/etc/inittab | 5 - .../base-files/lib/preinit/45_mount_xenfs | 11 -- target/linux/x86/xen_domu/config-default | 100 ------------------ .../x86/xen_domu/profiles/000-Generic.mk | 15 --- target/linux/x86/xen_domu/target.mk | 3 - 6 files changed, 1 insertion(+), 135 deletions(-) delete mode 100644 target/linux/x86/xen_domu/base-files/etc/inittab delete mode 100644 target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs delete mode 100644 target/linux/x86/xen_domu/config-default delete mode 100644 target/linux/x86/xen_domu/profiles/000-Generic.mk delete mode 100644 target/linux/x86/xen_domu/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index d702e4e8a0..f371b2ba3a 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -10,7 +10,7 @@ ARCH:=i386 BOARD:=x86 BOARDNAME:=x86 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu -SUBTARGETS:=generic legacy xen_domu geode 64 +SUBTARGETS:=generic legacy geode 64 MAINTAINER:=Felix Fietkau KERNEL_PATCHVER:=4.4 diff --git a/target/linux/x86/xen_domu/base-files/etc/inittab b/target/linux/x86/xen_domu/base-files/etc/inittab deleted file mode 100644 index 72e19c5b3d..0000000000 --- a/target/linux/x86/xen_domu/base-files/etc/inittab +++ /dev/null @@ -1,5 +0,0 @@ -::sysinit:/etc/init.d/rcS S boot -::shutdown:/etc/init.d/rcS K stop -tts/0::askfirst:/usr/libexec/login.sh -hvc0::askfirst:/usr/libexec/login.sh -tty1::askfirst:/usr/libexec/login.sh diff --git a/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs b/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs deleted file mode 100644 index 7b0760516e..0000000000 --- a/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Copyright (C) 2010 OpenWrt.org - -do_mount_xenfs() { - [ -f /etc/modules.d/??-xenfs ] && { - insmod $(cat /etc/modules.d/??-xenfs) - mount -o noatime none /proc/xen -t xenfs - } -} - -boot_hook_add preinit_mount_root do_mount_xenfs diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default deleted file mode 100644 index aeb1e2a635..0000000000 --- a/target/linux/x86/xen_domu/config-default +++ /dev/null @@ -1,100 +0,0 @@ -# CONFIG_APM is not set -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -CONFIG_CPU_RMAP=y -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_FB=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_VESA is not set -CONFIG_FREEZER=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_HAVE_ARCH_HUGE_VMAP=y -CONFIG_HIBERNATE_CALLBACKS=y -# CONFIG_HIGHMEM64G is not set -CONFIG_HOTPLUG_CPU=y -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y -CONFIG_IOMMU_HELPER=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_XZ is not set -# CONFIG_LGUEST_GUEST is not set -CONFIG_LOCK_SPIN_ON_OWNER=y -# CONFIG_M486 is not set -CONFIG_MMU_NOTIFIER=y -CONFIG_MPENTIUM4=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NR_CPUS=4 -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -CONFIG_PARAVIRT_SPINLOCKS=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_PCI_XEN=y -CONFIG_PGTABLE_LEVELS=3 -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -CONFIG_QUEUED_RWLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RFS_ACCEL=y -CONFIG_RPS=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_SCHED_MC=y -CONFIG_SMP=y -CONFIG_SWIOTLB=y -CONFIG_SWIOTLB_XEN=y -CONFIG_SYS_HYPERVISOR=y -CONFIG_TREE_RCU=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_X86_32_SMP=y -# CONFIG_X86_BIGSMP is not set -CONFIG_X86_CMOV=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=7 -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_X86_MINIMUM_CPU_FAMILY=5 -CONFIG_X86_PAE=y -# CONFIG_X86_PMEM_LEGACY is not set -CONFIG_X86_TSC=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_XEN=y -CONFIG_XENFS=y -CONFIG_XEN_AUTO_XLATE=y -CONFIG_XEN_BALLOON=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_DEBUG_FS=y -CONFIG_XEN_DEV_EVTCHN=y -CONFIG_XEN_FBDEV_FRONTEND=y -CONFIG_XEN_GNTDEV=y -CONFIG_XEN_GRANT_DEV_ALLOC=y -CONFIG_XEN_HAVE_PVMMU=y -CONFIG_XEN_HAVE_VPMU=y -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_PCIDEV_FRONTEND=y -CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_PVHVM=y -CONFIG_XEN_SAVE_RESTORE=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_SCSI_FRONTEND=y -CONFIG_XEN_SYS_HYPERVISOR=y -# CONFIG_XEN_WDT is not set -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XPS=y diff --git a/target/linux/x86/xen_domu/profiles/000-Generic.mk b/target/linux/x86/xen_domu/profiles/000-Generic.mk deleted file mode 100644 index ccd125afa2..0000000000 --- a/target/linux/x86/xen_domu/profiles/000-Generic.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Generic - NAME:=Generic -endef - -define Profile/Generic/Description - Generic Profile -endef -$(eval $(call Profile,Generic)) diff --git a/target/linux/x86/xen_domu/target.mk b/target/linux/x86/xen_domu/target.mk deleted file mode 100644 index 991fe59e8b..0000000000 --- a/target/linux/x86/xen_domu/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -BOARDNAME:=Xen Paravirt Guest -FEATURES:=display ext4 targz -CPU_TYPE := pentium4 -- 2.30.2