From c3d2d50a3461c1b0f8c5b57e98917588dcbb7450 Mon Sep 17 00:00:00 2001 From: kevans Date: Sat, 23 Dec 2017 14:30:44 +0000 Subject: [PATCH] Move syscon into extres framework This should help reduce confusion between syscon/syscons a little bit. syscon is a resource generally modeled by FDT platforms, and not to be confused with syscons. --- sys/conf/files | 6 +++--- sys/dev/{ => extres}/syscon/syscon.c | 0 sys/dev/{ => extres}/syscon/syscon.h | 0 sys/dev/{ => extres}/syscon/syscon_generic.c | 0 sys/dev/{ => extres}/syscon/syscon_if.m | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename sys/dev/{ => extres}/syscon/syscon.c (100%) rename sys/dev/{ => extres}/syscon/syscon.h (100%) rename sys/dev/{ => extres}/syscon/syscon_generic.c (100%) rename sys/dev/{ => extres}/syscon/syscon_if.m (100%) diff --git a/sys/conf/files b/sys/conf/files index 968957d20da1..c6f570827439 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1723,6 +1723,9 @@ dev/extres/regulator/regnode_if.m optional ext_resources regulator fdt dev/extres/regulator/regulator.c optional ext_resources regulator fdt dev/extres/regulator/regulator_bus.c optional ext_resources regulator fdt dev/extres/regulator/regulator_fixed.c optional ext_resources regulator fdt +dev/extres/syscon/syscon.c optional ext_resources syscon +dev/extres/syscon/syscon_generic.c optional ext_resources syscon fdt +dev/extres/syscon/syscon_if.m optional ext_resources syscon dev/fb/fbd.c optional fbd | vt dev/fb/fb_if.m standard dev/fb/splash.c optional sc splash @@ -3107,9 +3110,6 @@ dev/stg/tmc18c30_subr.c optional stg dev/stge/if_stge.c optional stge dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" -dev/syscon/syscon.c optional syscon -dev/syscon/syscon_generic.c optional fdt syscon -dev/syscon/syscon_if.m optional syscon dev/syscons/blank/blank_saver.c optional blank_saver dev/syscons/daemon/daemon_saver.c optional daemon_saver dev/syscons/dragon/dragon_saver.c optional dragon_saver diff --git a/sys/dev/syscon/syscon.c b/sys/dev/extres/syscon/syscon.c similarity index 100% rename from sys/dev/syscon/syscon.c rename to sys/dev/extres/syscon/syscon.c diff --git a/sys/dev/syscon/syscon.h b/sys/dev/extres/syscon/syscon.h similarity index 100% rename from sys/dev/syscon/syscon.h rename to sys/dev/extres/syscon/syscon.h diff --git a/sys/dev/syscon/syscon_generic.c b/sys/dev/extres/syscon/syscon_generic.c similarity index 100% rename from sys/dev/syscon/syscon_generic.c rename to sys/dev/extres/syscon/syscon_generic.c diff --git a/sys/dev/syscon/syscon_if.m b/sys/dev/extres/syscon/syscon_if.m similarity index 100% rename from sys/dev/syscon/syscon_if.m rename to sys/dev/extres/syscon/syscon_if.m