ARM: i.MX: external NAND boot: pass boarddata
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
0895a9ad1c
commit
c5b7986089
|
@ -131,7 +131,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call imx25_barebox_boot_nand_external() */
|
/* setup a stack to be able to call imx25_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(STACK_BASE + STACK_SIZE - 12);
|
arm_setup_stack(STACK_BASE + STACK_SIZE - 12);
|
||||||
|
|
||||||
imx25_barebox_boot_nand_external();
|
imx25_barebox_boot_nand_external(0);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
imx25_barebox_entry(0);
|
imx25_barebox_entry(0);
|
||||||
|
|
|
@ -127,6 +127,7 @@ barebox_arm_reset_vector:
|
||||||
/* Setup a temporary stack in SDRAM */
|
/* Setup a temporary stack in SDRAM */
|
||||||
ldr sp, =MX27_IRAM_BASE_ADDR + MX27_IRAM_SIZE - 4;
|
ldr sp, =MX27_IRAM_BASE_ADDR + MX27_IRAM_SIZE - 4;
|
||||||
|
|
||||||
|
mov r0, #0
|
||||||
b imx27_barebox_boot_nand_external
|
b imx27_barebox_boot_nand_external
|
||||||
#endif /* CONFIG_NAND_IMX_BOOT */
|
#endif /* CONFIG_NAND_IMX_BOOT */
|
||||||
|
|
||||||
|
|
|
@ -140,7 +140,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call imx35_barebox_boot_nand_external() */
|
/* setup a stack to be able to call imx35_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 8);
|
arm_setup_stack(MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 8);
|
||||||
|
|
||||||
imx35_barebox_boot_nand_external();
|
imx35_barebox_boot_nand_external(0);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
imx35_barebox_entry(0);
|
imx35_barebox_entry(0);
|
||||||
|
|
|
@ -101,6 +101,7 @@ barebox_arm_reset_vector:
|
||||||
/* Setup a temporary stack in SRAM */
|
/* Setup a temporary stack in SRAM */
|
||||||
ldr sp, =MX25_IRAM_BASE_ADDR + MX25_IRAM_SIZE - 4
|
ldr sp, =MX25_IRAM_BASE_ADDR + MX25_IRAM_SIZE - 4
|
||||||
|
|
||||||
|
mov r0, #0
|
||||||
b imx25_barebox_boot_nand_external
|
b imx25_barebox_boot_nand_external
|
||||||
#endif /* CONFIG_NAND_IMX_BOOT */
|
#endif /* CONFIG_NAND_IMX_BOOT */
|
||||||
|
|
||||||
|
|
|
@ -158,6 +158,7 @@ barebox_arm_reset_vector:
|
||||||
/* Setup a temporary stack in internal SRAM */
|
/* Setup a temporary stack in internal SRAM */
|
||||||
ldr sp, =MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 4
|
ldr sp, =MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 4
|
||||||
|
|
||||||
|
mov r0, #0
|
||||||
b imx35_barebox_boot_nand_external
|
b imx35_barebox_boot_nand_external
|
||||||
#endif /* CONFIG_NAND_IMX_BOOT */
|
#endif /* CONFIG_NAND_IMX_BOOT */
|
||||||
|
|
||||||
|
|
|
@ -316,7 +316,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call imx35_barebox_boot_nand_external() */
|
/* setup a stack to be able to call imx35_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 8);
|
arm_setup_stack(MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 8);
|
||||||
|
|
||||||
imx35_barebox_boot_nand_external();
|
imx35_barebox_boot_nand_external(0);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
imx35_barebox_entry(0);
|
imx35_barebox_entry(0);
|
||||||
|
|
|
@ -90,7 +90,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call imx27_barebox_boot_nand_external() */
|
/* setup a stack to be able to call imx27_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(MX27_IRAM_BASE_ADDR + MX27_IRAM_SIZE - 8);
|
arm_setup_stack(MX27_IRAM_BASE_ADDR + MX27_IRAM_SIZE - 8);
|
||||||
|
|
||||||
imx27_barebox_boot_nand_external();
|
imx27_barebox_boot_nand_external(0);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
imx27_barebox_entry(0);
|
imx27_barebox_entry(0);
|
||||||
|
|
|
@ -161,7 +161,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call imx25_barebox_boot_nand_external() */
|
/* setup a stack to be able to call imx25_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(MX25_IRAM_BASE_ADDR + MX25_IRAM_SIZE - 8);
|
arm_setup_stack(MX25_IRAM_BASE_ADDR + MX25_IRAM_SIZE - 8);
|
||||||
|
|
||||||
imx25_barebox_boot_nand_external();
|
imx25_barebox_boot_nand_external(0);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
imx25_barebox_entry(0);
|
imx25_barebox_entry(0);
|
||||||
|
|
|
@ -129,7 +129,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call imx31_barebox_boot_nand_external() */
|
/* setup a stack to be able to call imx31_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(MX31_IRAM_BASE_ADDR + MX31_IRAM_SIZE - 12);
|
arm_setup_stack(MX31_IRAM_BASE_ADDR + MX31_IRAM_SIZE - 12);
|
||||||
|
|
||||||
imx31_barebox_boot_nand_external();
|
imx31_barebox_boot_nand_external(0);
|
||||||
#else
|
#else
|
||||||
imx31_barebox_entry(0);
|
imx31_barebox_entry(0);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -97,7 +97,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call mx27_barebox_boot_nand_external() */
|
/* setup a stack to be able to call mx27_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(MX27_IRAM_BASE_ADDR + MX27_IRAM_SIZE - 8);
|
arm_setup_stack(MX27_IRAM_BASE_ADDR + MX27_IRAM_SIZE - 8);
|
||||||
|
|
||||||
imx27_barebox_boot_nand_external();
|
imx27_barebox_boot_nand_external(0);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
imx27_barebox_entry(0);
|
imx27_barebox_entry(0);
|
||||||
|
|
|
@ -192,7 +192,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
/* setup a stack to be able to call imx35_barebox_boot_nand_external() */
|
/* setup a stack to be able to call imx35_barebox_boot_nand_external() */
|
||||||
arm_setup_stack(MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 8);
|
arm_setup_stack(MX35_IRAM_BASE_ADDR + MX35_IRAM_SIZE - 8);
|
||||||
|
|
||||||
imx35_barebox_boot_nand_external();
|
imx35_barebox_boot_nand_external(0);
|
||||||
#endif
|
#endif
|
||||||
out:
|
out:
|
||||||
imx35_barebox_entry(0);
|
imx35_barebox_entry(0);
|
||||||
|
|
|
@ -100,7 +100,7 @@ void __bare_init __naked barebox_arm_reset_vector(void)
|
||||||
sdram_init();
|
sdram_init();
|
||||||
|
|
||||||
#ifdef CONFIG_NAND_IMX_BOOT
|
#ifdef CONFIG_NAND_IMX_BOOT
|
||||||
imx27_barebox_boot_nand_external();
|
imx27_barebox_boot_nand_external(0);
|
||||||
#else
|
#else
|
||||||
imx27_barebox_entry(0);
|
imx27_barebox_entry(0);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -318,7 +318,8 @@ static inline int imx35_pagesize_2k(void)
|
||||||
|
|
||||||
#define DEFINE_EXTERNAL_NAND_ENTRY(soc) \
|
#define DEFINE_EXTERNAL_NAND_ENTRY(soc) \
|
||||||
\
|
\
|
||||||
void __noreturn BARE_INIT_FUNCTION(imx##soc##_boot_nand_external_cont)(void) \
|
void __noreturn BARE_INIT_FUNCTION(imx##soc##_boot_nand_external_cont) \
|
||||||
|
(uint32_t boarddata) \
|
||||||
{ \
|
{ \
|
||||||
unsigned long nfc_base = MX##soc##_NFC_BASE_ADDR; \
|
unsigned long nfc_base = MX##soc##_NFC_BASE_ADDR; \
|
||||||
unsigned long sdram = MX##soc##_CSD0_BASE_ADDR; \
|
unsigned long sdram = MX##soc##_CSD0_BASE_ADDR; \
|
||||||
|
@ -328,10 +329,11 @@ void __noreturn BARE_INIT_FUNCTION(imx##soc##_boot_nand_external_cont)(void)
|
||||||
(void *)nfc_base, \
|
(void *)nfc_base, \
|
||||||
imx##soc##_pagesize_2k()); \
|
imx##soc##_pagesize_2k()); \
|
||||||
\
|
\
|
||||||
imx##soc##_barebox_entry(0); \
|
imx##soc##_barebox_entry(boarddata); \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
void __noreturn BARE_INIT_FUNCTION(imx##soc##_barebox_boot_nand_external)(void) \
|
void __noreturn BARE_INIT_FUNCTION(imx##soc##_barebox_boot_nand_external) \
|
||||||
|
(uint32_t boarddata) \
|
||||||
{ \
|
{ \
|
||||||
unsigned long nfc_base = MX##soc##_NFC_BASE_ADDR; \
|
unsigned long nfc_base = MX##soc##_NFC_BASE_ADDR; \
|
||||||
unsigned long sdram = MX##soc##_CSD0_BASE_ADDR; \
|
unsigned long sdram = MX##soc##_CSD0_BASE_ADDR; \
|
||||||
|
@ -339,12 +341,12 @@ void __noreturn BARE_INIT_FUNCTION(imx##soc##_barebox_boot_nand_external)(void)
|
||||||
u32 r; \
|
u32 r; \
|
||||||
u32 *src, *trg; \
|
u32 *src, *trg; \
|
||||||
int i; \
|
int i; \
|
||||||
void __noreturn (*fn)(void); \
|
void __noreturn (*fn)(uint32_t); \
|
||||||
\
|
\
|
||||||
/* skip NAND boot if not running from NFC space */ \
|
/* skip NAND boot if not running from NFC space */ \
|
||||||
r = get_pc(); \
|
r = get_pc(); \
|
||||||
if (r < nfc_base || r > nfc_base + 0x800) \
|
if (r < nfc_base || r > nfc_base + 0x800) \
|
||||||
imx##soc##_barebox_entry(0); \
|
imx##soc##_barebox_entry(boarddata); \
|
||||||
\
|
\
|
||||||
src = (unsigned int *)nfc_base; \
|
src = (unsigned int *)nfc_base; \
|
||||||
trg = (unsigned int *)sdram; \
|
trg = (unsigned int *)sdram; \
|
||||||
|
@ -368,7 +370,7 @@ void __noreturn BARE_INIT_FUNCTION(imx##soc##_barebox_boot_nand_external)(void)
|
||||||
\
|
\
|
||||||
fn = (void *)__fn; \
|
fn = (void *)__fn; \
|
||||||
\
|
\
|
||||||
fn(); \
|
fn(boarddata); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BROKEN
|
#ifdef BROKEN
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
|
|
||||||
#include <linux/mtd/mtd.h>
|
#include <linux/mtd/mtd.h>
|
||||||
|
|
||||||
void imx21_barebox_boot_nand_external(void);
|
void imx21_barebox_boot_nand_external(uint32_t boarddata);
|
||||||
void imx25_barebox_boot_nand_external(void);
|
void imx25_barebox_boot_nand_external(uint32_t boarddata);
|
||||||
void imx27_barebox_boot_nand_external(void);
|
void imx27_barebox_boot_nand_external(uint32_t boarddata);
|
||||||
void imx31_barebox_boot_nand_external(void);
|
void imx31_barebox_boot_nand_external(uint32_t boarddata);
|
||||||
void imx35_barebox_boot_nand_external(void);
|
void imx35_barebox_boot_nand_external(uint32_t boarddata);
|
||||||
void imx_nand_set_layout(int writesize, int datawidth);
|
void imx_nand_set_layout(int writesize, int datawidth);
|
||||||
|
|
||||||
struct imx_nand_platform_data {
|
struct imx_nand_platform_data {
|
||||||
|
|
Loading…
Reference in New Issue