[U-Boot] [RFC PATCH 1/5] mxs: reorganize source directory for easy sharing of code in i.MXS SoCs
Otavio Salvador
otavio at ossystems.com.br
Sun Jul 29 00:50:40 CEST 2012
Most code can be shared between i.MX23 and i.MX28 as both are from
i.MXS family; this source directory structure makes easy to share code
among them.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c | 0
arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds | 2 +-
arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lcdif.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lradc.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ocotp.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-power.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-timrot.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usb.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usbphy.h | 0
arch/arm/include/asm/{arch-mx28 => arch-mxs}/sys_proto.h | 0
boards.cfg | 4 ++--
doc/README.m28 | 4 ++--
doc/README.mx28evk | 4 ++--
include/configs/m28evk.h | 4 ++--
include/configs/mx28evk.h | 4 ++--
42 files changed, 11 insertions(+), 11 deletions(-)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c (100%)
rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds (97%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lcdif.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lradc.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ocotp.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-power.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-timrot.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usb.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usbphy.h (100%)
rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/sys_proto.h (100%)
diff --git a/arch/arm/cpu/arm926ejs/mx28/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/Makefile
rename to arch/arm/cpu/arm926ejs/mxs/Makefile
diff --git a/arch/arm/cpu/arm926ejs/mx28/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/clock.c
rename to arch/arm/cpu/arm926ejs/mxs/clock.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/iomux.c
rename to arch/arm/cpu/arm926ejs/mxs/iomux.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mxs/mx28.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/mx28.c
rename to arch/arm/cpu/arm926ejs/mxs/mx28.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28_init.h b/arch/arm/cpu/arm926ejs/mxs/mx28_init.h
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/mx28_init.h
rename to arch/arm/cpu/arm926ejs/mxs/mx28_init.h
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_boot.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_boot.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_power_init.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/start.S b/arch/arm/cpu/arm926ejs/mxs/start.S
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/start.S
rename to arch/arm/cpu/arm926ejs/mxs/start.S
diff --git a/arch/arm/cpu/arm926ejs/mx28/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/timer.c
rename to arch/arm/cpu/arm926ejs/mxs/timer.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
similarity index 97%
rename from arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds
rename to arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
index 0fccd52..f8ea38c 100644
--- a/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
@@ -37,7 +37,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- arch/arm/cpu/arm926ejs/mx28/start.o (.text)
+ arch/arm/cpu/arm926ejs/mxs/start.o (.text)
*(.text)
}
diff --git a/arch/arm/include/asm/arch-mx28/clock.h b/arch/arm/include/asm/arch-mxs/clock.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/clock.h
rename to arch/arm/include/asm/arch-mxs/clock.h
diff --git a/arch/arm/include/asm/arch-mx28/dma.h b/arch/arm/include/asm/arch-mxs/dma.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/dma.h
rename to arch/arm/include/asm/arch-mxs/dma.h
diff --git a/arch/arm/include/asm/arch-mx28/gpio.h b/arch/arm/include/asm/arch-mxs/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/gpio.h
rename to arch/arm/include/asm/arch-mxs/gpio.h
diff --git a/arch/arm/include/asm/arch-mx28/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/imx-regs.h
rename to arch/arm/include/asm/arch-mxs/imx-regs.h
diff --git a/arch/arm/include/asm/arch-mx28/iomux-mx28.h b/arch/arm/include/asm/arch-mxs/iomux-mx28.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/iomux-mx28.h
rename to arch/arm/include/asm/arch-mxs/iomux-mx28.h
diff --git a/arch/arm/include/asm/arch-mx28/iomux.h b/arch/arm/include/asm/arch-mxs/iomux.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/iomux.h
rename to arch/arm/include/asm/arch-mxs/iomux.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-apbh.h b/arch/arm/include/asm/arch-mxs/regs-apbh.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-apbh.h
rename to arch/arm/include/asm/arch-mxs/regs-apbh.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-base.h b/arch/arm/include/asm/arch-mxs/regs-base.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-base.h
rename to arch/arm/include/asm/arch-mxs/regs-base.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-bch.h b/arch/arm/include/asm/arch-mxs/regs-bch.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-bch.h
rename to arch/arm/include/asm/arch-mxs/regs-bch.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-clkctrl.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-clkctrl.h
rename to arch/arm/include/asm/arch-mxs/regs-clkctrl.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-common.h b/arch/arm/include/asm/arch-mxs/regs-common.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-common.h
rename to arch/arm/include/asm/arch-mxs/regs-common.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-digctl.h b/arch/arm/include/asm/arch-mxs/regs-digctl.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-digctl.h
rename to arch/arm/include/asm/arch-mxs/regs-digctl.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-gpmi.h b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-gpmi.h
rename to arch/arm/include/asm/arch-mxs/regs-gpmi.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-i2c.h b/arch/arm/include/asm/arch-mxs/regs-i2c.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-i2c.h
rename to arch/arm/include/asm/arch-mxs/regs-i2c.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-lcdif.h b/arch/arm/include/asm/arch-mxs/regs-lcdif.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-lcdif.h
rename to arch/arm/include/asm/arch-mxs/regs-lcdif.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-lradc.h b/arch/arm/include/asm/arch-mxs/regs-lradc.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-lradc.h
rename to arch/arm/include/asm/arch-mxs/regs-lradc.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-ocotp.h b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-ocotp.h
rename to arch/arm/include/asm/arch-mxs/regs-ocotp.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-pinctrl.h
rename to arch/arm/include/asm/arch-mxs/regs-pinctrl.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-power.h b/arch/arm/include/asm/arch-mxs/regs-power.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-power.h
rename to arch/arm/include/asm/arch-mxs/regs-power.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-rtc.h b/arch/arm/include/asm/arch-mxs/regs-rtc.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-rtc.h
rename to arch/arm/include/asm/arch-mxs/regs-rtc.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-ssp.h b/arch/arm/include/asm/arch-mxs/regs-ssp.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-ssp.h
rename to arch/arm/include/asm/arch-mxs/regs-ssp.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-timrot.h b/arch/arm/include/asm/arch-mxs/regs-timrot.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-timrot.h
rename to arch/arm/include/asm/arch-mxs/regs-timrot.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-usb.h b/arch/arm/include/asm/arch-mxs/regs-usb.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-usb.h
rename to arch/arm/include/asm/arch-mxs/regs-usb.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-usbphy.h b/arch/arm/include/asm/arch-mxs/regs-usbphy.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-usbphy.h
rename to arch/arm/include/asm/arch-mxs/regs-usbphy.h
diff --git a/arch/arm/include/asm/arch-mx28/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/sys_proto.h
rename to arch/arm/include/asm/arch-mxs/sys_proto.h
diff --git a/boards.cfg b/boards.cfg
index 2d36d83..3d5dab0 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -170,8 +170,8 @@ tx25 arm arm926ejs tx25 karo
zmx25 arm arm926ejs zmx25 syteco mx25
imx27lite arm arm926ejs imx27lite logicpd mx27
magnesium arm arm926ejs imx27lite logicpd mx27
-m28evk arm arm926ejs - denx mx28
-mx28evk arm arm926ejs - freescale mx28
+m28evk arm arm926ejs m28evk denx mxs m28evk
+mx28evk arm arm926ejs mx28evk freescale mxs mx28evk
nhk8815 arm arm926ejs nhk8815 st nomadik
nhk8815_onenand arm arm926ejs nhk8815 st nomadik nhk8815:BOOT_ONENAND
omap5912osk arm arm926ejs - ti omap
diff --git a/doc/README.m28 b/doc/README.m28
index 7dee8ce..2a92226 100644
--- a/doc/README.m28
+++ b/doc/README.m28
@@ -4,8 +4,8 @@ DENX M28EVK
Files of the M28/M28EVK port
----------------------------
-arch/arm/cpu/arm926ejs/mx28/ - The CPU support code for the Freescale i.MX28
-arch/arm/include/asm/arch-mx28/ - Header files for the Freescale i.MX28
+arch/arm/cpu/arm926ejs/mxs/ - The CPU support code for the Freescale i.MX28
+arch/arm/include/asm/arch-mxs/ - Header files for the Freescale i.MX28
board/denx/m28evk/ - M28EVK board specific files
include/configs/m28evk.h - M28EVK configuration file
diff --git a/doc/README.mx28evk b/doc/README.mx28evk
index 571dfda..2fc5069 100644
--- a/doc/README.mx28evk
+++ b/doc/README.mx28evk
@@ -6,8 +6,8 @@ Supported hardware: only MX28EVK rev D is supported in U-boot.
Files of the MX28EVK port
--------------------------
-arch/arm/cpu/arm926ejs/mx28/ - The CPU support code for the Freescale i.MX28
-arch/arm/include/asm/arch-mx28/ - Header files for the Freescale i.MX28
+arch/arm/cpu/arm926ejs/mxs/ - The CPU support code for the Freescale i.MX28
+arch/arm/include/asm/arch-mxs/ - Header files for the Freescale i.MX28
board/freescale/mx28evk/ - MX28EVK board specific files
include/configs/mx28evk.h - MX28EVK configuration file
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index f12d927..641c502 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -47,8 +47,8 @@
*/
#define CONFIG_SPL
#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
+#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_GPIO_SUPPORT
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 54d21e6..d05c07e 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -41,8 +41,8 @@
*/
#define CONFIG_SPL
#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
+#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_GPIO_SUPPORT
--
1.7.10.4
More information about the U-Boot
mailing list