Skip to contentSkip to conversation

ARM: SAMSUNG: move all arches to generic uncompress.h

PATCH Superseded Heiko Stübner 2 participants 6 messages Feb 16, 2014 – Feb 25, 2014

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover ARM: SAMSUNG: move all arches to generic uncompress.h

On 2014-01-06 Sachin Kamat posted two patches converting Exynos to use the generic uncompress.h.

But in fact all Samsung platforms can go this route, as all Samsung uncompress.h files are simply used to set up the serial port.

As the original patches were not yet applied, this series includes the original Exynos-specific change.

Tested on a s3c2416 and s3c2442 based machine.

Heiko Stuebner (2):
ARM: SAMSUNG: use generic uncompress.h
ARM: SAMSUNG: remove all custom uncompress.h

 arch/arm/Kconfig.debug                          |   5 +-
 arch/arm/mach-exynos/include/mach/uncompress.h  |  48 -------
 arch/arm/mach-s3c24xx/include/mach/uncompress.h |  57 --------
 arch/arm/mach-s3c64xx/include/mach/uncompress.h |  31 -----
 arch/arm/mach-s5p64x0/include/mach/uncompress.h |  34 -----
 arch/arm/mach-s5pc100/include/mach/uncompress.h |  30 ----
 arch/arm/mach-s5pv210/include/mach/uncompress.h |  28 ----
 arch/arm/plat-samsung/include/plat/uncompress.h | 175 ------------------------
 8 files changed, 3 insertions(+), 405 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s3c24xx/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s5pv210/include/mach/uncompress.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/uncompress.h
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 1/2 ARM: SAMSUNG: use generic uncompress.h

All Samsung platforms use the custom uncompress.h simply to setup the uart for the initial debug output. This can also be done using the generic uncompress.h.

---
 arch/arm/Kconfig.debug | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/Kconfig.debug +3 -2
index 0531da8..a160744 100644
@@ -1145,7 +1145,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 
 config DEBUG_UNCOMPRESS
 	bool
-	depends on ARCH_MULTIPLATFORM || ARCH_MSM
+	depends on ARCH_MULTIPLATFORM || ARCH_MSM || PLAT_SAMSUNG
 	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
 		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
 	help
@@ -1161,7 +1161,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 || \
+					PLAT_SAMSUNG
 	default "mach/uncompress.h"
 
 config EARLY_PRINTK
Signature · 1 line
1.8.5.3
#2 lore raw

PATCH 2/2 ARM: SAMSUNG: remove all custom uncompress.h

In reply to Heiko Stübner

All Samsung platforms now use the generic uncompress.h so all the custom ones can be removed.

---
 arch/arm/mach-exynos/include/mach/uncompress.h  |  48 -------
 arch/arm/mach-s3c24xx/include/mach/uncompress.h |  57 --------
 arch/arm/mach-s3c64xx/include/mach/uncompress.h |  31 -----
 arch/arm/mach-s5p64x0/include/mach/uncompress.h |  34 -----
 arch/arm/mach-s5pc100/include/mach/uncompress.h |  30 ----
 arch/arm/mach-s5pv210/include/mach/uncompress.h |  28 ----
 arch/arm/plat-samsung/include/plat/uncompress.h | 175 ------------------------
 7 files changed, 403 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s3c24xx/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-s5pv210/include/mach/uncompress.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/uncompress.h
arch/arm/mach-exynos/include/mach/uncompress.h deleted +0 -48
deleted file mode 100644
index 5d7ce36..0000000
@@ -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 */
arch/arm/mach-s3c24xx/include/mach/uncompress.h deleted +0 -57

57 lines not on this page · raw message

