KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adm5120: move early-printk support into a separate file

Browse source 
SVN-Revision: 19000
This commit is contained in:
Gabor Juhos 2010-01-02 15:07:34 +00:00
parent 9240fe972d
commit e564b686b8
3 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/adm5120/files/arch/mips/adm5120/common/Makefile
View file

@ -4,3 +4,5 @@
obj-y := adm5120.o setup.o prom.o irq.o memory.o clock.o \ obj-y := adm5120.o setup.o prom.o irq.o memory.o clock.o \
gpio.o platform.o gpio.o platform.o
obj-$(CONFIG_EARLY_PRINTK) += early-printk.o

29
target/linux/adm5120/files/arch/mips/adm5120/common/early-printk.c Normal file
View file

@ -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);
}

16
target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
View file

@ -13,15 +13,11 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/io.h>
#include <asm/addrspace.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mips_machine.h> #include <asm/mips_machine.h>
#include <asm/mach-adm5120/adm5120_info.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/cfe.h>
#include <prom/generic.h> #include <prom/generic.h>
@ -254,18 +250,6 @@ static void __init prom_init_cmdline(void)
static void inline prom_init_cmdline(void) {} static void inline prom_init_cmdline(void) {}
#endif /* CONFIG_IMAGE_CMDLINE_HACK */ #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) void __init prom_init(void)
{ {
prom_detect_machtype(); prom_detect_machtype();