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

Commit ae3c99a2 authored by Stephen Warren's avatar Stephen Warren Committed by Russell King
Browse files

ARM: 7806/1: allow DEBUG_UNCOMPRESS for Tegra 



DEBUG_UNCOMPRESS was previously disallowed for Tegra due to tegra.S's
use of global data that was not linked into the decompressor. Solve this
by declaring this symbol in tegra.S when it is being built into the
decompressor. For the kernel proper, leave the declaration in
mach-tegra/common.c as explained in the comment.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d2c215aa

arch/arm/Kconfig.debug

+1 −1
Original line number Original line Diff line number Diff line
@@ -1039,7 +1039,7 @@ config DEBUG_UNCOMPRESS 
	bool

	bool

	depends on ARCH_MULTIPLATFORM

	depends on ARCH_MULTIPLATFORM

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

		     !DEBUG_TEGRA_UART

		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)

	help

	help

	  This option influences the normal decompressor output for

	  This option influences the normal decompressor output for

	  multiplatform kernels.  Normally, multiplatform kernels disable

	  multiplatform kernels.  Normally, multiplatform kernels disable

arch/arm/include/debug/tegra.S

+29 −0
Original line number Original line Diff line number Diff line
@@ -221,3 +221,32 @@ 
1002:

1002:

#endif

#endif

		.endm

		.endm



/*

 * Storage for the state maintained by the macros above.

 *

 * In the kernel proper, this data is located in arch/arm/mach-tegra/common.c.

 * That's because this header is included from multiple files, and we only

 * want a single copy of the data. In particular, the UART probing code above

 * assumes it's running using physical addresses. This is true when this file

 * is included from head.o, but not when included from debug.o. So we need

 * to share the probe results between the two copies, rather than having

 * to re-run the probing again later.

 *

 * In the decompressor, we put the symbol/storage right here, since common.c

 * isn't included in the decompressor build. This symbol gets put in .text

 * even though it's really data, since .data is discarded from the

 * decompressor. Luckily, .text is writeable in the decompressor, unless

 * CONFIG_ZBOOT_ROM. That dependency is handled in arch/arm/Kconfig.debug.

 */

#if defined(ZIMAGE)

tegra_uart_config:

	/* Debug UART initialization required */

	.word 1

	/* Debug UART physical address */

	.word 0

	/* Debug UART virtual address */

	.word 0

	/* Scratch space for debug macro */

	.word 0

#endif