mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-21 00:40:14 +03:00
[ar71xx] remove AR71XX_EARLY_SERIAL stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17400 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
4044cf6e01
commit
974f75fd41
@ -5,7 +5,6 @@ CONFIG_ADM6996_PHY=y
|
|||||||
CONFIG_AG71XX=y
|
CONFIG_AG71XX=y
|
||||||
CONFIG_AG71XX_AR8216_SUPPORT=y
|
CONFIG_AG71XX_AR8216_SUPPORT=y
|
||||||
# CONFIG_AG71XX_DEBUG is not set
|
# CONFIG_AG71XX_DEBUG is not set
|
||||||
# CONFIG_AR71XX_EARLY_SERIAL is not set
|
|
||||||
CONFIG_AR71XX_MACH_AP81=y
|
CONFIG_AR71XX_MACH_AP81=y
|
||||||
CONFIG_AR71XX_MACH_AP83=y
|
CONFIG_AR71XX_MACH_AP83=y
|
||||||
CONFIG_AR71XX_MACH_AW_NR580=y
|
CONFIG_AR71XX_MACH_AW_NR580=y
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_ADM6996_PHY=y
|
|||||||
CONFIG_AG71XX=y
|
CONFIG_AG71XX=y
|
||||||
CONFIG_AG71XX_AR8216_SUPPORT=y
|
CONFIG_AG71XX_AR8216_SUPPORT=y
|
||||||
# CONFIG_AG71XX_DEBUG is not set
|
# CONFIG_AG71XX_DEBUG is not set
|
||||||
# CONFIG_AR71XX_EARLY_SERIAL is not set
|
|
||||||
CONFIG_AR71XX_MACH_AP81=y
|
CONFIG_AR71XX_MACH_AP81=y
|
||||||
CONFIG_AR71XX_MACH_AP83=y
|
CONFIG_AR71XX_MACH_AP83=y
|
||||||
CONFIG_AR71XX_MACH_AW_NR580=y
|
CONFIG_AR71XX_MACH_AW_NR580=y
|
||||||
|
@ -6,7 +6,6 @@ CONFIG_AG71XX_AR8216_SUPPORT=y
|
|||||||
# CONFIG_AG71XX_DEBUG is not set
|
# CONFIG_AG71XX_DEBUG is not set
|
||||||
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
|
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
|
||||||
# CONFIG_AR7 is not set
|
# CONFIG_AR7 is not set
|
||||||
# CONFIG_AR71XX_EARLY_SERIAL is not set
|
|
||||||
CONFIG_AR71XX_MACH_AP81=y
|
CONFIG_AR71XX_MACH_AP81=y
|
||||||
CONFIG_AR71XX_MACH_AP83=y
|
CONFIG_AR71XX_MACH_AP83=y
|
||||||
CONFIG_AR71XX_MACH_AW_NR580=y
|
CONFIG_AR71XX_MACH_AW_NR580=y
|
||||||
|
@ -1,9 +1,5 @@
|
|||||||
if ATHEROS_AR71XX
|
if ATHEROS_AR71XX
|
||||||
|
|
||||||
config AR71XX_EARLY_SERIAL
|
|
||||||
bool "Use early serial console"
|
|
||||||
default n
|
|
||||||
|
|
||||||
menu "Atheros AR71xx machine selection"
|
menu "Atheros AR71xx machine selection"
|
||||||
|
|
||||||
config AR71XX_MACH_AP81
|
config AR71XX_MACH_AP81
|
||||||
|
@ -140,7 +140,6 @@ void __init ar71xx_add_device_usb(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CONFIG_AR71XX_EARLY_SERIAL
|
|
||||||
static struct resource ar71xx_uart_resources[] = {
|
static struct resource ar71xx_uart_resources[] = {
|
||||||
{
|
{
|
||||||
.start = AR71XX_UART_BASE,
|
.start = AR71XX_UART_BASE,
|
||||||
@ -177,7 +176,6 @@ void __init ar71xx_add_device_uart(void)
|
|||||||
ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
|
ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
|
||||||
platform_device_register(&ar71xx_uart_device);
|
platform_device_register(&ar71xx_uart_device);
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_AR71XX_EARLY_SERIAL */
|
|
||||||
|
|
||||||
static struct resource ar71xx_mdio_resources[] = {
|
static struct resource ar71xx_mdio_resources[] = {
|
||||||
{
|
{
|
||||||
|
@ -50,12 +50,7 @@ void ar71xx_add_device_gpio_buttons(int id,
|
|||||||
struct gpio_button *buttons) __init;
|
struct gpio_button *buttons) __init;
|
||||||
|
|
||||||
void ar71xx_add_device_usb(void) __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;
|
void ar71xx_add_device_uart(void) __init;
|
||||||
#endif
|
|
||||||
|
|
||||||
void ar71xx_add_device_wdt(void) __init;
|
void ar71xx_add_device_wdt(void) __init;
|
||||||
|
|
||||||
|
@ -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)
|
const char *get_system_type(void)
|
||||||
{
|
{
|
||||||
return ar71xx_sys_type;
|
return ar71xx_sys_type;
|
||||||
@ -288,8 +268,6 @@ void __init plat_mem_setup(void)
|
|||||||
_machine_restart = ar71xx_restart;
|
_machine_restart = ar71xx_restart;
|
||||||
_machine_halt = ar71xx_halt;
|
_machine_halt = ar71xx_halt;
|
||||||
pm_power_off = ar71xx_halt;
|
pm_power_off = ar71xx_halt;
|
||||||
|
|
||||||
ar71xx_early_serial_setup();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init plat_time_init(void)
|
void __init plat_time_init(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user