"Das U-Boot" Source Tree

CONFIG_SYS_NONCACHED_MEMORY: Move prototypes to include/cpu_func.h for consistency

Currently, a number of generic cache related functions have their common
prototype declared in include/cpu_func.h. Move the current set of
noncached functions there as well to match.

Signed-off-by: Tom Rini <trini@konsulko.com>

+13 -30
-16
arch/arm/include/asm/system.h
··· 665 665 void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, 666 666 enum dcache_option option); 667 667 668 - #ifdef CONFIG_SYS_NONCACHED_MEMORY 669 - /** 670 - * noncached_init() - Initialize non-cached memory region 671 - * 672 - * Initialize non-cached memory area. This memory region will be typically 673 - * located right below the malloc() area and mapped uncached in the MMU. 674 - * 675 - * It is called during the generic post-relocation init sequence. 676 - * 677 - * Return: 0 if OK 678 - */ 679 - int noncached_init(void); 680 - 681 - phys_addr_t noncached_alloc(size_t size, size_t align); 682 - #endif /* CONFIG_SYS_NONCACHED_MEMORY */ 683 - 684 668 #endif /* __ASSEMBLY__ */ 685 669 686 670 #endif
-14
arch/mips/include/asm/system.h
··· 286 286 /* 1MB granularity */ 287 287 #define MMU_SECTION_SHIFT 20 288 288 #define MMU_SECTION_SIZE (1 << MMU_SECTION_SHIFT) 289 - 290 - /** 291 - * noncached_init() - Initialize non-cached memory region 292 - * 293 - * Initialize non-cached memory area. This memory region will be typically 294 - * located right below the malloc() area and be accessed from KSEG1. 295 - * 296 - * It is called during the generic post-relocation init sequence. 297 - * 298 - * Return: 0 if OK 299 - */ 300 - int noncached_init(void); 301 - 302 - phys_addr_t noncached_alloc(size_t size, size_t align); 303 289 #endif /* CONFIG_SYS_NONCACHED_MEMORY */ 304 290 305 291 #endif /* _ASM_SYSTEM_H */
+13
include/cpu_func.h
··· 69 69 void invalidate_dcache_range(unsigned long start, unsigned long stop); 70 70 void invalidate_dcache_all(void); 71 71 void invalidate_icache_all(void); 72 + /** 73 + * noncached_init() - Initialize non-cached memory region 74 + * 75 + * Initialize non-cached memory area. This memory region will be typically 76 + * located right below the malloc() area and mapped uncached in the MMU. 77 + * 78 + * It is called during the generic post-relocation init sequence. 79 + * 80 + * Return: 0 if OK 81 + */ 82 + int noncached_init(void); 83 + 84 + phys_addr_t noncached_alloc(size_t size, size_t align); 72 85 73 86 enum { 74 87 /* Disable caches (else flush caches but leave them active) */