Merge tag 'samsung-cleanup-2' of... (2b23e9a5) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/Kconfig.debug

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1145,7 +1145,7 @@ config DEBUG_UART_8250_FLOW_CONTROL

	config DEBUG_UNCOMPRESS		config DEBUG_UNCOMPRESS
	bool		bool
	depends on ARCH_MULTIPLATFORM \|\| ARCH_MSM \|\| ARCH_EXYNOS		depends on ARCH_MULTIPLATFORM \|\| ARCH_MSM \|\| PLAT_SAMSUNG
	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \		default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
	(!DEBUG_TEGRA_UART \|\| !ZBOOT_ROM)		(!DEBUG_TEGRA_UART \|\| !ZBOOT_ROM)
	help		help
	@@ -1162,7 +1162,7 @@ config DEBUG_UNCOMPRESS
	config UNCOMPRESS_INCLUDE		config UNCOMPRESS_INCLUDE
	string		string
	default "debug/uncompress.h" if ARCH_MULTIPLATFORM \|\| ARCH_MSM \|\| \		default "debug/uncompress.h" if ARCH_MULTIPLATFORM \|\| ARCH_MSM \|\| \
	ARCH_EXYNOS		PLAT_SAMSUNG
	default "mach/uncompress.h"		default "mach/uncompress.h"

	config EARLY_PRINTK		config EARLY_PRINTK

deleted100644 → 0

+0 −57

Original line number	Original line	Diff line number	Diff line
	/* arch/arm/mach-s3c2410/include/mach/uncompress.h
	*
	* Copyright (c) 2003-2007 Simtec Electronics
	* http://armlinux.simtec.co.uk/
	* Ben Dooks <ben@simtec.co.uk>
	*
	* S3C2410 - 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/regs-gpio.h>
	#include <mach/map.h>

	/* working in physical space... */
	#undef S3C2410_GPIOREG
	#define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))

	#include <plat/uncompress.h>

	static inline int is_arm926(void)
	{
	unsigned int cpuid;

	asm volatile ("mrc p15, 0, %0, c1, c0, 0" : "=r" (cpuid));

	return ((cpuid & 0xff0) == 0x260);
	}

	static void arch_detect_cpu(void)
	{
	unsigned int cpuid;

	cpuid = ((volatile unsigned int )S3C2410_GSTATUS1);
	cpuid &= S3C2410_GSTATUS1_IDMASK;

	if (is_arm926() \|\| cpuid == S3C2410_GSTATUS1_2440 \|\|
	cpuid == S3C2410_GSTATUS1_2442 \|\|
	cpuid == S3C2410_GSTATUS1_2416 \|\|
	cpuid == S3C2410_GSTATUS1_2450) {
	fifo_mask = S3C2440_UFSTAT_TXMASK;
	fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
	} else {
	fifo_mask = S3C2410_UFSTAT_TXMASK;
	fifo_max = 15 << S3C2410_UFSTAT_TXSHIFT;
	}

	uart_base = (volatile u8 *) S3C_PA_UART +
	(S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
	}

	#endif /* __ASM_ARCH_UNCOMPRESS_H */

deleted100644 → 0

+0 −31

Original line number	Original line	Diff line number	Diff line
	/* arch/arm/mach-s3c6400/include/mach/uncompress.h
	*
	* Copyright 2008 Openmoko, Inc.
	* Copyright 2008 Simtec Electronics
	* http://armlinux.simtec.co.uk/
	* Ben Dooks <ben@simtec.co.uk>
	*
	* 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 */

deleted100644 → 0

+0 −34

Original line number	Original line	Diff line number	Diff line
	/* 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 */

deleted100644 → 0

+0 −30

Original line number	Original line	Diff line number	Diff line
	/* arch/arm/mach-s5pc100/include/mach/uncompress.h
	*
	* Copyright 2009 Samsung Electronics Co.
	* Byungho Min <bhmin@samsung.com>
	*
	* 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 */