public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH v2 0/8] A small set of arm cleanups
@ 2020-04-17 17:50 Trevor Woerner
  2020-04-17 17:50 ` [PATCH v2 1/8] arm: lpc32xx: move SoC to mach-lpc32xx Trevor Woerner
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Trevor Woerner @ 2020-04-17 17:50 UTC (permalink / raw)
  To: u-boot

This patch series presents a set of cleanups I stumbled across while looking
at some arm-related code.

A long time ago there was an effort to follow the Linux kernel's convention of
putting SoC-specific code in arch/$(ARCH)/mach-$(SOC) instead of the previous
location of arch/$(ARCH)/cpu/$(CPU)/$(SOC). For some reason this didn't occur
with code for NXP's LPC32xx SoC. Therefore the first patch performs this move.

While moving the code, I noticed that years of editing had caused a list in
arch/arm/Makefile to not be sorted alphanumerically anymore, despite the
comment's request to do so. Therefore the second patch re-orders the list to
put it back in alphanumerical order.

While sorting the above-mentioned list, I noticed that there were 4
symbol names that were not following the convention of other symbols:
CONFIG_KIRKWOOD, CONFIG_ORION5X, CONFIG_TEGRA, and CONFIG_STM32. These
symbols should have the pattern: CONFIG_ARCH_<machine>. Therefore more
patches were created to fix these symbol names.

While renaming the CONFIG_ARCH_ORION5X symbol I noticed that this SoC had
code both in arch/$(ARCH)/cpu/$(CPU)/$(SOC) and arch/$(ARCH)/mach-$(SOC),
so there's a patch to complete this move.

Also, I found a typo, so another patch.


Changes in v2:
- Update the commit message to fix the error identified by checkpatch.pl, namely
  to fix the formatting used to reference a prior commit.
- Improve the wording of the commit message, mostly to specify that the sorting
  was done assuming all symbols had "ARCH_" in the middle.
- Update patch to work on latest master; the location where the SPL linker
  script is specified has changed.
- Add Chris Packham's r-b
- Added a cover letter.
- In the original series I only renamed 2 of the 4 symbols that were missing
  the "ARCH_" string (CONFIG_ORION5X and CONFIG_KIRKWOOD), since those were
  the only 2 with TODOs attached to them. As part of v2 I also converted
  CONFIG_TEGRA and CONFIG_STM32


Trevor Woerner (8):
  arm: lpc32xx: move SoC to mach-lpc32xx
  arch/arm/Makefile: sort machine names
  rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
  arm: orion5x: finish moving SoC to mach-orion5x
  rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
  rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
  rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32
  drivers/reset/Kconfig: fix typo

 Kconfig                                       |  2 +-
 Makefile                                      |  4 ++--
 arch/arm/Kconfig                              | 10 ++++----
 arch/arm/Makefile                             | 24 +++++++++----------
 arch/arm/cpu/arm720t/interrupts.c             |  2 +-
 arch/arm/cpu/arm926ejs/Makefile               |  1 -
 arch/arm/cpu/armv7/Kconfig                    |  2 +-
 arch/arm/dts/Makefile                         |  4 ++--
 arch/arm/mach-kirkwood/Kconfig                |  2 +-
 .../lpc32xx => mach-lpc32xx}/Kconfig          |  0
 .../lpc32xx => mach-lpc32xx}/Makefile         |  0
 .../arm926ejs/lpc32xx => mach-lpc32xx}/clk.c  |  0
 .../arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c  |  0
 .../lpc32xx => mach-lpc32xx}/devices.c        |  0
 .../arm926ejs/lpc32xx => mach-lpc32xx}/dram.c |  0
 .../lpc32xx => mach-lpc32xx}/lowlevel_init.S  |  0
 .../lpc32xx => mach-lpc32xx}/timer.c          |  0
 arch/arm/mach-mvebu/Makefile                  |  6 ++---
 arch/arm/mach-mvebu/mbus.c                    |  6 ++---
 arch/arm/mach-orion5x/Kconfig                 |  2 +-
 .../orion5x => mach-orion5x}/u-boot-spl.lds   |  0
 arch/arm/mach-stm32/Kconfig                   |  2 +-
 arch/arm/mach-tegra/Kconfig                   |  2 +-
 board/keymile/Kconfig                         | 12 +++++-----
 common/spl/Kconfig                            |  4 ++--
 config.mk                                     |  2 +-
 configs/SBx81LIFKW_defconfig                  |  2 +-
 configs/SBx81LIFXCAT_defconfig                |  2 +-
 configs/apalis-tk1_defconfig                  |  2 +-
 configs/apalis_t30_defconfig                  |  2 +-
 configs/beaver_defconfig                      |  2 +-
 configs/cardhu_defconfig                      |  2 +-
 configs/cei-tk1-som_defconfig                 |  2 +-
 configs/colibri_t20_defconfig                 |  2 +-
 configs/colibri_t30_defconfig                 |  2 +-
 configs/d2net_v2_defconfig                    |  2 +-
 configs/dalmore_defconfig                     |  2 +-
 configs/db-88f6281-bp-nand_defconfig          |  2 +-
 configs/db-88f6281-bp-spi_defconfig           |  2 +-
 configs/dns325_defconfig                      |  2 +-
 configs/dockstar_defconfig                    |  2 +-
 configs/dreamplug_defconfig                   |  2 +-
 configs/ds109_defconfig                       |  2 +-
 configs/e2220-1170_defconfig                  |  2 +-
 configs/edminiv2_defconfig                    |  4 ++--
 configs/goflexhome_defconfig                  |  2 +-
 configs/guruplug_defconfig                    |  2 +-
 configs/harmony_defconfig                     |  2 +-
 configs/ib62x0_defconfig                      |  2 +-
 configs/iconnect_defconfig                    |  2 +-
 configs/inetspace_v2_defconfig                |  2 +-
 configs/jetson-tk1_defconfig                  |  2 +-
 configs/km_kirkwood_128m16_defconfig          |  2 +-
 configs/km_kirkwood_defconfig                 |  2 +-
 configs/km_kirkwood_pci_defconfig             |  2 +-
 configs/kmcoge5un_defconfig                   |  2 +-
 configs/kmnusa_defconfig                      |  2 +-
 configs/kmsuse2_defconfig                     |  2 +-
 configs/lschlv2_defconfig                     |  2 +-
 configs/lsxhl_defconfig                       |  2 +-
 configs/medcom-wide_defconfig                 |  2 +-
 configs/nas220_defconfig                      |  2 +-
 configs/net2big_v2_defconfig                  |  2 +-
 configs/netspace_lite_v2_defconfig            |  2 +-
 configs/netspace_max_v2_defconfig             |  2 +-
 configs/netspace_mini_v2_defconfig            |  2 +-
 configs/netspace_v2_defconfig                 |  2 +-
 configs/nsa310s_defconfig                     |  2 +-
 configs/nyan-big_defconfig                    |  2 +-
 configs/openrd_base_defconfig                 |  2 +-
 configs/openrd_client_defconfig               |  2 +-
 configs/openrd_ultimate_defconfig             |  2 +-
 configs/p2371-0000_defconfig                  |  2 +-
 configs/p2371-2180_defconfig                  |  2 +-
 configs/p2571_defconfig                       |  2 +-
 configs/p2771-0000-000_defconfig              |  2 +-
 configs/p2771-0000-500_defconfig              |  2 +-
 configs/p3450-0000_defconfig                  |  2 +-
 configs/paz00_defconfig                       |  2 +-
 configs/plutux_defconfig                      |  2 +-
 configs/pogo_e02_defconfig                    |  2 +-
 configs/seaboard_defconfig                    |  2 +-
 configs/sheevaplug_defconfig                  |  2 +-
 configs/stm32f429-discovery_defconfig         |  2 +-
 configs/stm32f429-evaluation_defconfig        |  2 +-
 configs/stm32f469-discovery_defconfig         |  2 +-
 configs/stm32f746-disco_defconfig             |  2 +-
 configs/stm32f769-disco_defconfig             |  2 +-
 configs/stm32h743-disco_defconfig             |  2 +-
 configs/stm32h743-eval_defconfig              |  2 +-
 configs/tec-ng_defconfig                      |  2 +-
 configs/tec_defconfig                         |  2 +-
 configs/trimslice_defconfig                   |  2 +-
 configs/venice2_defconfig                     |  2 +-
 configs/ventana_defconfig                     |  2 +-
 disk/Kconfig                                  |  4 ++--
 drivers/ata/mvsata_ide.c                      |  4 ++--
 drivers/ata/sata_mv.c                         |  2 +-
 drivers/gpio/Kconfig                          |  2 +-
 drivers/i2c/Kconfig                           |  2 +-
 drivers/i2c/mvtwsi.c                          |  6 ++---
 drivers/mailbox/Kconfig                       |  2 +-
 drivers/misc/Kconfig                          |  2 +-
 drivers/mmc/Kconfig                           |  2 +-
 drivers/net/Kconfig                           |  2 +-
 drivers/net/mvgbe.c                           |  4 ++--
 drivers/pci/Kconfig                           |  2 +-
 drivers/reset/Kconfig                         |  4 ++--
 drivers/spi/kirkwood_spi.c                    | 10 ++++----
 drivers/usb/host/Kconfig                      |  4 ++--
 drivers/usb/host/ehci-marvell.c               |  4 ++--
 drivers/video/Kconfig                         |  2 +-
 include/serial.h                              |  2 +-
 tools/Makefile                                |  4 ++--
 114 files changed, 144 insertions(+), 147 deletions(-)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Kconfig (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Makefile (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/clk.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/devices.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/dram.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/lowlevel_init.S (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/timer.c (100%)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds (100%)

-- 
2.26.0.106.g9fadedd637

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-17 17:50 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-17 17:50 [PATCH v2 0/8] A small set of arm cleanups Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 1/8] arm: lpc32xx: move SoC to mach-lpc32xx Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 2/8] arch/arm/Makefile: sort machine names Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 3/8] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 4/8] arm: orion5x: finish moving SoC to mach-orion5x Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 5/8] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 6/8] rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32 Trevor Woerner
2020-04-17 17:50 ` [PATCH v2 8/8] drivers/reset/Kconfig: fix typo Trevor Woerner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox