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

Commit a09975bf authored by Florian Fainelli's avatar Florian Fainelli Committed by Russell King
Browse files

ARM: 8639/1: Define KERNEL_START and KERNEL_END 



In preparation for adding CONFIG_DEBUG_VIRTUAL support, define a set of
common constants: KERNEL_START and KERNEL_END which abstract
CONFIG_XIP_KERNEL vs. !CONFIG_XIP_KERNEL. Update the code where
relevant.

Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4e23612b

arch/arm/include/asm/memory.h

+7 −0
Original line number Diff line number Diff line
@@ -111,6 +111,13 @@ 


#endif /* !CONFIG_MMU */



#ifdef CONFIG_XIP_KERNEL

#define KERNEL_START		_sdata

#else

#define KERNEL_START		_stext

#endif

#define KERNEL_END		_end



/*

 * We fix the TCM memories max 32 KiB ITCM resp DTCM at these

 * locations

arch/arm/mm/init.c

+2 −5
Original line number Diff line number Diff line
@@ -230,11 +230,8 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) 
void __init arm_memblock_init(const struct machine_desc *mdesc)

{

	/* Register the kernel text, kernel data and initrd with memblock. */

#ifdef CONFIG_XIP_KERNEL

	memblock_reserve(__pa(_sdata), _end - _sdata);

#else

	memblock_reserve(__pa(_stext), _end - _stext);

#endif

	memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START);



#ifdef CONFIG_BLK_DEV_INITRD

	/* FDT scan will populate initrd_start */

	if (initrd_start && !phys_initrd_size) {

arch/arm/mm/mmu.c

+1 −5
Original line number Diff line number Diff line
@@ -1422,11 +1422,7 @@ static void __init kmap_init(void) 
static void __init map_lowmem(void)

{

	struct memblock_region *reg;

#ifdef CONFIG_XIP_KERNEL

	phys_addr_t kernel_x_start = round_down(__pa(_sdata), SECTION_SIZE);

#else

	phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);

#endif

	phys_addr_t kernel_x_start = round_down(__pa(KERNEL_START), SECTION_SIZE);

	phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);



	/* Map all the lowmem memory banks. */