aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/arch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-02 15:07:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-02 15:07:34 +0000
commit3707e6c11c34af642b2512eb4dfc66b446bbdc09 (patch)
treec3b4440dbbb7b7e6921c722fd185afe24f696355 /target/linux/adm5120/files/arch
parent344ba6e886c45ad899c92597878e87944392f4e9 (diff)
downloadupstream-3707e6c11c34af642b2512eb4dfc66b446bbdc09.tar.gz
upstream-3707e6c11c34af642b2512eb4dfc66b446bbdc09.tar.bz2
upstream-3707e6c11c34af642b2512eb4dfc66b446bbdc09.zip
adm5120: move early-printk support into a separate file
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/arch')
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/common/Makefile2
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/common/early-printk.c29
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/common/prom.c16
3 files changed, 31 insertions, 16 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/Makefile b/target/linux/adm5120/files/arch/mips/adm5120/common/Makefile
index d24aa07889..8d302c5931 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/Makefile
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/Makefile
@@ -4,3 +4,5 @@
obj-y := adm5120.o setup.o prom.o irq.o memory.o clock.o \
gpio.o platform.o
+
+obj-$(CONFIG_EARLY_PRINTK) += early-printk.o
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/early-printk.c b/target/linux/adm5120/files/arch/mips/adm5120/common/early-printk.c
new file mode 100644
index 0000000000..6aff1475a9
--- /dev/null
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/early-printk.c
@@ -0,0 +1,29 @@
+/*
+ * ADM5120 specific early printk support
+ *
+ * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+
+#include <asm/addrspace.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_uart.h>
+
+#define UART_READ(r) \
+ __raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
+#define UART_WRITE(r, v) \
+ __raw_writel((v), (void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
+
+void __init prom_putchar(char ch)
+{
+ while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
+ UART_WRITE(UART_REG_DATA, ch);
+ while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
+}
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
index 5b2e45defe..adc9e8c71a 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
@@ -13,15 +13,11 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/io.h>
-#include <asm/addrspace.h>
#include <asm/bootinfo.h>
#include <asm/mips_machine.h>
#include <asm/mach-adm5120/adm5120_info.h>
-#include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_uart.h>
#include <prom/cfe.h>
#include <prom/generic.h>
@@ -254,18 +250,6 @@ static void __init prom_init_cmdline(void)
static void inline prom_init_cmdline(void) {}
#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-#define UART_READ(r) \
- __raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
-#define UART_WRITE(r, v) \
- __raw_writel((v), (void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
-
-void __init prom_putchar(char ch)
-{
- while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
- UART_WRITE(UART_REG_DATA, ch);
- while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
-}
-
void __init prom_init(void)
{
prom_detect_machtype();