浏览代码

mxs: reorganize source directory for easy sharing of code in i.MXS SoCs

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@ossystems.com.br>
Acked-by: Stefano Babic <sbabic@denx.de>
Otavio Salvador 12 年之前
父节点
当前提交
3a0398d7b9
共有 43 个文件被更改,包括 14 次插入14 次删除
  1. 0 0
      arch/arm/cpu/arm926ejs/mxs/Makefile
  2. 0 0
      arch/arm/cpu/arm926ejs/mxs/clock.c
  3. 0 0
      arch/arm/cpu/arm926ejs/mxs/iomux.c
  4. 0 0
      arch/arm/cpu/arm926ejs/mxs/mx28.c
  5. 0 0
      arch/arm/cpu/arm926ejs/mxs/mx28_init.h
  6. 0 0
      arch/arm/cpu/arm926ejs/mxs/spl_boot.c
  7. 0 0
      arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
  8. 0 0
      arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
  9. 0 0
      arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
  10. 0 0
      arch/arm/cpu/arm926ejs/mxs/start.S
  11. 0 0
      arch/arm/cpu/arm926ejs/mxs/timer.c
  12. 1 1
      arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
  13. 0 0
      arch/arm/include/asm/arch-mxs/clock.h
  14. 0 0
      arch/arm/include/asm/arch-mxs/dma.h
  15. 0 0
      arch/arm/include/asm/arch-mxs/gpio.h
  16. 0 0
      arch/arm/include/asm/arch-mxs/imx-regs.h
  17. 0 0
      arch/arm/include/asm/arch-mxs/iomux-mx28.h
  18. 0 0
      arch/arm/include/asm/arch-mxs/iomux.h
  19. 0 0
      arch/arm/include/asm/arch-mxs/regs-apbh.h
  20. 0 0
      arch/arm/include/asm/arch-mxs/regs-base.h
  21. 0 0
      arch/arm/include/asm/arch-mxs/regs-bch.h
  22. 0 0
      arch/arm/include/asm/arch-mxs/regs-clkctrl.h
  23. 0 0
      arch/arm/include/asm/arch-mxs/regs-common.h
  24. 0 0
      arch/arm/include/asm/arch-mxs/regs-digctl.h
  25. 0 0
      arch/arm/include/asm/arch-mxs/regs-gpmi.h
  26. 0 0
      arch/arm/include/asm/arch-mxs/regs-i2c.h
  27. 0 0
      arch/arm/include/asm/arch-mxs/regs-lcdif.h
  28. 0 0
      arch/arm/include/asm/arch-mxs/regs-lradc.h
  29. 0 0
      arch/arm/include/asm/arch-mxs/regs-ocotp.h
  30. 0 0
      arch/arm/include/asm/arch-mxs/regs-pinctrl.h
  31. 0 0
      arch/arm/include/asm/arch-mxs/regs-power.h
  32. 0 0
      arch/arm/include/asm/arch-mxs/regs-rtc.h
  33. 0 0
      arch/arm/include/asm/arch-mxs/regs-ssp.h
  34. 0 0
      arch/arm/include/asm/arch-mxs/regs-timrot.h
  35. 0 0
      arch/arm/include/asm/arch-mxs/regs-usb.h
  36. 0 0
      arch/arm/include/asm/arch-mxs/regs-usbphy.h
  37. 0 0
      arch/arm/include/asm/arch-mxs/sys_proto.h
  38. 3 3
      boards.cfg
  39. 2 2
      doc/README.m28
  40. 2 2
      doc/README.mx28evk
  41. 2 2
      include/configs/apx4devkit.h
  42. 2 2
      include/configs/m28evk.h
  43. 2 2
      include/configs/mx28evk.h

+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/Makefile → arch/arm/cpu/arm926ejs/mxs/Makefile


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/clock.c → arch/arm/cpu/arm926ejs/mxs/clock.c


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/iomux.c → arch/arm/cpu/arm926ejs/mxs/iomux.c


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/mx28.c → arch/arm/cpu/arm926ejs/mxs/mx28.c


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/mx28_init.h → arch/arm/cpu/arm926ejs/mxs/mx28_init.h


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/spl_boot.c → arch/arm/cpu/arm926ejs/mxs/spl_boot.c


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c → arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c → arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/spl_power_init.c → arch/arm/cpu/arm926ejs/mxs/spl_power_init.c


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/start.S → arch/arm/cpu/arm926ejs/mxs/start.S


+ 0 - 0
arch/arm/cpu/arm926ejs/mx28/timer.c → arch/arm/cpu/arm926ejs/mxs/timer.c


+ 1 - 1
arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds → arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds

@@ -37,7 +37,7 @@ SECTIONS
 	. = ALIGN(4);
 	. = ALIGN(4);
 	.text	:
 	.text	:
 	{
 	{
-		arch/arm/cpu/arm926ejs/mx28/start.o	(.text)
+		arch/arm/cpu/arm926ejs/mxs/start.o	(.text)
 		*(.text)
 		*(.text)
 	}
 	}
 
 

