Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xtensa: nommu: fix load address definitions

Change KERNELOFFSET, LOAD_MEMORY_ADDRESS and VIRTUAL_MEMORY_ADDRESS to be
relative to the start of physical memory in noMMU configuration, as
there's no uniform memory remapping to KSEG starting at 0xd0000000.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

+4 -3
+4 -3
arch/xtensa/include/asm/vectors.h
··· 19 19 #define _XTENSA_VECTORS_H 20 20 21 21 #include <variant/core.h> 22 + #include <platform/hardware.h> 22 23 23 24 #define XCHAL_KIO_CACHED_VADDR 0xe0000000 24 25 #define XCHAL_KIO_BYPASS_VADDR 0xf0000000 ··· 52 51 /* MMU Not being used - Virtual == Physical */ 53 52 54 53 /* VECBASE */ 55 - #define VIRTUAL_MEMORY_ADDRESS 0x00002000 54 + #define VIRTUAL_MEMORY_ADDRESS (PLATFORM_DEFAULT_MEM_START + 0x2000) 56 55 57 56 /* Location of the start of the kernel text, _start */ 58 - #define KERNELOFFSET 0x00003000 57 + #define KERNELOFFSET (PLATFORM_DEFAULT_MEM_START + 0x3000) 59 58 60 59 /* Loaded just above possibly live vectors */ 61 - #define LOAD_MEMORY_ADDRESS 0x00003000 60 + #define LOAD_MEMORY_ADDRESS (PLATFORM_DEFAULT_MEM_START + 0x3000) 62 61 63 62 #endif /* CONFIG_MMU */ 64 63