Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0a34615 authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: clean up include/asm/vectors.h 



- drop unused PHYSICAL_MEMORY_ADDRESS and XC_PADDR
- fix NMI_VECTOR_VADDR and INTLEVEL7_VECTOR_VADDR definitions: there
  should be no XCHAL_ prefix in them;
- fix the following warning seen with gcc-4.8.1:

  arch/xtensa/include/asm/vectors.h:71:5: warning: "XCHAL_HAVE_VECBASE" is not defined [-Wundef]

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 802eee95

arch/xtensa/include/asm/vectors.h

+3 −9
Original line number Diff line number Diff line
@@ -30,11 +30,9 @@ 


#if defined(XCHAL_HAVE_PTP_MMU) && XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY

  /* MMU v3  - XCHAL_HAVE_PTP_MMU  == 1 */

  #define PHYSICAL_MEMORY_ADDRESS	0x00000000

  #define LOAD_MEMORY_ADDRESS		0x00003000

#else

  /* MMU V2 -  XCHAL_HAVE_PTP_MMU  == 0 */

  #define PHYSICAL_MEMORY_ADDRESS	0xD0000000

  #define LOAD_MEMORY_ADDRESS		0xD0003000

#endif
@@ -46,7 +44,6 @@ 


  /* Location of the start of the kernel text, _start */

  #define KERNELOFFSET			0x00003000

  #define PHYSICAL_MEMORY_ADDRESS	0x00000000



  /* Loaded just above possibly live vectors */

  #define LOAD_MEMORY_ADDRESS		0x00003000
@@ -54,7 +51,6 @@ 
#endif /* CONFIG_MMU */



#define XC_VADDR(offset)		(VIRTUAL_MEMORY_ADDRESS  + offset)

#define XC_PADDR(offset)		(PHYSICAL_MEMORY_ADDRESS + offset)



/* Used to set VECBASE register */

#define VECBASE_RESET_VADDR		VIRTUAL_MEMORY_ADDRESS
@@ -67,7 +63,7 @@ 
						VECBASE_RESET_VADDR)

#define RESET_VECTOR1_VADDR		XC_VADDR(RESET_VECTOR1_VECOFS)



#if XCHAL_HAVE_VECBASE

#if defined(XCHAL_HAVE_VECBASE) && XCHAL_HAVE_VECBASE



#define USER_VECTOR_VADDR		XC_VADDR(XCHAL_USER_VECOFS)

#define KERNEL_VECTOR_VADDR		XC_VADDR(XCHAL_KERNEL_VECOFS)
@@ -81,11 +77,9 @@ 


#define DEBUG_VECTOR_VADDR		XC_VADDR(XCHAL_DEBUG_VECOFS)



#undef  XCHAL_NMI_VECTOR_VADDR

#define XCHAL_NMI_VECTOR_VADDR		XC_VADDR(XCHAL_NMI_VECOFS)

#define NMI_VECTOR_VADDR		XC_VADDR(XCHAL_NMI_VECOFS)



#undef  XCHAL_INTLEVEL7_VECTOR_VADDR

#define XCHAL_INTLEVEL7_VECTOR_VADDR	XC_VADDR(XCHAL_INTLEVEL7_VECOFS)

#define INTLEVEL7_VECTOR_VADDR		XC_VADDR(XCHAL_INTLEVEL7_VECOFS)



/*

 * These XCHAL_* #defines from varian/core.h