Skip to content

Commit

Permalink
ARM: imx: rename mach dir for mx21 and mx27 to mach-imx
Browse files Browse the repository at this point in the history 
Finally all imx code should end up there, start with mach-mx2.  While
touching all files rename some files to use a hyphen instead of an
underscore.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  • Loading branch information
Uwe Kleine-König committed Jun 24, 2010
1 parent f1d4cbe commit d109167
Show file tree
Hide file tree
Showing 23 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion arch/arm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ machine-$(CONFIG_ARCH_MMP) := mmp
machine-$(CONFIG_ARCH_MSM) := msm
machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
machine-$(CONFIG_ARCH_MX1) := mx1
machine-$(CONFIG_ARCH_MX2) := mx2
machine-$(CONFIG_ARCH_MX2) := imx
machine-$(CONFIG_ARCH_MX25) := mx25
machine-$(CONFIG_ARCH_MX3) := mx3
machine-$(CONFIG_ARCH_MX5) := mx5
Expand Down
0 arch/arm/mach-mx2/Kconfig → arch/arm/mach-imx/Kconfig
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions arch/arm/mach-mx2/Makefile → arch/arm/mach-imx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

obj-y := devices.o serial.o

obj-$(CONFIG_MACH_MX21) += clock_imx21.o mm-imx21.o
obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o

obj-$(CONFIG_MACH_MX27) += cpu_imx27.o
obj-$(CONFIG_MACH_MX27) += clock_imx27.o mm-imx27.o
obj-$(CONFIG_MACH_MX27) += cpu-imx27.o
obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o

obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
Expand Down
0 arch/arm/mach-mx2/Makefile.boot → arch/arm/mach-imx/Makefile.boot
View file
File renamed without changes.
0 arch/arm/mach-mx2/clock_imx21.c → arch/arm/mach-imx/clock-imx21.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/clock_imx27.c → arch/arm/mach-imx/clock-imx27.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/cpu_imx27.c → arch/arm/mach-imx/cpu-imx27.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/devices.c → arch/arm/mach-imx/devices.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/devices.h → arch/arm/mach-imx/devices.h
View file
File renamed without changes.
0 arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c → arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-cpuimx27.c → arch/arm/mach-imx/mach-cpuimx27.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-imx27lite.c → arch/arm/mach-imx/mach-imx27lite.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-mx21ads.c → arch/arm/mach-imx/mach-mx21ads.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-mx27_3ds.c → arch/arm/mach-imx/mach-mx27_3ds.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-mx27ads.c → arch/arm/mach-imx/mach-mx27ads.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-mxt_td60.c → arch/arm/mach-imx/mach-mxt_td60.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-pca100.c → arch/arm/mach-imx/mach-pca100.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/mach-pcm038.c → arch/arm/mach-imx/mach-pcm038.c
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion arch/arm/mach-mx2/mm-imx21.c → arch/arm/mach-imx/mm-imx21.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* arch/arm/mach-mx2/mm-imx21.c
* arch/arm/mach-imx/mm-imx21.c
*
* Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mx2/mm-imx27.c → arch/arm/mach-imx/mm-imx27.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* arch/arm/mach-mx2/mm-imx27.c
* arch/arm/mach-imx/mm-imx27.c
*
* Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
*
Expand Down
0 arch/arm/mach-mx2/pcm970-baseboard.c → arch/arm/mach-imx/pcm970-baseboard.c
View file
File renamed without changes.
0 arch/arm/mach-mx2/serial.c → arch/arm/mach-imx/serial.c
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion arch/arm/plat-mxc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ config ARCH_MX5
endchoice

source "arch/arm/mach-mx1/Kconfig"
source "arch/arm/mach-mx2/Kconfig"
source "arch/arm/mach-imx/Kconfig"
source "arch/arm/mach-mx3/Kconfig"
source "arch/arm/mach-mx25/Kconfig"
source "arch/arm/mach-mxc91231/Kconfig"
Expand Down

0 comments on commit d109167

Please sign in to comment.