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

Commit 9848e49a authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: fix warning '"CONFIG_OF" is not defined' 



The warning only shows up when building MMUv3 configuration with OF
support disabled.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 9ed82c68

arch/xtensa/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#ifdef CONFIG_MMU



#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY && CONFIG_OF

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

extern unsigned long xtensa_kio_paddr;



static inline unsigned long xtensa_get_kio_paddr(void)

arch/xtensa/include/asm/vectors.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define XCHAL_KIO_DEFAULT_PADDR		0xf0000000

#define XCHAL_KIO_SIZE			0x10000000



#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY && CONFIG_OF

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

#define XCHAL_KIO_PADDR			xtensa_get_kio_paddr()

#else

#define XCHAL_KIO_PADDR			XCHAL_KIO_DEFAULT_PADDR

arch/xtensa/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void init_mmu(void) 
	set_itlbcfg_register(0);

	set_dtlbcfg_register(0);

#endif

#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY && CONFIG_OF

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

	/*

	 * Update the IO area mapping in case xtensa_kio_paddr has changed

	 */