SAMA5 ELF configuration with address environments finally builds without errors

This commit is contained in:
Gregory Nutt
2014-08-25 13:59:02 -06:00
parent 699a54a022
commit 9857f09baf
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -4553,15 +4553,15 @@ endif # SAMA5_DDRCS_RESERVE
config SAMA5_DDRCS_PGHEAP
bool "Include DDR-SDRAM in page cache"
default y
depends on SAMA5_DDRCS && ARCH_ADDRENV
depends on (SAMA5_DDRCS || SAMA5_BOOT_SDRAM) && ARCH_ADDRENV
---help---
Include a portion of DDR-SDRAM memory in the page cache.
if SAMA5_DDRCS_PGHEAP
config SAMA5_DDRCS_PGHEAP_OFFSET
int "DDR-SDRAM heap offset"
default 0
hex "DDR-SDRAM heap offset"
default 0x0
---help---
Preserve this number of bytes at the beginning of SDRAM. The
portion of DRAM beginning at this offset from the DDRCS base will
+3 -3
View File
@@ -57,11 +57,11 @@
* handle any other possibility.
*/
#ifdef CONFIG_SAMA5_DDRCS_PGHEAP
#ifndef CONFIG_SAMA5_DDRCS_PGHEAP
# error CONFIG_SAMA5_DDRCS_PGHEAP must be selected
#endif
#ifdef CONFIG_SAMA5_DDRCS_PGHEAP_OFFSET
#ifndef CONFIG_SAMA5_DDRCS_PGHEAP_OFFSET
# error CONFIG_SAMA5_DDRCS_PGHEAP_OFFSET must be specified
#endif
@@ -69,7 +69,7 @@
# warning CONFIG_SAMA5_DDRCS_PGHEAP_OFFSET is not aligned to a page boundary
#endif
#ifdef CONFIG_SAMA5_DDRCS_PGHEAP_SIZE
#ifndef CONFIG_SAMA5_DDRCS_PGHEAP_SIZE
# error CONFIG_SAMA5_DDRCS_PGHEAP_SIZE must be specified
#endif