From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 25 Aug 2009 17:13:12 +0000 (+0000)
Subject: [ar71xx] remove AR71XX_EARLY_SERIAL stuff
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=0f85e284401d7c3d1b6a99bb56eaf432b464b0e5

[ar71xx] remove AR71XX_EARLY_SERIAL stuff

SVN-Revision: 17400
---

diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index a81c5f22eb..78a05526ba 100644
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -5,7 +5,6 @@ CONFIG_ADM6996_PHY=y
 CONFIG_AG71XX=y
 CONFIG_AG71XX_AR8216_SUPPORT=y
 # CONFIG_AG71XX_DEBUG is not set
-# CONFIG_AR71XX_EARLY_SERIAL is not set
 CONFIG_AR71XX_MACH_AP81=y
 CONFIG_AR71XX_MACH_AP83=y
 CONFIG_AR71XX_MACH_AW_NR580=y
diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30
index 5f9e9ee47c..dbeea43be8 100644
--- a/target/linux/ar71xx/config-2.6.30
+++ b/target/linux/ar71xx/config-2.6.30
@@ -4,7 +4,6 @@ CONFIG_ADM6996_PHY=y
 CONFIG_AG71XX=y
 CONFIG_AG71XX_AR8216_SUPPORT=y
 # CONFIG_AG71XX_DEBUG is not set
-# CONFIG_AR71XX_EARLY_SERIAL is not set
 CONFIG_AR71XX_MACH_AP81=y
 CONFIG_AR71XX_MACH_AP83=y
 CONFIG_AR71XX_MACH_AW_NR580=y
diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index 9a6a89857b..dd84d1f0b3 100644
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -6,7 +6,6 @@ CONFIG_AG71XX_AR8216_SUPPORT=y
 # CONFIG_AG71XX_DEBUG is not set
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 # CONFIG_AR7 is not set
-# CONFIG_AR71XX_EARLY_SERIAL is not set
 CONFIG_AR71XX_MACH_AP81=y
 CONFIG_AR71XX_MACH_AP83=y
 CONFIG_AR71XX_MACH_AW_NR580=y
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
index 9840c7f986..b8b3649014 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
@@ -1,9 +1,5 @@
 if ATHEROS_AR71XX
 
-config AR71XX_EARLY_SERIAL
-	bool "Use early serial console"
-	default n
-
 menu "Atheros AR71xx machine selection"
 
 config AR71XX_MACH_AP81
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
index 62969d00a4..5ff65e0ed0 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
@@ -140,7 +140,6 @@ void __init ar71xx_add_device_usb(void)
 	}
 }
 
-#ifndef CONFIG_AR71XX_EARLY_SERIAL
 static struct resource ar71xx_uart_resources[] = {
 	{
 		.start	= AR71XX_UART_BASE,
@@ -177,7 +176,6 @@ void __init ar71xx_add_device_uart(void)
 	ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
 	platform_device_register(&ar71xx_uart_device);
 }
-#endif /* CONFIG_AR71XX_EARLY_SERIAL */
 
 static struct resource ar71xx_mdio_resources[] = {
 	{
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
index ec75ac1e8c..6c721269df 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
@@ -50,12 +50,7 @@ void ar71xx_add_device_gpio_buttons(int id,
 				    struct gpio_button *buttons) __init;
 
 void ar71xx_add_device_usb(void) __init;
-
-#ifdef CONFIG_AR71XX_EARLY_SERIAL
-static inline void ar71xx_add_device_uart(void) {}
-#else
 void ar71xx_add_device_uart(void) __init;
-#endif
 
 void ar71xx_add_device_wdt(void) __init;
 
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
index 1666d8216b..4a2295af49 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
@@ -226,26 +226,6 @@ static void __init detect_sys_frequency(void)
 	}
 }
 
-#ifdef CONFIG_AR71XX_EARLY_SERIAL
-static void __init ar71xx_early_serial_setup(void)
-{
-	struct uart_port p;
-
-	memset(&p, 0, sizeof(p));
-
-	p.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP;
-	p.iotype	= UPIO_MEM32;
-	p.uartclk	= ar71xx_ahb_freq;
-	p.irq		= AR71XX_MISC_IRQ_UART;
-	p.regshift	= 2;
-	p.mapbase	= AR71XX_UART_BASE;
-
-	early_serial_setup(&p);
-}
-#else
-static inline void ar71xx_early_serial_setup(void) {};
-#endif /* CONFIG_AR71XX_EARLY_SERIAL */
-
 const char *get_system_type(void)
 {
 	return ar71xx_sys_type;
@@ -288,8 +268,6 @@ void __init plat_mem_setup(void)
 	_machine_restart = ar71xx_restart;
 	_machine_halt = ar71xx_halt;
 	pm_power_off = ar71xx_halt;
-
-	ar71xx_early_serial_setup();
 }
 
 void __init plat_time_init(void)