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 1725946447
commit 17cc5caa98
4 changed files with 14 additions and 7 deletions

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

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

View File

@ -3689,6 +3689,10 @@ Configurations
System Type -> Architecture Options
CONFIG_ARCH_ADDRENV=n : Disable address environment support
System Type -> Heap Configuration
CONFIG_SAMA5_DDRCS_RESERVE=n : Don't reserve any page cache memory
CONFIG_SAMA5_DDRCS_PGHEAP=n : Don't try to set up the page allocator
Memory Management
CONFIG_GRAN=n : Disable the granule allocator
CONFIG_MM_PGALLOC=n : Disable the page allocator

View File

@ -240,7 +240,10 @@ CONFIG_SAMA5_BOOT_SDRAM=y
#
CONFIG_SAMA5_ISRAM_HEAP=y
CONFIG_SAMA5_DDRCS_RESERVE=y
CONFIG_SAMA5_DDRCS_HEAP_END=0x2fa00000
CONFIG_SAMA5_DDRCS_HEAP_END=0x28000000
CONFIG_SAMA5_DDRCS_PGHEAP=y
CONFIG_SAMA5_DDRCS_PGHEAP_OFFSET=0x28000000
CONFIG_SAMA5_DDRCS_PGHEAP_SIZE=134217728
#
# Architecture Options