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

Commit 615967b0 authored by Shawn Guo's avatar Shawn Guo Committed by Russell King
Browse files

ARM: 7671/1: use Kconfig to select uncompress.h 



Following the approach handling DEBUG_LL inclusion, the patch creates
a Kconfig symbol CONFIG_UNCOMPRESS_INCLUDE for choosing the correct
uncompress header.  For traditional build, mach/uncompress.h will be
included in arch/arm/boot/compressed/misc.c.  For multiplatform build,
debug/uncompress.h which contains a suite of empty functions will be
used.  In this way, a platform with particular uncompress.h
implementation could choose its own uncompress.h with this Kconfig
option.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f6161aa1

arch/arm/Kconfig.debug

+5 −0
Original line number Original line Diff line number Diff line
@@ -601,6 +601,11 @@ config DEBUG_LL_INCLUDE 
	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "mach/debug-macro.S"

	default "mach/debug-macro.S"





config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM

	default "mach/uncompress.h"



config EARLY_PRINTK

config EARLY_PRINTK

	bool "Early printk"

	bool "Early printk"

	depends on DEBUG_LL

	depends on DEBUG_LL

arch/arm/boot/compressed/misc.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -25,13 +25,7 @@ unsigned int __machine_arch_type; 
static void putstr(const char *ptr);

static void putstr(const char *ptr);

extern void error(char *x);

extern void error(char *x);





#ifdef CONFIG_ARCH_MULTIPLATFORM

#include CONFIG_UNCOMPRESS_INCLUDE

static inline void putc(int c) {}

static inline void flush(void) {}

static inline void arch_decomp_setup(void) {}

#else

#include <mach/uncompress.h>

#endif





#ifdef CONFIG_DEBUG_ICEDCC

#ifdef CONFIG_DEBUG_ICEDCC

arch/arm/include/debug/uncompress.h

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
static inline void putc(int c) {}

static inline void flush(void) {}

static inline void arch_decomp_setup(void) {}