diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-01-29 08:16:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-01-29 08:16:02 -0600 |
| commit | 626d10555f61a24f5d3bf7e84dcf70579cb7ce53 (patch) | |
| tree | 7977610675995c019fd2ddc4dee1e6818e6f02d0 | |
| parent | d3fcd81667817551f2fdfc1a8903ece01b1b336a (diff) | |
| download | nuttx-626d10555f61a24f5d3bf7e84dcf70579cb7ce53.tar.gz nuttx-626d10555f61a24f5d3bf7e84dcf70579cb7ce53.tar.bz2 nuttx-626d10555f61a24f5d3bf7e84dcf70579cb7ce53.zip | |
A10: Make sure it is tolerant of CONFIG_BOOT_SDRAM_DATA
| -rw-r--r-- | nuttx/arch/arm/src/a1x/a1x_boot.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/a1x/a1x_boot.c b/nuttx/arch/arm/src/a1x/a1x_boot.c index 3cc632331..392b4744d 100644 --- a/nuttx/arch/arm/src/a1x/a1x_boot.c +++ b/nuttx/arch/arm/src/a1x/a1x_boot.c @@ -328,31 +328,41 @@ void up_boot(void) a1x_copyvectorblock(); +#ifdef CONFIG_ARCH_FPU /* Initialize the FPU */ -#ifdef CONFIG_ARCH_FPU arm_fpuconfig(); #endif +#ifdef CONFIG_BOOT_SDRAM_DATA + /* This setting is inappropriate for the A1x because the code is *always* + * executing from SDRAM. If CONFIG_BOOT_SDRAM_DATA happens to be set, + * let's try to do the right thing and initialize the .data and .bss + * sections. + */ + + arm_data_initialize(); +#endif + /* Perform common, low-level chip initialization (might do nothing) */ a1x_lowsetup(); +#ifdef USE_EARLYSERIALINIT /* Perform early serial initialization if we are going to use the serial * driver. */ -#ifdef USE_EARLYSERIALINIT up_earlyserialinit(); #endif +#ifdef CONFIG_NUTTX_KERNEL /* For the case of the separate user-/kernel-space build, perform whatever * platform specific initialization of the user memory is required. * Normally this just means initializing the user space .data and .bss * segments. */ -#ifdef CONFIG_NUTTX_KERNEL a1x_userspace(); #endif |