From e440694adcf8b5ee8eab5914302130003d121a0e Mon Sep 17 00:00:00 2001 From: klmengkd Date: Mon, 8 Dec 2025 10:05:23 +0800 Subject: [PATCH] uvb: change dir name drivers inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/IDBANR?from=project-issue CVE: NA -------------------------------- This patch change uvb dir name. Signed-off-by: klmengkd --- drivers/firmware/Kconfig | 2 +- drivers/firmware/Makefile | 2 +- drivers/firmware/{ubios_uvb => uvb}/Kconfig | 0 drivers/firmware/{ubios_uvb => uvb}/Makefile | 2 +- drivers/firmware/{ubios_uvb => uvb}/cis/cis_core.c | 0 drivers/firmware/{ubios_uvb => uvb}/cis/cis_info_process.c | 0 drivers/firmware/{ubios_uvb => uvb}/cis/cis_info_process.h | 0 drivers/firmware/{ubios_uvb => uvb}/cis/uvb_info_process.c | 0 drivers/firmware/{ubios_uvb => uvb}/cis/uvb_info_process.h | 0 drivers/firmware/{ubios_uvb => uvb}/include/cis_uvb_interface.h | 2 +- drivers/firmware/{ubios_uvb => uvb}/odf/odf_data.c | 0 drivers/firmware/{ubios_uvb => uvb}/odf/odf_get_fdt.c | 0 drivers/firmware/{ubios_uvb => uvb}/odf/odf_handle.h | 0 drivers/firmware/{ubios_uvb => uvb}/odf/odf_helper.c | 0 drivers/firmware/{ubios_uvb => uvb}/odf/odf_interface.h | 0 drivers/firmware/{ubios_uvb => uvb}/odf/odf_trans.c | 0 drivers/ub/sentry/sentry_uvb_comm.c | 2 +- drivers/ub/sentry/smh_common_type.h | 2 +- include/linux/firmware/{ubios => uvb}/cis.h | 0 19 files changed, 6 insertions(+), 6 deletions(-) rename drivers/firmware/{ubios_uvb => uvb}/Kconfig (100%) rename drivers/firmware/{ubios_uvb => uvb}/Makefile (86%) rename drivers/firmware/{ubios_uvb => uvb}/cis/cis_core.c (100%) rename drivers/firmware/{ubios_uvb => uvb}/cis/cis_info_process.c (100%) rename drivers/firmware/{ubios_uvb => uvb}/cis/cis_info_process.h (100%) rename drivers/firmware/{ubios_uvb => uvb}/cis/uvb_info_process.c (100%) rename drivers/firmware/{ubios_uvb => uvb}/cis/uvb_info_process.h (100%) rename drivers/firmware/{ubios_uvb => uvb}/include/cis_uvb_interface.h (98%) rename drivers/firmware/{ubios_uvb => uvb}/odf/odf_data.c (100%) rename drivers/firmware/{ubios_uvb => uvb}/odf/odf_get_fdt.c (100%) rename drivers/firmware/{ubios_uvb => uvb}/odf/odf_handle.h (100%) rename drivers/firmware/{ubios_uvb => uvb}/odf/odf_helper.c (100%) rename drivers/firmware/{ubios_uvb => uvb}/odf/odf_interface.h (100%) rename drivers/firmware/{ubios_uvb => uvb}/odf/odf_trans.c (100%) rename include/linux/firmware/{ubios => uvb}/cis.h (100%) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index ebab663702fc..ce334acecfa4 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -315,6 +315,6 @@ source "drivers/firmware/psci/Kconfig" source "drivers/firmware/smccc/Kconfig" source "drivers/firmware/tegra/Kconfig" source "drivers/firmware/xilinx/Kconfig" -source "drivers/firmware/ubios_uvb/Kconfig" +source "drivers/firmware/uvb/Kconfig" endmenu diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index c60933fa11cb..defec11828e8 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -38,4 +38,4 @@ obj-y += psci/ obj-y += smccc/ obj-y += tegra/ obj-y += xilinx/ -obj-$(CONFIG_UDFI) += ubios_uvb/ +obj-$(CONFIG_UDFI) += uvb/ diff --git a/drivers/firmware/ubios_uvb/Kconfig b/drivers/firmware/uvb/Kconfig similarity index 100% rename from drivers/firmware/ubios_uvb/Kconfig rename to drivers/firmware/uvb/Kconfig diff --git a/drivers/firmware/ubios_uvb/Makefile b/drivers/firmware/uvb/Makefile similarity index 86% rename from drivers/firmware/ubios_uvb/Makefile rename to drivers/firmware/uvb/Makefile index ccb8b026c819..d5a261794d9e 100644 --- a/drivers/firmware/ubios_uvb/Makefile +++ b/drivers/firmware/uvb/Makefile @@ -2,7 +2,7 @@ # Create : 2025-04-18 # Description : cis odf Makefile -ccflags-y += -I$(srctree)/drivers/firmware/ubios_uvb/include +ccflags-y += -I$(srctree)/drivers/firmware/uvb/include obj-$(CONFIG_UDFI) = odf/odf_get_fdt.o obj-$(CONFIG_UDFI_ODF) += odf.o diff --git a/drivers/firmware/ubios_uvb/cis/cis_core.c b/drivers/firmware/uvb/cis/cis_core.c similarity index 100% rename from drivers/firmware/ubios_uvb/cis/cis_core.c rename to drivers/firmware/uvb/cis/cis_core.c diff --git a/drivers/firmware/ubios_uvb/cis/cis_info_process.c b/drivers/firmware/uvb/cis/cis_info_process.c similarity index 100% rename from drivers/firmware/ubios_uvb/cis/cis_info_process.c rename to drivers/firmware/uvb/cis/cis_info_process.c diff --git a/drivers/firmware/ubios_uvb/cis/cis_info_process.h b/drivers/firmware/uvb/cis/cis_info_process.h similarity index 100% rename from drivers/firmware/ubios_uvb/cis/cis_info_process.h rename to drivers/firmware/uvb/cis/cis_info_process.h diff --git a/drivers/firmware/ubios_uvb/cis/uvb_info_process.c b/drivers/firmware/uvb/cis/uvb_info_process.c similarity index 100% rename from drivers/firmware/ubios_uvb/cis/uvb_info_process.c rename to drivers/firmware/uvb/cis/uvb_info_process.c diff --git a/drivers/firmware/ubios_uvb/cis/uvb_info_process.h b/drivers/firmware/uvb/cis/uvb_info_process.h similarity index 100% rename from drivers/firmware/ubios_uvb/cis/uvb_info_process.h rename to drivers/firmware/uvb/cis/uvb_info_process.h diff --git a/drivers/firmware/ubios_uvb/include/cis_uvb_interface.h b/drivers/firmware/uvb/include/cis_uvb_interface.h similarity index 98% rename from drivers/firmware/ubios_uvb/include/cis_uvb_interface.h rename to drivers/firmware/uvb/include/cis_uvb_interface.h index bc9d5a858cce..513cb42372da 100644 --- a/drivers/firmware/ubios_uvb/include/cis_uvb_interface.h +++ b/drivers/firmware/uvb/include/cis_uvb_interface.h @@ -8,7 +8,7 @@ #ifndef CIS_UVB_INTERFACE_H #define CIS_UVB_INTERFACE_H -#include +#include /** * struct cis_group - call id service group diff --git a/drivers/firmware/ubios_uvb/odf/odf_data.c b/drivers/firmware/uvb/odf/odf_data.c similarity index 100% rename from drivers/firmware/ubios_uvb/odf/odf_data.c rename to drivers/firmware/uvb/odf/odf_data.c diff --git a/drivers/firmware/ubios_uvb/odf/odf_get_fdt.c b/drivers/firmware/uvb/odf/odf_get_fdt.c similarity index 100% rename from drivers/firmware/ubios_uvb/odf/odf_get_fdt.c rename to drivers/firmware/uvb/odf/odf_get_fdt.c diff --git a/drivers/firmware/ubios_uvb/odf/odf_handle.h b/drivers/firmware/uvb/odf/odf_handle.h similarity index 100% rename from drivers/firmware/ubios_uvb/odf/odf_handle.h rename to drivers/firmware/uvb/odf/odf_handle.h diff --git a/drivers/firmware/ubios_uvb/odf/odf_helper.c b/drivers/firmware/uvb/odf/odf_helper.c similarity index 100% rename from drivers/firmware/ubios_uvb/odf/odf_helper.c rename to drivers/firmware/uvb/odf/odf_helper.c diff --git a/drivers/firmware/ubios_uvb/odf/odf_interface.h b/drivers/firmware/uvb/odf/odf_interface.h similarity index 100% rename from drivers/firmware/ubios_uvb/odf/odf_interface.h rename to drivers/firmware/uvb/odf/odf_interface.h diff --git a/drivers/firmware/ubios_uvb/odf/odf_trans.c b/drivers/firmware/uvb/odf/odf_trans.c similarity index 100% rename from drivers/firmware/ubios_uvb/odf/odf_trans.c rename to drivers/firmware/uvb/odf/odf_trans.c diff --git a/drivers/ub/sentry/sentry_uvb_comm.c b/drivers/ub/sentry/sentry_uvb_comm.c index ef6af702263d..e7fef72e0670 100644 --- a/drivers/ub/sentry/sentry_uvb_comm.c +++ b/drivers/ub/sentry/sentry_uvb_comm.c @@ -6,7 +6,7 @@ * Create: 2025-04-23 */ -#include +#include #include #include #include diff --git a/drivers/ub/sentry/smh_common_type.h b/drivers/ub/sentry/smh_common_type.h index 2303afc2e529..069c04a23f08 100644 --- a/drivers/ub/sentry/smh_common_type.h +++ b/drivers/ub/sentry/smh_common_type.h @@ -9,7 +9,7 @@ #ifndef SMH_COMMON_TYPE_H #define SMH_COMMON_TYPE_H -#include +#include #include #include #include diff --git a/include/linux/firmware/ubios/cis.h b/include/linux/firmware/uvb/cis.h similarity index 100% rename from include/linux/firmware/ubios/cis.h rename to include/linux/firmware/uvb/cis.h -- Gitee