Skip to contentSkip to conversation

ARM: Exynos: Use generic uncompress.h

PATCH New Sachin Kamat 3 participants 4 messages Jan 6, 2014 – Feb 24, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Sachin Kamat

author
#0 lore raw

PATCH 1/2 ARM: Exynos: Use generic uncompress.h

As a pre-requisite step towards enabling multi-platform support for Exynos, enable it to use generic uncompress.h instead of the one provided in machine code.

Signed-off-by Sachin Kamat <[email protected]>
---
 arch/arm/Kconfig.debug |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/Kconfig.debug +3 -2
index e6c313ec5ece..de379a93c8ba 100644
@@ -1131,7 +1131,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 
 config DEBUG_UNCOMPRESS
 	bool
-	depends on ARCH_MULTIPLATFORM || ARCH_MSM
+	depends on ARCH_MULTIPLATFORM || ARCH_MSM || ARCH_EXYNOS
 	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
 		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
 	help

@@ -1147,7 +1147,8 @@ config DEBUG_UNCOMPRESS
 
 config UNCOMPRESS_INCLUDE
 	string
-	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM
+	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
+					ARCH_EXYNOS
 	default "mach/uncompress.h"
 
 config EARLY_PRINTK
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/2 ARM: EXYNOS: Remove uncompress.h

Now that we can use the generic uncompres.h file, there is no need for the machine specific header. Remove it.

Signed-off-by Sachin Kamat <[email protected]>
---
 arch/arm/mach-exynos/include/mach/uncompress.h |   48 ------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/include/mach/uncompress.h
arch/arm/mach-exynos/include/mach/uncompress.h deleted +0 -48
deleted file mode 100644
index 5d7ce36be46f..000000000000
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * EXYNOS - uncompress code
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_UNCOMPRESS_H
-#define __ASM_ARCH_UNCOMPRESS_H __FILE__
-
-#include <asm/mach-types.h>
-
-#include <mach/map.h>
-#include <plat/uncompress.h>
-
-static unsigned int __raw_readl(unsigned int ptr)
-{
-	return *((volatile unsigned int *)ptr);
-}
-
-static void arch_detect_cpu(void)
-{
-	u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID);
-
-	/*
-	 * product_id is bits 31:12
-	 * bits 23:20 describe the exynosX family
-	 * bits 27:24 describe the exynosX family in exynos5420
-	 */
-	chip_id >>= 20;
-
-	if ((chip_id & 0x0f) == 0x5 || (chip_id & 0xf0) == 0x50)
-		uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
-	else
-		uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
-
-	/*
-	 * For preventing FIFO overrun or infinite loop of UART console,
-	 * fifo_max should be the minimum fifo size of all of the UART channels
-	 */
-	fifo_mask = S5PV210_UFSTAT_TXMASK;
-	fifo_max = 15 << S5PV210_UFSTAT_TXSHIFT;
-}
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 1/2 ARM: Exynos: Use generic uncompress.h

Quoted 11 lines · Arnd Bergmann
Quoted 5 lines · Sachin Kamat

As a pre-requisite step towards enabling multi-platform support for Exynos, enable it to use generic uncompress.h instead of the one provided in machine code.

Signed-off-by Sachin Kamat<[email protected]>

Both patches

Acked-by Arnd Bergmann<[email protected]>

Applied both.

Thanks,
Kukjin