arch/arm/mach-s3c64xx/include/mach/uncompress.h deleted +0 -31
deleted file mode 100644
index 1c95673..0000000
@@ -1,31 +0,0 @@
-/* arch/arm/mach-s3c6400/include/mach/uncompress.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *	http://armlinux.simtec.co.uk/
- *	Ben Dooks <[email protected]>
- *
- * S3C6400 - 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
-
-#include <mach/map.h>
-#include <plat/uncompress.h>
-
-static void arch_detect_cpu(void)
-{
-	/* we do not need to do any cpu detection here at the moment. */
-	fifo_mask = S3C2440_UFSTAT_TXMASK;
-	fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
-
-	uart_base = (volatile u8 *)S3C_PA_UART +
-		(S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
-}
-
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
arch/arm/mach-s5p64x0/include/mach/uncompress.h deleted +0 -34
deleted file mode 100644
index bbcc3f6..0000000
@@ -1,34 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/uncompress.h
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * S5P64X0 - 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
-
-#include <mach/map.h>
-#include <plat/uncompress.h>
-
-static void arch_detect_cpu(void)
-{
-	unsigned int chipid;
-
-	chipid = *(const volatile unsigned int __force *) 0xE0100118;
-
-	if ((chipid & 0xff000) == 0x50000)
-		uart_base = (volatile u8 *)S5P6450_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
-	else
-		uart_base = (volatile u8 *)S5P6440_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
-
-	fifo_mask = S3C2440_UFSTAT_TXMASK;
-	fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
-}
-
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
arch/arm/mach-s5pc100/include/mach/uncompress.h deleted +0 -30
deleted file mode 100644
index 720e133..0000000
@@ -1,30 +0,0 @@
-/* arch/arm/mach-s5pc100/include/mach/uncompress.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *	Byungho Min <[email protected]>
- *
- * S5PC100 - uncompress code
- *
- * Based on mach-s3c6400/include/mach/uncompress.h
- *
- * 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
-
-#include <mach/map.h>
-#include <plat/uncompress.h>
-
-static void arch_detect_cpu(void)
-{
-	/* we do not need to do any cpu detection here at the moment. */
-	fifo_mask = S3C2440_UFSTAT_TXMASK;
-	fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
-
-	uart_base = (volatile u8 *)S5P_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
-}
-
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
arch/arm/mach-s5pv210/include/mach/uncompress.h deleted +0 -28
deleted file mode 100644
index 231cb07..0000000
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/uncompress.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com/
- *
- * S5PV210 - 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
-
-#include <mach/map.h>
-#include <plat/uncompress.h>
-
-static void arch_detect_cpu(void)
-{
-	/* we do not need to do any cpu detection here at the moment. */
-	fifo_mask = S5PV210_UFSTAT_TXMASK;
-	fifo_max = 63 << S5PV210_UFSTAT_TXSHIFT;
-
-	uart_base = (volatile u8 *)S5P_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT);
-}
-
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
arch/arm/plat-samsung/include/plat/uncompress.h deleted +0 -175

175 lines not on this page · raw message

Signature · 1 line
1.8.5.3
#3 lore raw

cover ARM: SAMSUNG: move all arches to generic uncompress.h

In reply to Heiko Stübner

Am Sonntag, 16. Februar 2014, 18:32:24 schrieb Heiko St?bner:

Quoted 10 lines

On 2014-01-06 Sachin Kamat posted two patches converting Exynos to use the generic uncompress.h.

But in fact all Samsung platforms can go this route, as all Samsung uncompress.h files are simply used to set up the serial port.

As the original patches were not yet applied, this series includes the original Exynos-specific change.

Tested on a s3c2416 and s3c2442 based machine.

ping?

Thanks
Heiko

#4 lore raw

cover ARM: SAMSUNG: move all arches to generic uncompress.h

Hi Heiko,

Quoted 7 lines · Heiko St?bner

Am Sonntag, 16. Februar 2014, 18:32:24 schrieb Heiko St?bner:

Quoted 6 lines

On 2014-01-06 Sachin Kamat posted two patches converting Exynos to use the generic uncompress.h.

But in fact all Samsung platforms can go this route, as all Samsung uncompress.h files are simply used to set up the serial port.

Quoted 6 lines
Quoted 4 lines

As the original patches were not yet applied, this series includes the original Exynos-specific change.

Tested on a s3c2416 and s3c2442 based machine.

ping?

Kukjin has already applied my 2 patches doing this for Exynos. You might need to rebase your patches on top of his for-next and re-send.

Signature · 2 lines
With warm regards,
Sachin
#5 lore raw

cover ARM: SAMSUNG: move all arches to generic uncompress.h

Am Dienstag, 25. Februar 2014, 21:11:09 schrieb Sachin Kamat:

Quoted 13 lines

Hi Heiko,

Quoted 10 lines · Heiko St?bner

Am Sonntag, 16. Februar 2014, 18:32:24 schrieb Heiko St?bner:

Quoted 9 lines

On 2014-01-06 Sachin Kamat posted two patches converting Exynos to use the generic uncompress.h.

But in fact all Samsung platforms can go this route, as all Samsung uncompress.h files are simply used to set up the serial port.

As the original patches were not yet applied, this series includes the original Exynos-specific change.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Tested on a s3c2416 and s3c2442 based machine.

ping?

Kukjin has already applied my 2 patches doing this for Exynos. You might need to rebase your patches on top of his for-next and re-send.

now I've seen that he applied them yesterday ... will rebase mine as suggested.

Heiko