Commit 76c1b838 authored by Tushar Behera's avatar Tushar Behera Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Consolidate uncompress subroutine



For mach-exynos, uart_base is a pointer and the value is calculated
in the machine folder. For other machines, uart_base is defined as
a macro in platform directory. For symmetry, the uart_base macro
definition is removed and the uart_base calculation is moved to
specific machine folders.

This would help us consolidating uncompress subroutine for s5p64x0.

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 317ddd25
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@
#include <asm/mach-types.h>

#include <mach/map.h>

volatile u8 *uart_base;

#include <plat/uncompress.h>

static unsigned int __raw_readl(unsigned int ptr)
+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ static void arch_detect_cpu(void)
		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 */
+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 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 */
+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 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 */
+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 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 */
Loading