diff mbox series

[v4,2/8] arch/arm/Makefile: sort machine names

Message ID 20200506120243.38876-3-twoerner@gmail.com
State Accepted
Commit 9bffc54996bc36c87efdd36a6b1345609e33d795
Delegated to: Tom Rini
Headers show
Series A small set of arm cleanups | expand

Commit Message

Trevor Woerner May 6, 2020, 12:02 p.m. UTC 
The comment immediately above the block of machine directory names implored
users to keep the macro names sorted, but, alas, this is no longer the case.

Put the list of machine directory names back in alphanumerical order by
CONFIG_* macro name, as the comment asks. Sort all the symbols as though they
all followed the convention of having the string "ARCH_" in the middle of
their definitions.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>

---

Changes in v4: None
Changes in v3: None
Changes in v2:
- Improve the wording of the commit message, mostly to specify that the sorting
  was done assuming all symbols had "ARCH_" in the middle.

 arch/arm/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Tom Rini May 15, 2020, 8:52 p.m. UTC | #1 
On Wed, May 06, 2020 at 08:02:37AM -0400, Trevor Woerner wrote:

> The comment immediately above the block of machine directory names implored
> users to keep the macro names sorted, but, alas, this is no longer the case.
> 
> Put the list of machine directory names back in alphanumerical order by
> CONFIG_* macro name, as the comment asks. Sort all the symbols as though they
> all followed the convention of having the string "ARCH_" in the middle of
> their definitions.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 33bb8923bf..5d32dec29c 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -66,25 +66,25 @@  machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx
 machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek
 machine-$(CONFIG_ARCH_MESON)		+= meson
 machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
-# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
+machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
 # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
 machine-$(CONFIG_ORION5X)		+= orion5x
-machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
 machine-$(CONFIG_ARCH_OWL)		+= owl
+machine-$(CONFIG_ARCH_RMOBILE)		+= rmobile
+machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
 machine-$(CONFIG_ARCH_S5PC1XX)		+= s5pc1xx
-machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
 machine-$(CONFIG_ARCH_SNAPDRAGON)	+= snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
-machine-$(CONFIG_ARCH_RMOBILE)		+= rmobile
-machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
 machine-$(CONFIG_STM32)			+= stm32
 machine-$(CONFIG_ARCH_STM32MP)		+= stm32mp
+machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
+# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
 machine-$(CONFIG_TEGRA)			+= tegra
 machine-$(CONFIG_ARCH_U8500)		+= u8500
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
+machine-$(CONFIG_ARCH_VERSAL)		+= versal
 machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
 machine-$(CONFIG_ARCH_ZYNQMP)		+= zynqmp
-machine-$(CONFIG_ARCH_VERSAL)		+= versal
 machine-$(CONFIG_ARCH_ZYNQMP_R5)	+= zynqmp-r5
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))