mbox series

[GIT,PULL] kconfig.socs symbol conversion

Message ID Y6yRULqZa+NtkcjP@spud (mailing list archive)
State Accepted
Headers show
Series [GIT,PULL] kconfig.socs symbol conversion | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ tags/soc2arch-immutable

Checks

Context Check Description
conchuod/tree_selection success Pull request for for-next
conchuod/maintainers_pattern success MAINTAINERS pattern errors before the patch: 13 and now 13
conchuod/verify_signedoff success Signed-off-by tag matches author and committer
conchuod/alphanumeric_selects success Out of order selects before the patch: 57 and now 57
conchuod/build_rv32_defconfig success Build OK
conchuod/build_warn_rv64 success Errors and warnings before: 0 this patch: 0
conchuod/dtb_warn_rv64 success Errors and warnings before: 0 this patch: 0
conchuod/build_rv64_nommu_k210_defconfig success Build OK
conchuod/verify_fixes success No Fixes tag
conchuod/build_rv64_nommu_virt_defconfig success Build OK

Message

Conor Dooley Dec. 28, 2022, 6:56 p.m. UTC
Hey Palmer,

Please pull part 1 of the Kconfig.socs cleanup work.

This PR adds ARCH_FOO copies of SOC_FOO symbols, so that from v6.3
onwards I can convert the users of the old symbols to the new ones.
I've also gone and converted the various bits of Kbuild infra over to
the new symbols which I will merge into my dt-for-next branch, hence the
PR.

Part N will probably arrive this time next year, once an LTS has been
released with the ARCH_FOO symbols in it. That seems like a fair way to
make sure the ARCH_FOO symbols propagate to whatever out of tree
defconfigs that exist.

I've included the rest of my "RISC-V: kconfig.socs cleanup, part 1",
series in this tag/PR as it depends on the earlier patches. I won't be
merging those bits into my dt tree though as they're not needed there.

Thanks,
Conor.

The following changes since commit 1b929c02afd37871d5afb9d498426f83432e71c2:

  Linux 6.2-rc1 (2022-12-25 13:41:39 -0800)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ tags/soc2arch-immutable

for you to fetch changes up to 3af577f9826fdddefac42b35fc5eb3912c5b7d85:

  RISC-V: stop directly selecting drivers for SOC_CANAAN (2022-12-27 18:01:40 +0000)

----------------------------------------------------------------
SOC_FOO to ARCH_FOO conversion for RISC-V

RISC-V is an outlier in using SOC_FOO rather than ARCH_FOO for
vendors/micro-archs. SOC_FOO may make more sense (I personally prefer
it), but the rest of the "world" uses ARCH_FOO. That'd be fine, with
with an increasing number of existing SoC vendors moving to RISC-V,
unifying our symbol names with the expectations of the rest of the world
makes sense.
Folks did not seem keen on changing the world (and they can't really be
blamed for that) so convert RISC-V over to match.

Add some ARCH_FOO stubs alongside the existing SOC_FOO ones, which will
be removed once all users of SOC_FOO have been converted*, and convert
the DT bits of RISC-V kbuild over to the new symbols.

* It may be best to wait until after the next LTS to remove the SOC_FOO
  ones, for the sake of external users.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

----------------------------------------------------------------
Conor Dooley (6):
      RISC-V: introduce ARCH_FOO kconfig aliases for SOC_FOO symbols
      RISC-V: kconfig.socs: convert usage of SOC_CANAAN to ARCH_CANAAN
      RISC-V: kbuild: convert all use of SOC_FOO to ARCH_FOO
      RISC-V: stop selecting the PolarFire SoC clock driver
      RISC-V: stop selecting SiFive clock and serial drivers directly
      RISC-V: stop directly selecting drivers for SOC_CANAAN

 arch/riscv/Kconfig.socs                | 39 ++++++++++++++++++++++++++-------------
 arch/riscv/Makefile                    |  2 +-
 arch/riscv/boot/dts/Makefile           |  2 +-
 arch/riscv/boot/dts/canaan/Makefile    | 14 +++++++-------
 arch/riscv/boot/dts/microchip/Makefile |  8 ++++----
 arch/riscv/boot/dts/sifive/Makefile    |  4 ++--
 arch/riscv/boot/dts/starfive/Makefile  |  2 +-
 7 files changed, 42 insertions(+), 29 deletions(-)

Comments

Palmer Dabbelt Dec. 28, 2022, 7:04 p.m. UTC | #1
On Wed, 28 Dec 2022 18:56:16 +0000, Conor Dooley wrote:
> Hey Palmer,
> 
> Please pull part 1 of the Kconfig.socs cleanup work.
> 
> This PR adds ARCH_FOO copies of SOC_FOO symbols, so that from v6.3
> onwards I can convert the users of the old symbols to the new ones.
> I've also gone and converted the various bits of Kbuild infra over to
> the new symbols which I will merge into my dt-for-next branch, hence the
> PR.
> 
> [...]

Merged, thanks!

https://git.kernel.org/palmer/c/4e1ce304ea19

Best regards,