diff options
| author | Tom Rini <[email protected]> | 2020-05-01 16:43:15 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-01 16:43:15 -0400 |
| commit | c693f212c5b0433b3a49a89d87cbff28bf78eb87 (patch) | |
| tree | fba202b549b53e536feb5d7b60e6313074d93a55 /arch/arm/include | |
| parent | b641dd3ec8dc3f6b18d2fa945ac3ab597063d191 (diff) | |
| parent | 14b7004532a41cbb2dc82cc1a5687e8e88e1ba0d (diff) | |
Merge branch '2020-05-01-master-imports'
- Assorted bug fixes
- Framework for enabling D-CACHE in SPL on ARM
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/iproc-common/configs.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/system.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/include/asm/iproc-common/configs.h b/arch/arm/include/asm/iproc-common/configs.h index 96c4f54f4a4..4733c0793c3 100644 --- a/arch/arm/include/asm/iproc-common/configs.h +++ b/arch/arm/include/asm/iproc-common/configs.h @@ -10,7 +10,6 @@ /* Architecture, CPU, chip, etc */ #define CONFIG_IPROC -#define CONFIG_SYS_ARM_CACHE_WRITETHROUGH /* Memory Info */ #define CONFIG_SYS_SDRAM_BASE 0x61000000 diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 81ccead1127..a3147fde146 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -485,6 +485,14 @@ enum dcache_option { }; #endif +#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH) +#define DCACHE_DEFAULT_OPTION DCACHE_WRITETHROUGH +#elif defined(CONFIG_SYS_ARM_CACHE_WRITEALLOC) +#define DCACHE_DEFAULT_OPTION DCACHE_WRITEALLOC +#elif defined(CONFIG_SYS_ARM_CACHE_WRITEBACK) +#define DCACHE_DEFAULT_OPTION DCACHE_WRITEBACK +#endif + /* Size of an MMU section */ enum { #ifdef CONFIG_ARMV7_LPAE |