+ 0 - 0
arch/arm/include/asm/arch-mx28/clock.h → arch/arm/include/asm/arch-mxs/clock.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/dma.h → arch/arm/include/asm/arch-mxs/dma.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/gpio.h → arch/arm/include/asm/arch-mxs/gpio.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/imx-regs.h → arch/arm/include/asm/arch-mxs/imx-regs.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/iomux-mx28.h → arch/arm/include/asm/arch-mxs/iomux-mx28.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/iomux.h → arch/arm/include/asm/arch-mxs/iomux.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-apbh.h → arch/arm/include/asm/arch-mxs/regs-apbh.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-base.h → arch/arm/include/asm/arch-mxs/regs-base.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-bch.h → arch/arm/include/asm/arch-mxs/regs-bch.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-clkctrl.h → arch/arm/include/asm/arch-mxs/regs-clkctrl.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-common.h → arch/arm/include/asm/arch-mxs/regs-common.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-digctl.h → arch/arm/include/asm/arch-mxs/regs-digctl.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-gpmi.h → arch/arm/include/asm/arch-mxs/regs-gpmi.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-i2c.h → arch/arm/include/asm/arch-mxs/regs-i2c.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-lcdif.h → arch/arm/include/asm/arch-mxs/regs-lcdif.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-lradc.h → arch/arm/include/asm/arch-mxs/regs-lradc.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-ocotp.h → arch/arm/include/asm/arch-mxs/regs-ocotp.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-pinctrl.h → arch/arm/include/asm/arch-mxs/regs-pinctrl.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-power.h → arch/arm/include/asm/arch-mxs/regs-power.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-rtc.h → arch/arm/include/asm/arch-mxs/regs-rtc.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-ssp.h → arch/arm/include/asm/arch-mxs/regs-ssp.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-timrot.h → arch/arm/include/asm/arch-mxs/regs-timrot.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-usb.h → arch/arm/include/asm/arch-mxs/regs-usb.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/regs-usbphy.h → arch/arm/include/asm/arch-mxs/regs-usbphy.h


+ 0 - 0
arch/arm/include/asm/arch-mx28/sys_proto.h → arch/arm/include/asm/arch-mxs/sys_proto.h


+ 3 - 3
boards.cfg

@@ -179,9 +179,9 @@ tx25                         arm         arm926ejs   tx25                karo
 zmx25                        arm         arm926ejs   zmx25               syteco         mx25
 zmx25                        arm         arm926ejs   zmx25               syteco         mx25
 imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
 imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
-apx4devkit                   arm         arm926ejs   -                   bluegiga       mx28
-m28evk                       arm         arm926ejs   -                   denx           mx28
-mx28evk                      arm         arm926ejs   -                   freescale      mx28
+apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs		apx4devkit
+m28evk                       arm         arm926ejs   m28evk              denx           mxs		m28evk
+mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs		mx28evk
 nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
 nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
 nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
 nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 omap5912osk                  arm         arm926ejs   -                   ti             omap

+ 2 - 2
doc/README.m28

@@ -4,8 +4,8 @@ DENX M28EVK
 Files of the M28/M28EVK port
 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
 board/denx/m28evk/		- M28EVK board specific files
 include/configs/m28evk.h	- M28EVK configuration file
 include/configs/m28evk.h	- M28EVK configuration file
 
 

+ 2 - 2
doc/README.mx28evk

@@ -6,8 +6,8 @@ Supported hardware: only MX28EVK rev D is supported in U-boot.
 Files of the MX28EVK port
 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
 board/freescale/mx28evk/	- MX28EVK board specific files
 include/configs/mx28evk.h	- MX28EVK configuration file
 include/configs/mx28evk.h	- MX28EVK configuration file
 
 

+ 2 - 2
include/configs/apx4devkit.h

@@ -42,8 +42,8 @@
 /* SPL */
 /* SPL */
 #define CONFIG_SPL
 #define CONFIG_SPL
 #define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 #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_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT

+ 2 - 2
include/configs/m28evk.h

@@ -47,8 +47,8 @@
  */
  */
 #define	CONFIG_SPL
 #define	CONFIG_SPL
 #define	CONFIG_SPL_NO_CPU_SUPPORT_CODE
 #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_LIBCOMMON_SUPPORT
 #define	CONFIG_SPL_LIBGENERIC_SUPPORT
 #define	CONFIG_SPL_LIBGENERIC_SUPPORT
 #define	CONFIG_SPL_GPIO_SUPPORT
 #define	CONFIG_SPL_GPIO_SUPPORT

+ 2 - 2
include/configs/mx28evk.h

@@ -39,8 +39,8 @@
  */
  */
 #define CONFIG_SPL
 #define CONFIG_SPL
 #define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 #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_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT