From 828b87c8ef3a3a3088fcb6d0abc73ad214776367 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= Date: Thu, 23 Oct 2014 22:42:58 +0200 Subject: [PATCH] Remove remaining drm1 bits * Remove kernel compilation options and manpages for old drivers * Make sure make upgrade removes old kernel modules and other files --- Makefile_upgrade.inc | 17 +++++++++++++++++ share/man/man4/Makefile | 13 ------------- share/man/man4/drm.4 | 7 ------- sys/conf/files | 16 ---------------- sys/config/LINT | 10 ---------- sys/config/LINT64 | 10 ---------- 6 files changed, 17 insertions(+), 56 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 08ba875a46..9ff598b2b0 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2642,6 +2642,23 @@ TO_REMOVE+=/usr/share/zoneinfo/Asia/Harbin TO_REMOVE+=/usr/share/zoneinfo/Asia/Kashgar TO_REMOVE+=/usr/share/openssl/man/cat3/CMS_sign_add1_signer.3.gz TO_REMOVE+=/usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz +TO_REMOVE+=/boot/kernel/mach64.ko +TO_REMOVE+=/boot/kernel/mga.ko +TO_REMOVE+=/boot/kernel/r128.ko +TO_REMOVE+=/boot/kernel/savage.ko +TO_REMOVE+=/boot/kernel/sis.ko +TO_REMOVE+=/boot/kernel/tdfx.ko +TO_REMOVE+=/usr/share/man/man4/mach64.4.gz +TO_REMOVE+=/usr/share/man/man4/mach64drm.4.gz +TO_REMOVE+=/usr/share/man/man4/mga.4.gz +TO_REMOVE+=/usr/share/man/man4/mgadrm.4.gz +TO_REMOVE+=/usr/share/man/man4/r128.4.gz +TO_REMOVE+=/usr/share/man/man4/r128drm.4.gz +TO_REMOVE+=/usr/share/man/man4/savage.4.gz +TO_REMOVE+=/usr/share/man/man4/savagedrm.4.gz +TO_REMOVE+=/usr/share/man/man4/sisdrm.4.gz +TO_REMOVE+=/usr/share/man/man4/tdfx.4.gz +TO_REMOVE+=/usr/share/man/man4/tdfxdrm.4.gz .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/stlstats diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7d770b67f9..00ae4e3717 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -414,21 +414,8 @@ MLINKS+=dc.4 if_dc.4 MLINKS+=disc.4 if_disc.4 MLINKS+=dm.4 dm_target_linear.4 MLINKS+=drm.4 i915kms.4 \ - drm.4 mach64drm.4 \ - drm.4 mach64.4 \ - drm.4 mgadrm.4 \ - drm.4 mga.4 \ - drm.4 r128drm.4 \ - drm.4 r128.4 \ drm.4 radeondrm.4 \ drm.4 radeon.4 \ - drm.4 savagedrm.4 \ - drm.4 savage.4 \ - drm.4 sisdrm.4 \ - drm.4 sis.4 \ - drm.4 tdfxdrm.4 \ - drm.4 tdfx.4 -# drm.4 viadrm.4 MLINKS+=dsched.4 dsched_fq.4 MLINKS+=em.4 emx.4 \ em.4 if_em.4 \ diff --git a/share/man/man4/drm.4 b/share/man/man4/drm.4 index f61bacead1..720939e1d7 100644 --- a/share/man/man4/drm.4 +++ b/share/man/man4/drm.4 @@ -48,14 +48,7 @@ drivers provide support for the following chipsets: .Bl -column -offset indent ".Sy ModuleXXX" ".Sy Kernel option" ".Sy Chipset" .It Sy Module Ta Sy "Kernel option" Ta Sy Chipset .It Pa i915kms.ko Ta n/a Ta Intel i915, i945, i965, G3x, G4x -.It Pa mach64.ko Ta Cd mach64drm Ta Mach64 (3D Rage Pro, Rage) -.It Pa mga.ko Ta Cd mgadrm Ta Matrox G[24]00, G[45]50 -.It Pa r128.ko Ta Cd r128drm Ta Rage 128 .It Pa radeon.ko Ta Cd radeondrm Ta Radeon -.It Pa savage.ko Ta Cd savagedrm Ta S3 Savage -.It Pa sis.ko Ta Cd sisdrm Ta SiS -.It Pa tdfx.ko Ta Cd tdfxdrm Ta 3dfx (Voodoo) -.\".It Pa via.ko Ta Cd viadrm Ta VIA .El .Pp In most cases diff --git a/sys/conf/files b/sys/conf/files index 86933a20ad..68fecf13a0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1937,15 +1937,6 @@ dev/drm/ttm/ttm_bo_vm.c optional drm #dev/drm/i915/intel_sdvo.c optional i915kmsdrm drm #dev/drm/i915/intel_sprite.c optional i915kmsdrm drm #dev/drm/i915/intel_tv.c optional i915kmsdrm drm -dev/drm/mga/mga_dma.c optional mgadrm drm -dev/drm/mga/mga_drv.c optional mgadrm drm -dev/drm/mga/mga_irq.c optional mgadrm drm -dev/drm/mga/mga_state.c optional mgadrm drm -dev/drm/mga/mga_warp.c optional mgadrm drm -dev/drm/r128/r128_cce.c optional r128drm drm -dev/drm/r128/r128_drv.c optional r128drm drm -dev/drm/r128/r128_state.c optional r128drm drm -dev/drm/r128/r128_irq.c optional r128drm drm #dev/drm/radeon/atom.c optional radeonkmsdrm drm #dev/drm/radeon/atombios_crtc.c optional radeonkmsdrm drm #dev/drm/radeon/atombios_dp.c optional radeonkmsdrm drm @@ -2016,13 +2007,6 @@ dev/drm/r128/r128_irq.c optional r128drm drm #dev/drm/radeon/rv770.c optional radeonkmsdrm drm #dev/drm/radeon/si.c optional radeonkmsdrm drm #dev/drm/radeon/si_blit_shaders.c optional radeonkmsdrm drm -dev/drm/savage/savage_bci.c optional savagedrm drm -dev/drm/savage/savage_drv.c optional savagedrm drm -dev/drm/savage/savage_state.c optional savagedrm drm -dev/drm/sis/sis_drv.c optional sisdrm drm -dev/drm/sis/sis_ds.c optional sisdrm drm -dev/drm/sis/sis_mm.c optional sisdrm drm -dev/drm/tdfx/tdfx_drv.c optional tdfxdrm drm dev/misc/nsclpcsio/nsclpcsio_isa.c optional nsclpcsio isa dev/powermng/aps/aps.c optional aps isa dev/powermng/it/it.c optional it isa diff --git a/sys/config/LINT b/sys/config/LINT index 1cd0415dab..a83842c346 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -2332,12 +2332,7 @@ device pmtimer # adjust the system clock after resume # DRM options: # drm: General DRM code # i915kmsdrm: Intel integrated GPUs, starting from the 830M family -# mgadrm: AGP Matrox G200, G400, G450, G550 -# r128drm: ATI Rage 128 cards # radeonkmsdrm: ATI Radeon cards -# savagedrm: Savage cards -# sisdrm: Sis cards -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # # DRM_DEBUG: include debug printfs, very slow # @@ -2345,12 +2340,7 @@ device pmtimer # adjust the system clock after resume device drm #device "i915kmsdrm" # breaks VGA console, disabled by default -device mgadrm -device "r128drm" #device radeonkmsdrm # breaks VGA console, disabled by default -device savagedrm -device sisdrm -device tdfxdrm options DRM_DEBUG options DRM_LINUX diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 3b097ac98f..2ec1b323f4 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -2161,12 +2161,7 @@ device aibs # ASUSTeK AI Booster (ACPI ASOC ATK0110) # DRM options: # drm: General DRM code # i915kmsdrm: Intel integrated GPUs, starting from the 830M family -# mgadrm: AGP Matrox G200, G400, G450, G550 -# r128drm: ATI Rage 128 cards # radeonkmsdrm: ATI Radeon cards -# savagedrm: Savage cards -# sisdrm: Sis cards -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # # DRM_DEBUG: include debug printfs, very slow # @@ -2174,12 +2169,7 @@ device aibs # ASUSTeK AI Booster (ACPI ASOC ATK0110) device drm #device "i915kmsdrm" # breaks VGA console, disabled by default -device mgadrm -device "r128drm" #device radeonkmsdrm # breaks VGA console, disabled by default -device savagedrm -device sisdrm -device tdfxdrm options DRM_DEBUG options DRM_LINUX -- 2.41.0