aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-08-05 09:05:29 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-08-14 00:36:28 +0200
commit0e9b7e757016c92eec0c4b51dbb49c1828f58eb6 (patch)
treedf4fe7fa0ad7a3e0e09f6ca2577ad5d45238684a
parente9e36abcfcd4b7080357b808ce4bb0ac213566fd (diff)
downloadu-boot-linaro-stable-0e9b7e757016c92eec0c4b51dbb49c1828f58eb6.tar.gz
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>
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/Makefile (renamed from arch/arm/cpu/arm926ejs/mx28/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/clock.c (renamed from arch/arm/cpu/arm926ejs/mx28/clock.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/iomux.c (renamed from arch/arm/cpu/arm926ejs/mx28/iomux.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/mx28.c (renamed from arch/arm/cpu/arm926ejs/mx28/mx28.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/mx28_init.h (renamed from arch/arm/cpu/arm926ejs/mx28/mx28_init.h)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/spl_boot.c (renamed from arch/arm/cpu/arm926ejs/mx28/spl_boot.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c (renamed from arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c (renamed from arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/spl_power_init.c (renamed from arch/arm/cpu/arm926ejs/mx28/spl_power_init.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/start.S (renamed from arch/arm/cpu/arm926ejs/mx28/start.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/timer.c (renamed from arch/arm/cpu/arm926ejs/mx28/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds (renamed from arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds)2
-rw-r--r--arch/arm/include/asm/arch-mxs/clock.h (renamed from arch/arm/include/asm/arch-mx28/clock.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/dma.h (renamed from arch/arm/include/asm/arch-mx28/dma.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/gpio.h (renamed from arch/arm/include/asm/arch-mx28/gpio.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/imx-regs.h (renamed from arch/arm/include/asm/arch-mx28/imx-regs.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/iomux-mx28.h (renamed from arch/arm/include/asm/arch-mx28/iomux-mx28.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/iomux.h (renamed from arch/arm/include/asm/arch-mx28/iomux.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-apbh.h (renamed from arch/arm/include/asm/arch-mx28/regs-apbh.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-base.h (renamed from arch/arm/include/asm/arch-mx28/regs-base.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-bch.h (renamed from arch/arm/include/asm/arch-mx28/regs-bch.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-clkctrl.h (renamed from arch/arm/include/asm/arch-mx28/regs-clkctrl.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-common.h (renamed from arch/arm/include/asm/arch-mx28/regs-common.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-digctl.h (renamed from arch/arm/include/asm/arch-mx28/regs-digctl.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-gpmi.h (renamed from arch/arm/include/asm/arch-mx28/regs-gpmi.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-i2c.h (renamed from arch/arm/include/asm/arch-mx28/regs-i2c.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-lcdif.h (renamed from arch/arm/include/asm/arch-mx28/regs-lcdif.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-lradc.h (renamed from arch/arm/include/asm/arch-mx28/regs-lradc.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-ocotp.h (renamed from arch/arm/include/asm/arch-mx28/regs-ocotp.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-pinctrl.h (renamed from arch/arm/include/asm/arch-mx28/regs-pinctrl.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-power.h (renamed from arch/arm/include/asm/arch-mx28/regs-power.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-rtc.h (renamed from arch/arm/include/asm/arch-mx28/regs-rtc.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-ssp.h (renamed from arch/arm/include/asm/arch-mx28/regs-ssp.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-timrot.h (renamed from arch/arm/include/asm/arch-mx28/regs-timrot.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-usb.h (renamed from arch/arm/include/asm/arch-mx28/regs-usb.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/regs-usbphy.h (renamed from arch/arm/include/asm/arch-mx28/regs-usbphy.h)0
-rw-r--r--arch/arm/include/asm/arch-mxs/sys_proto.h (renamed from arch/arm/include/asm/arch-mx28/sys_proto.h)0
-rw-r--r--boards.cfg6
-rw-r--r--doc/README.m284
-rw-r--r--doc/README.mx28evk4
-rw-r--r--include/configs/apx4devkit.h4
-rw-r--r--include/configs/m28evk.h4
-rw-r--r--include/configs/mx28evk.h4
43 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx28/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile
index 674a3af1b..674a3af1b 100644
--- a/arch/arm/cpu/arm926ejs/mx28/Makefile
+++ b/arch/arm/cpu/arm926ejs/mxs/Makefile
diff --git a/arch/arm/cpu/arm926ejs/mx28/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
index 0439f9c0e..0439f9c0e 100644
--- a/arch/arm/cpu/arm926ejs/mx28/clock.c
+++ b/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
index 12916b6d6..12916b6d6 100644
--- a/arch/arm/cpu/arm926ejs/mx28/iomux.c
+++ b/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
index cf7a50f9d..cf7a50f9d 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
+++ b/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
index e3a4493fb..e3a4493fb 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28_init.h
+++ b/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
index a6dfca3f5..a6dfca3f5 100644
--- a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
+++ b/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
index 88a603c11..88a603c11 100644
--- a/arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c
+++ b/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
index cca131688..cca131688 100644
--- a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
+++ b/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
index 4b09b0c3b..4b09b0c3b 100644
--- a/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c
+++ b/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
index e572b786b..e572b786b 100644
--- a/arch/arm/cpu/arm926ejs/mx28/start.S
+++ b/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
index 5b73f4a2b..5b73f4a2b 100644
--- a/arch/arm/cpu/arm926ejs/mx28/timer.c
+++ b/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
index 0fccd5296..f8ea38c03 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
index 1700fe391..1700fe391 100644
--- a/arch/arm/include/asm/arch-mx28/clock.h
+++ b/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
index 4a1820bde..4a1820bde 100644
--- a/arch/arm/include/asm/arch-mx28/dma.h
+++ b/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
index be1c944eb..be1c944eb 100644
--- a/arch/arm/include/asm/arch-mx28/gpio.h
+++ b/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
index 37d0a9376..37d0a9376 100644
--- a/arch/arm/include/asm/arch-mx28/imx-regs.h
+++ b/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
index b42820de7..b42820de7 100644
--- a/arch/arm/include/asm/arch-mx28/iomux-mx28.h
+++ b/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
index 7abdf58b8..7abdf58b8 100644
--- a/arch/arm/include/asm/arch-mx28/iomux.h
+++ b/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
index 91d7bc840..91d7bc840 100644
--- a/arch/arm/include/asm/arch-mx28/regs-apbh.h
+++ b/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
index dbdcc2b5b..dbdcc2b5b 100644
--- a/arch/arm/include/asm/arch-mx28/regs-base.h
+++ b/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
index 9243bdd1c..9243bdd1c 100644
--- a/arch/arm/include/asm/arch-mx28/regs-bch.h
+++ b/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
index 3c4947df2..3c4947df2 100644
--- a/arch/arm/include/asm/arch-mx28/regs-clkctrl.h
+++ b/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
index d2e19538a..d2e19538a 100644
--- a/arch/arm/include/asm/arch-mx28/regs-common.h
+++ b/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
index 247da6ef9..247da6ef9 100644
--- a/arch/arm/include/asm/arch-mx28/regs-digctl.h
+++ b/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
index 1b487f46c..1b487f46c 100644
--- a/arch/arm/include/asm/arch-mx28/regs-gpmi.h
+++ b/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
index 2e2e81453..2e2e81453 100644
--- a/arch/arm/include/asm/arch-mx28/regs-i2c.h
+++ b/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
index cb47e41fd..cb47e41fd 100644
--- a/arch/arm/include/asm/arch-mx28/regs-lcdif.h
+++ b/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
index 16e2bbf4c..16e2bbf4c 100644
--- a/arch/arm/include/asm/arch-mx28/regs-lradc.h
+++ b/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
index 273803551..273803551 100644
--- a/arch/arm/include/asm/arch-mx28/regs-ocotp.h
+++ b/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
index 80dcdf661..80dcdf661 100644
--- a/arch/arm/include/asm/arch-mx28/regs-pinctrl.h
+++ b/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
index 8eadc6d55..8eadc6d55 100644
--- a/arch/arm/include/asm/arch-mx28/regs-power.h
+++ b/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
index e605a0395..e605a0395 100644
--- a/arch/arm/include/asm/arch-mx28/regs-rtc.h
+++ b/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
index be71d4894..be71d4894 100644
--- a/arch/arm/include/asm/arch-mx28/regs-ssp.h
+++ b/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
index 3e8dfe782..3e8dfe782 100644
--- a/arch/arm/include/asm/arch-mx28/regs-timrot.h
+++ b/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
index ea61de80d..ea61de80d 100644
--- a/arch/arm/include/asm/arch-mx28/regs-usb.h
+++ b/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
index 0291d815c..0291d815c 100644
--- a/arch/arm/include/asm/arch-mx28/regs-usbphy.h
+++ b/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
index e701c6409..e701c6409 100644
--- a/arch/arm/include/asm/arch-mx28/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
diff --git a/boards.cfg b/boards.cfg
index 9ab408128..2fc3d4524 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -174,9 +174,9 @@ tx25 arm arm926ejs tx25 karo
zmx25 arm arm926ejs zmx25 syteco mx25
imx27lite 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_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 7dee8cee9..2a92226fe 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 571dfdab8..2fc50696f 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/apx4devkit.h b/include/configs/apx4devkit.h
index 9e7ead550..59b451b0e 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -42,8 +42,8 @@
/* SPL */
#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/m28evk.h b/include/configs/m28evk.h
index f12d927e0..641c5025c 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 5f145d1a7..4e70617dc 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -39,8 +39,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