Re: [PATCH v3 2/3] firmware: Rename google firmware directory to coreboot

Hi

Am 10.07.26 um 08:12 schrieb Sean Rhodes:
> Most drivers in drivers/firmware/google are coreboot table drivers rather
> than Google-specific firmware drivers. Rename the directory to coreboot
> and update the Kconfig prompt, build path and maintainer entry.
>
> Keep the existing CONFIG_GOOGLE_* symbols to avoid user configuration
> churn in this mechanical move.

You can use 'transitional' for easily renaming Kconfig options.

https://elixir.bootlin.com/linux/v7.1.2/source/Documentation/kbuild/kconfig-language.rst#L245

Best regards
Thomas

>
> Signed-off-by: Sean Rhodes <[email protected]>
> ---
>   MAINTAINERS                                                 | 4 ++--
>   drivers/firmware/Kconfig                                    | 2 +-
>   drivers/firmware/Makefile                                   | 2 +-
>   drivers/firmware/{google => coreboot}/Kconfig               | 6 +++---
>   drivers/firmware/{google => coreboot}/Makefile              | 0
>   drivers/firmware/{google => coreboot}/cbmem.c               | 0
>   drivers/firmware/{google => coreboot}/coreboot_table.c      | 0
>   drivers/firmware/{google => coreboot}/coreboot_table.h      | 0
>   .../firmware/{google => coreboot}/framebuffer-coreboot.c    | 0
>   drivers/firmware/{google => coreboot}/gsmi.c                | 0
>   drivers/firmware/{google => coreboot}/memconsole-coreboot.c | 0
>   .../firmware/{google => coreboot}/memconsole-x86-legacy.c   | 0
>   drivers/firmware/{google => coreboot}/memconsole.c          | 0
>   drivers/firmware/{google => coreboot}/memconsole.h          | 6 +++---
>   drivers/firmware/{google => coreboot}/vpd.c                 | 0
>   drivers/firmware/{google => coreboot}/vpd_decode.c          | 0
>   drivers/firmware/{google => coreboot}/vpd_decode.h          | 0
>   17 files changed, 10 insertions(+), 10 deletions(-)
>   rename drivers/firmware/{google => coreboot}/Kconfig (94%)
>   rename drivers/firmware/{google => coreboot}/Makefile (100%)
>   rename drivers/firmware/{google => coreboot}/cbmem.c (100%)
>   rename drivers/firmware/{google => coreboot}/coreboot_table.c (100%)
>   rename drivers/firmware/{google => coreboot}/coreboot_table.h (100%)
>   rename drivers/firmware/{google => coreboot}/framebuffer-coreboot.c (100%)
>   rename drivers/firmware/{google => coreboot}/gsmi.c (100%)
>   rename drivers/firmware/{google => coreboot}/memconsole-coreboot.c (100%)
>   rename drivers/firmware/{google => coreboot}/memconsole-x86-legacy.c (100%)
>   rename drivers/firmware/{google => coreboot}/memconsole.c (100%)
>   rename drivers/firmware/{google => coreboot}/memconsole.h (82%)
>   rename drivers/firmware/{google => coreboot}/vpd.c (100%)
>   rename drivers/firmware/{google => coreboot}/vpd_decode.c (100%)
>   rename drivers/firmware/{google => coreboot}/vpd_decode.h (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ec0a12121357..01344fc92253 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -11068,14 +11068,14 @@ S:	Maintained
>   F:	Documentation/networking/device_drivers/ethernet/google/gve.rst
>   F:	drivers/net/ethernet/google
>   
> -GOOGLE FIRMWARE DRIVERS
> +COREBOOT FIRMWARE DRIVERS
>   M:	Tzung-Bi Shih <[email protected]>
>   R:	Brian Norris <[email protected]>
>   R:	Julius Werner <[email protected]>
>   L:	[email protected]
>   S:	Maintained
>   T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
> -F:	drivers/firmware/google/
> +F:	drivers/firmware/coreboot/
>   F:	include/linux/coreboot.h
>   
>   GOOGLE TENSOR SoC SUPPORT
> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
> index 78a239f8bbef..4df0a0ad18b8 100644
> --- a/drivers/firmware/Kconfig
> +++ b/drivers/firmware/Kconfig
> @@ -293,7 +293,7 @@ endif # TURRIS_MOX_RWTM
>   source "drivers/firmware/arm_ffa/Kconfig"
>   source "drivers/firmware/broadcom/Kconfig"
>   source "drivers/firmware/cirrus/Kconfig"
> -source "drivers/firmware/google/Kconfig"
> +source "drivers/firmware/coreboot/Kconfig"
>   source "drivers/firmware/efi/Kconfig"
>   source "drivers/firmware/imx/Kconfig"
>   source "drivers/firmware/meson/Kconfig"
> diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
> index 385b6e8b7fc6..7a8fc3eeb3f0 100644
> --- a/drivers/firmware/Makefile
> +++ b/drivers/firmware/Makefile
> @@ -30,7 +30,7 @@ obj-y				+= broadcom/
>   obj-y				+= cirrus/
>   obj-y				+= meson/
>   obj-y				+= microchip/
> -obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/
> +obj-$(CONFIG_GOOGLE_FIRMWARE)	+= coreboot/
>   obj-y				+= efi/
>   obj-y				+= imx/
>   obj-y				+= psci/
> diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/coreboot/Kconfig
> similarity index 94%
> rename from drivers/firmware/google/Kconfig
> rename to drivers/firmware/coreboot/Kconfig
> index b78c644fa253..b248bafe8b6b 100644
> --- a/drivers/firmware/google/Kconfig
> +++ b/drivers/firmware/coreboot/Kconfig
> @@ -1,10 +1,10 @@
>   # SPDX-License-Identifier: GPL-2.0-only
>   menuconfig GOOGLE_FIRMWARE
> -	bool "Google Firmware Drivers"
> +	bool "coreboot firmware drivers"
>   	default n
>   	help
> -	  These firmware drivers are used by Google servers,
> -	  Chromebooks and other devices using coreboot firmware.
> +	  These firmware drivers are used by devices running coreboot
> +	  firmware, including Chromebooks and some Google servers.
>   	  If in doubt, say "N".
>   
>   if GOOGLE_FIRMWARE
> diff --git a/drivers/firmware/google/Makefile b/drivers/firmware/coreboot/Makefile
> similarity index 100%
> rename from drivers/firmware/google/Makefile
> rename to drivers/firmware/coreboot/Makefile
> diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/coreboot/cbmem.c
> similarity index 100%
> rename from drivers/firmware/google/cbmem.c
> rename to drivers/firmware/coreboot/cbmem.c
> diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/coreboot/coreboot_table.c
> similarity index 100%
> rename from drivers/firmware/google/coreboot_table.c
> rename to drivers/firmware/coreboot/coreboot_table.c
> diff --git a/drivers/firmware/google/coreboot_table.h b/drivers/firmware/coreboot/coreboot_table.h
> similarity index 100%
> rename from drivers/firmware/google/coreboot_table.h
> rename to drivers/firmware/coreboot/coreboot_table.h
> diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/coreboot/framebuffer-coreboot.c
> similarity index 100%
> rename from drivers/firmware/google/framebuffer-coreboot.c
> rename to drivers/firmware/coreboot/framebuffer-coreboot.c
> diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/coreboot/gsmi.c
> similarity index 100%
> rename from drivers/firmware/google/gsmi.c
> rename to drivers/firmware/coreboot/gsmi.c
> diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/coreboot/memconsole-coreboot.c
> similarity index 100%
> rename from drivers/firmware/google/memconsole-coreboot.c
> rename to drivers/firmware/coreboot/memconsole-coreboot.c
> diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/coreboot/memconsole-x86-legacy.c
> similarity index 100%
> rename from drivers/firmware/google/memconsole-x86-legacy.c
> rename to drivers/firmware/coreboot/memconsole-x86-legacy.c
> diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/coreboot/memconsole.c
> similarity index 100%
> rename from drivers/firmware/google/memconsole.c
> rename to drivers/firmware/coreboot/memconsole.c
> diff --git a/drivers/firmware/google/memconsole.h b/drivers/firmware/coreboot/memconsole.h
> similarity index 82%
> rename from drivers/firmware/google/memconsole.h
> rename to drivers/firmware/coreboot/memconsole.h
> index aaff2b72b606..58899c2abaaa 100644
> --- a/drivers/firmware/google/memconsole.h
> +++ b/drivers/firmware/coreboot/memconsole.h
> @@ -7,8 +7,8 @@
>    * Copyright 2017 Google Inc.
>    */
>   
> -#ifndef __FIRMWARE_GOOGLE_MEMCONSOLE_H
> -#define __FIRMWARE_GOOGLE_MEMCONSOLE_H
> +#ifndef __FIRMWARE_COREBOOT_MEMCONSOLE_H
> +#define __FIRMWARE_COREBOOT_MEMCONSOLE_H
>   
>   #include <linux/types.h>
>   
> @@ -33,4 +33,4 @@ int memconsole_sysfs_init(void);
>    */
>   void memconsole_exit(void);
>   
> -#endif /* __FIRMWARE_GOOGLE_MEMCONSOLE_H */
> +#endif /* __FIRMWARE_COREBOOT_MEMCONSOLE_H */
> diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/coreboot/vpd.c
> similarity index 100%
> rename from drivers/firmware/google/vpd.c
> rename to drivers/firmware/coreboot/vpd.c
> diff --git a/drivers/firmware/google/vpd_decode.c b/drivers/firmware/coreboot/vpd_decode.c
> similarity index 100%
> rename from drivers/firmware/google/vpd_decode.c
> rename to drivers/firmware/coreboot/vpd_decode.c
> diff --git a/drivers/firmware/google/vpd_decode.h b/drivers/firmware/coreboot/vpd_decode.h
> similarity index 100%
> rename from drivers/firmware/google/vpd_decode.h
> rename to drivers/firmware/coreboot/vpd_decode.h

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)