From 61ebc359caebdc1fe0411ddf1309049f9fe67d76 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Thu, 21 Feb 2019 17:31:33 +0000 Subject: [PATCH] Move scterm_teken.c from 6 MD files lists to the MI files list so that it is easier to configure. It is MI, unlike some of the other syscons files already in the MI list. Move scvtb.c similarly. It is needed whenever sc is configured, and is more MI than most of the files already in the MI list. This only changes the combined list for arm64 and mips. These arches already cannot build sc or even NOTES. --- sys/conf/files | 2 ++ sys/conf/files.amd64 | 2 -- sys/conf/files.arm | 2 -- sys/conf/files.i386 | 2 -- sys/conf/files.mips | 2 -- sys/conf/files.powerpc | 2 -- sys/conf/files.sparc64 | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 396537f946d..6dbb61c5984 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3133,7 +3133,9 @@ dev/syscons/rain/rain_saver.c optional rain_saver dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc dev/syscons/scterm.c optional sc +dev/syscons/scterm-teken.c optional sc dev/syscons/scvidctl.c optional sc +dev/syscons/scvtb.c optional sc dev/syscons/snake/snake_saver.c optional snake_saver dev/syscons/star/star_saver.c optional star_saver dev/syscons/syscons.c optional sc diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 0914da2058d..598d480c633 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -486,10 +486,8 @@ dev/smartpqi/smartpqi_sis.c optional smartpqi dev/smartpqi/smartpqi_tag.c optional smartpqi dev/speaker/spkr.c optional speaker dev/syscons/apm/apm_saver.c optional apm_saver apm -dev/syscons/scterm-teken.c optional sc dev/syscons/scvesactl.c optional sc vga vesa dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scvtb.c optional sc dev/tpm/tpm.c optional tpm dev/tpm/tpm20.c optional tpm dev/tpm/tpm_crb.c optional tpm acpi diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 087f4c695fa..6795942875b 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -132,8 +132,6 @@ dev/pci/pci_host_generic_fdt.c optional pci_host_generic pci fdt dev/psci/psci.c optional psci dev/psci/psci_arm.S optional psci dev/syscons/scgfbrndr.c optional sc -dev/syscons/scterm-teken.c optional sc -dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_fdt.c optional uart fdt font.h optional sc \ diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index a1fb52d3914..a9d20871627 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -309,10 +309,8 @@ dev/sio/sio_pci.c optional sio pci dev/sio/sio_puc.c optional sio puc dev/speaker/spkr.c optional speaker dev/syscons/apm/apm_saver.c optional apm_saver apm -dev/syscons/scterm-teken.c optional sc dev/syscons/scvesactl.c optional sc vga vesa dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scvtb.c optional sc dev/tpm/tpm.c optional tpm dev/tpm/tpm_acpi.c optional tpm acpi dev/tpm/tpm_isa.c optional tpm isa diff --git a/sys/conf/files.mips b/sys/conf/files.mips index 1977fb9dcce..b87022dd58a 100644 --- a/sys/conf/files.mips +++ b/sys/conf/files.mips @@ -75,8 +75,6 @@ dev/cfe/cfe_env.c optional cfe_env # syscons support dev/fb/fb.c optional sc dev/syscons/scgfbrndr.c optional sc -dev/syscons/scterm-teken.c optional sc -dev/syscons/scvtb.c optional sc mips/mips/sc_machdep.c optional sc # FDT support diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 47287515b5b..683b8399b44 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -74,8 +74,6 @@ dev/sound/macio/onyx.c optional snd_ai2s iicbus powermac dev/sound/macio/snapper.c optional snd_ai2s iicbus powermac dev/sound/macio/tumbler.c optional snd_ai2s iicbus powermac dev/syscons/scgfbrndr.c optional sc -dev/syscons/scterm-teken.c optional sc -dev/syscons/scvtb.c optional sc dev/tsec/if_tsec.c optional tsec dev/tsec/if_tsec_fdt.c optional tsec dev/uart/uart_cpu_powerpc.c optional uart diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index b7be2e61e91..5c2a260a14f 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -56,8 +56,6 @@ dev/pcf/pcf_ebus.c optional pcf ebus dev/sound/sbus/cs4231.c optional snd_audiocs ebus | \ snd_audiocs sbus dev/syscons/scgfbrndr.c optional sc -dev/syscons/scterm-teken.c optional sc -dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_sparc64.c optional uart dev/uart/uart_kbd_sun.c optional uart sc | vt dev/vt/hw/ofwfb/ofwfb.c optional vt