ARM: 7671/1: use Kconfig to select uncompress.h (615967b0) · Commits · 戴 / test

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:

Shawn Guo <shawn.guo@linaro.org> Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/Kconfig.debug

+5 −0

Original line number	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 "mach/debug-macro.S"

		config UNCOMPRESS_INCLUDE
		string
		default "debug/uncompress.h" if ARCH_MULTIPLATFORM
		default "mach/uncompress.h"

		config EARLY_PRINTK
		bool "Early printk"
		depends on DEBUG_LL

arch/arm/boot/compressed/misc.c

+1 −7

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

		#ifdef CONFIG_ARCH_MULTIPLATFORM
		static inline void putc(int c) {}
		static inline void flush(void) {}
		static inline void arch_decomp_setup(void) {}
		#else
		#include <mach/uncompress.h>
		#endif
		#include CONFIG_UNCOMPRESS_INCLUDE

		#ifdef CONFIG_DEBUG_ICEDCC

arch/arm/include/debug/uncompress.h

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		static inline void putc(int c) {}
		static inline void flush(void) {}
		static inline void arch_decomp_setup(void) {}

Admin message