diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-03-30 08:29:21 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-03-30 08:29:21 -0600 |
| commit | af418b4d616f1b31e465913894a908bc0302c2da (patch) | |
| tree | 51ae20c320f1b4a579315d4e5070874c0deeac3f | |
| parent | caef40213176749709be5408951feddeb8d44cbd (diff) | |
| download | nuttx-af418b4d616f1b31e465913894a908bc0302c2da.tar.gz nuttx-af418b4d616f1b31e465913894a908bc0302c2da.tar.bz2 nuttx-af418b4d616f1b31e465913894a908bc0302c2da.zip | |
Fix some backward conditional compilation
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_boot.c | 8 | ||||
| -rw-r--r-- | nuttx/configs/sama5d3x-ek/README.txt | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index b96246d19..635462d39 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7082,4 +7082,6 @@ * arch/arm/src/sama5/sam_hsmci_clkciv.c: Remove HSCMI-related functions that did not belong in sam_pmc.c and give them their own file (2014-3-30). + * arch/arm/src/sama5/sam_boot.c: Fix some backward conditional + compilation (2014-3-30). diff --git a/nuttx/arch/arm/src/sama5/sam_boot.c b/nuttx/arch/arm/src/sama5/sam_boot.c index 7ae187b14..fa5b71fe6 100644 --- a/nuttx/arch/arm/src/sama5/sam_boot.c +++ b/nuttx/arch/arm/src/sama5/sam_boot.c @@ -209,12 +209,16 @@ static const struct section_mapping_s section_mapping[] = #ifdef CONFIG_SAMA5_DDRCS #ifdef CONFIG_SAMA5_BOOT_SDRAM + /* Running out of SDRAM */ + { SAM_DDRCS_PSECTION, SAM_DDRCS_VSECTION, - MMU_STRONGLY_ORDERED, SAM_DDRCS_NSECTIONS + SAM_DDRCS_MMUFLAGS, SAM_DDRCS_NSECTIONS }, #else + /* Running out of ISRAM or NOR FLASH */ + { SAM_DDRCS_PSECTION, SAM_DDRCS_VSECTION, - SAM_DDRCS_MMUFLAGS, SAM_DDRCS_NSECTIONS + MMU_STRONGLY_ORDERED, SAM_DDRCS_NSECTIONS }, #endif #endif diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt index 48c8643a8..a48d2e87b 100644 --- a/nuttx/configs/sama5d3x-ek/README.txt +++ b/nuttx/configs/sama5d3x-ek/README.txt @@ -2752,6 +2752,9 @@ Configurations STATUS: See the To-Do list below + 2014-3-30: I some casual retesting, I am seeing some slow boot- + up times and possible microSD card issues. I will + need to revisit this. hello: This configuration directory, performs the (almost) simplest of all |