SAMA5: More variables-in-SDRAM stuff

This commit is contained in:
Gregory Nutt 2014-01-28 15:05:19 -06:00
parent c930554c2c
commit 51e64910a0

View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/sama5/sam_boot.c * arch/arm/src/sama5/sam_boot.c
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -627,9 +627,9 @@ void up_boot(void)
sam_clockconfig(); sam_clockconfig();
#ifdef CONFIG_ARCH_FPU
/* Initialize the FPU */ /* Initialize the FPU */
#ifdef CONFIG_ARCH_FPU
arm_fpuconfig(); arm_fpuconfig();
#endif #endif
@ -645,20 +645,20 @@ void up_boot(void)
sam_boardinitialize(); sam_boardinitialize();
#ifdef NEED_SDRAM_REMAPPING
/* SDRAM was configured in a temporary state to support low-level /* SDRAM was configured in a temporary state to support low-level
* initialization. Now that the SDRAM has been fully initialized, * initialization. Now that the SDRAM has been fully initialized,
* we can reconfigure the SDRAM in its final, fully cache-able state. * we can reconfigure the SDRAM in its final, fully cache-able state.
*/ */
#ifdef NEED_SDRAM_REMAPPING
sam_remap(); sam_remap();
#endif #endif
#ifdef CONFIG_BOOT_SDRAM_DATA
/* If .data and .bss reside in SDRAM, then initialize the data sections /* If .data and .bss reside in SDRAM, then initialize the data sections
* now after SDRAM has been initialized. * now after SDRAM has been initialized.
*/ */
#ifdef CONFIG_BOOT_SDRAM_DATA
arm_data_initialize(); arm_data_initialize();
#endif #endif
@ -666,21 +666,21 @@ void up_boot(void)
sam_lowsetup(); sam_lowsetup();
#ifdef USE_EARLYSERIALINIT
/* Perform early serial initialization if we are going to use the serial /* Perform early serial initialization if we are going to use the serial
* driver. * driver.
*/ */
#ifdef USE_EARLYSERIALINIT
sam_earlyserialinit(); sam_earlyserialinit();
#endif #endif
#ifdef CONFIG_NUTTX_KERNEL
/* For the case of the separate user-/kernel-space build, perform whatever /* For the case of the separate user-/kernel-space build, perform whatever
* platform specific initialization of the user memory is required. * platform specific initialization of the user memory is required.
* Normally this just means initializing the user space .data and .bss * Normally this just means initializing the user space .data and .bss
* segments. * segments.
*/ */
#ifdef CONFIG_NUTTX_KERNEL
sam_userspace(); sam_userspace();
#endif #endif
} }