atheros: add early-printk support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20201 3c298f89-4303-0410-b956-a3cf2f4a3e73

12 files changed, 292 insertions, 20 deletions

diff --git a/target/linux/atheros/patches-2.6.30/101-early-printk-support.patch b/target/linux/atheros/patches-2.6.30/101-early-printk-support.patch
new file mode 100644
index 000000000..c09d4b3c9
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.30/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
+@@ -70,6 +70,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.30/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.30/105-ar2315_pci.patch
index 9b76dfee4..3f5e6b452 100644
--- a/target/linux/atheros/patches-2.6.30/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-2.6.30/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.30/210-reset_button.patch b/target/linux/atheros/patches-2.6.30/210-reset_button.patch
index 79d4446fe..3c9181814 100644
--- a/target/linux/atheros/patches-2.6.30/210-reset_button.patch
+++ b/target/linux/atheros/patches-2.6.30/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 @@
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 000000000..3536ca801
--- /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 9b76dfee4..3f5e6b452 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 79d4446fe..3c9181814 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 @@
diff --git a/target/linux/atheros/patches-2.6.32/101-early-printk-support.patch b/target/linux/atheros/patches-2.6.32/101-early-printk-support.patch
new file mode 100644
index 000000000..b52471ade
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.32/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
+@@ -106,6 +106,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.32/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.32/105-ar2315_pci.patch
index 9b76dfee4..3f5e6b452 100644
--- a/target/linux/atheros/patches-2.6.32/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-2.6.32/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.32/210-reset_button.patch b/target/linux/atheros/patches-2.6.32/210-reset_button.patch
index 79d4446fe..3c9181814 100644
--- a/target/linux/atheros/patches-2.6.32/210-reset_button.patch
+++ b/target/linux/atheros/patches-2.6.32/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 @@
diff --git a/target/linux/atheros/patches-2.6.33/101-early-printk-support.patch b/target/linux/atheros/patches-2.6.33/101-early-printk-support.patch
new file mode 100644
index 000000000..8feec4c67
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.33/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
+@@ -94,6 +94,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.33/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.33/105-ar2315_pci.patch
index 9b76dfee4..3f5e6b452 100644
--- a/target/linux/atheros/patches-2.6.33/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-2.6.33/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.33/210-reset_button.patch b/target/linux/atheros/patches-2.6.33/210-reset_button.patch
index 79d4446fe..3c9181814 100644
--- a/target/linux/atheros/patches-2.6.33/210-reset_button.patch
+++ b/target/linux/atheros/patches-2.6.33/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 @@