diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-03-14 16:08:21 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-03-14 16:08:21 +0000 |
| commit | 7283430256ca7e46a37c12754f924a30cd317b91 (patch) | |
| tree | 3911e179cbfe157554f7f2a46ca95e958d709e39 /target/linux/atheros/patches-2.6.31 | |
| parent | 04864d9fb73e16b974dd75b301ce625497c93c77 (diff) | |
| download | upstream-7283430256ca7e46a37c12754f924a30cd317b91.tar.gz upstream-7283430256ca7e46a37c12754f924a30cd317b91.tar.bz2 upstream-7283430256ca7e46a37c12754f924a30cd317b91.zip | |
atheros: add early-printk support
SVN-Revision: 20201
Diffstat (limited to 'target/linux/atheros/patches-2.6.31')
3 files changed, 73 insertions, 5 deletions
diff --git a/target/linux/atheros/patches-2.6.31/101-early-printk-support.patch b/target/linux/atheros/patches-2.6.31/101-early-printk-support.patch new file mode 100644 index 0000000000..3536ca8015 --- /dev/null +++ b/target/linux/atheros/patches-2.6.31/101-early-printk-support.patch @@ -0,0 +1,68 @@ +--- /dev/null ++++ b/arch/mips/ar231x/early_printk.c +@@ -0,0 +1,44 @@ ++/* ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file "COPYING" in the main directory of this archive ++ * for more details. ++ * ++ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org> ++ */ ++ ++#include <linux/mm.h> ++#include <linux/io.h> ++#include <linux/serial_reg.h> ++#include <asm/addrspace.h> ++ ++#include <asm/mach-ar231x/ar2315_regs.h> ++#include <asm/mach-ar231x/ar5312_regs.h> ++#include "devices.h" ++ ++static inline void prom_uart_wr(void __iomem *base, unsigned reg, ++ unsigned char ch) ++{ ++ __raw_writeb(ch, base + 4 * reg); ++} ++ ++static inline unsigned char prom_uart_rr(void __iomem *base, unsigned reg) ++{ ++ return __raw_readb(base + 4 * reg); ++} ++ ++void prom_putchar(unsigned char ch) ++{ ++ static void __iomem *base; ++ ++ if (unlikely(base == NULL)) { ++ if (is_2315()) ++ base = (void __iomem *)(KSEG1ADDR(AR2315_UART0)); ++ else ++ base = (void __iomem *)(KSEG1ADDR(AR531X_UART0)); ++ } ++ ++ while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0); ++ prom_uart_wr(base, UART_TX, ch); ++ while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0); ++} ++ +--- a/arch/mips/ar231x/Makefile ++++ b/arch/mips/ar231x/Makefile +@@ -9,5 +9,8 @@ + # + + obj-y += board.o prom.o devices.o ++ ++obj-$(CONFIG_EARLY_PRINTK) += early_printk.o ++ + obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o + obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -90,6 +90,7 @@ config ATHEROS_AR231X + select SYS_SUPPORTS_BIG_ENDIAN + select SYS_SUPPORTS_32BIT_KERNEL + select GENERIC_GPIO ++ select SYS_HAS_EARLY_PRINTK + help + Support for AR231x and AR531x based boards + diff --git a/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch index 9b76dfee46..3f5e6b4528 100644 --- a/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch +++ b/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch @@ -1,7 +1,7 @@ --- a/arch/mips/ar231x/Makefile +++ b/arch/mips/ar231x/Makefile -@@ -11,3 +11,4 @@ - obj-y += board.o prom.o devices.o +@@ -14,3 +14,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin + obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o +obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o diff --git a/target/linux/atheros/patches-2.6.31/210-reset_button.patch b/target/linux/atheros/patches-2.6.31/210-reset_button.patch index 79d4446fea..3c91818146 100644 --- a/target/linux/atheros/patches-2.6.31/210-reset_button.patch +++ b/target/linux/atheros/patches-2.6.31/210-reset_button.patch @@ -6,9 +6,9 @@ -obj-y += board.o prom.o devices.o +obj-y += board.o prom.o devices.o reset.o - obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o - obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o - obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o + + obj-$(CONFIG_EARLY_PRINTK) += early_printk.o + --- /dev/null +++ b/arch/mips/ar231x/reset.c @@ -0,0 +1,160 @@ |