ARM: mxs: support full SPL framework

[u-boot] / arch / arm / cpu / arm926ejs / mxs / spl_boot.c

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index d9d1d73d1af4fe25d78442f9be62b96aecf43401..bc39465fc4e02d736ef9d3c4456216cbb9754da0 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -120,8 +120,7 @@ void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
                         const iomux_cfg_t *iomux_setup,
                         const unsigned int iomux_size)
 {
-       struct mxs_spl_data *data = (struct mxs_spl_data *)
-               ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
+       struct mxs_spl_data *data = MXS_SPL_DATA;
        uint8_t bootmode = mxs_get_bootmode_index();
        gd = &gdata;
 
@@ -147,6 +146,7 @@ void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
        }
 }
 
+#ifndef CONFIG_SPL_FRAMEWORK
 /* Support aparatus */
 inline void board_init_f(unsigned long bootflag)
 {
@@ -159,3 +159,4 @@ inline void board_init_r(gd_t *id, ulong dest_addr)
        for (;;)
                ;
 }
+#endif