From a5923cd54987a83d56da3c8723f9a1c090254b2f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 9 Dec 2016 14:29:21 +0100 Subject: [PATCH] ar71xx: remove PB92 reference design board support Due to flash size limitations, support for this board has not been functional for years Signed-off-by: Felix Fietkau --- .../ar71xx/base-files/etc/board.d/02_network | 1 - .../uci-defaults/03_network-switchX-migration | 1 - target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 - target/linux/ar71xx/config-4.4 | 1 - .../files/arch/mips/ath79/Kconfig.openwrt | 9 --- .../ar71xx/files/arch/mips/ath79/Makefile | 1 - .../ar71xx/files/arch/mips/ath79/mach-pb92.c | 70 ------------------- .../ar71xx/files/arch/mips/ath79/machtypes.h | 1 - target/linux/ar71xx/mikrotik/config-default | 1 - target/linux/ar71xx/nand/config-default | 1 - 10 files changed, 89 deletions(-) delete mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 440e00f5bf..2f603af817 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -146,7 +146,6 @@ ar71xx_setup_interfaces() ubnt-unifi-outdoor) ucidef_set_interface_lan "eth0 eth1" ;; - pb92|\ wzr-hp-g300nh2) ucidef_add_switch "switch0" \ "0@eth0" "1:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "2:wan" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration index c67555f963..f1b3ae1430 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration @@ -47,7 +47,6 @@ board=$(ar71xx_board_name) case "$board" in dir-825-c1|\ wzr-hp-g300nh2|\ -pb92|\ tl-wdr4300|\ tl-wr1041n-v2|\ wrt160nl|\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index cf84dadf04..7d3038216b 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -778,9 +778,6 @@ ar71xx_board_detect() { *"PB44 reference board") name="pb44" ;; - *PB92) - name="pb92" - ;; *"Qihoo 360 C301") name="qihoo-c301" ;; diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 5e0275aa06..f7df5f8316 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -135,7 +135,6 @@ CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y CONFIG_ATH79_MACH_PB44=y -CONFIG_ATH79_MACH_PB92=y CONFIG_ATH79_MACH_QIHOO_C301=y CONFIG_ATH79_MACH_R6100=y # CONFIG_ATH79_MACH_RB2011 is not set diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 4d82db2c76..86bfa14f6a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -182,15 +182,6 @@ config ATH79_MACH_PB42 select ATH79_DEV_GPIO_BUTTONS select ATH79_DEV_M25P80 -config ATH79_MACH_PB92 - bool "Atheros PB92 board support" - select SOC_AR724X - select ATH79_DEV_ETH - select ATH79_DEV_GPIO_BUTTONS - select ATH79_DEV_LEDS_GPIO - select ATH79_DEV_PB9X_PCI if PCI - select ATH79_DEV_USB - config ATH79_MACH_C55 bool "AirTight Networks C-55 support" select SOC_AR934X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index a39e8d2de7..63623ca3ce 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -140,7 +140,6 @@ obj-$(CONFIG_ATH79_MACH_OMY_X1) += mach-omy-x1.o obj-$(CONFIG_ATH79_MACH_ONION_OMEGA) += mach-onion-omega.o obj-$(CONFIG_ATH79_MACH_PB42) += mach-pb42.o obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o -obj-$(CONFIG_ATH79_MACH_PB92) += mach-pb92.o obj-$(CONFIG_ATH79_MACH_QIHOO_C301) += mach-qihoo-c301.o obj-$(CONFIG_ATH79_MACH_R6100) += mach-r6100.o obj-$(CONFIG_ATH79_MACH_RB2011) += mach-rb2011.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c deleted file mode 100644 index 2440f0b6d3..0000000000 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Atheros PB92 board support - * - * Copyright (C) 2010 Felix Fietkau - * Copyright (C) 2008-2009 Gabor Juhos - * Copyright (C) 2008 Imre Kaloz - * - * 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 - -#include "dev-eth.h" -#include "dev-gpio-buttons.h" -#include "dev-m25p80.h" -#include "dev-usb.h" -#include "machtypes.h" -#include "pci.h" - -#define PB92_KEYS_POLL_INTERVAL 20 /* msecs */ -#define PB92_KEYS_DEBOUNCE_INTERVAL (3 * PB92_KEYS_POLL_INTERVAL) - -#define PB92_GPIO_BTN_SW4 8 -#define PB92_GPIO_BTN_SW5 3 - -static struct gpio_keys_button pb92_gpio_keys[] __initdata = { - { - .desc = "sw4", - .type = EV_KEY, - .code = BTN_0, - .debounce_interval = PB92_KEYS_DEBOUNCE_INTERVAL, - .gpio = PB92_GPIO_BTN_SW4, - .active_low = 1, - }, { - .desc = "sw5", - .type = EV_KEY, - .code = BTN_1, - .debounce_interval = PB92_KEYS_DEBOUNCE_INTERVAL, - .gpio = PB92_GPIO_BTN_SW5, - .active_low = 1, - } -}; - -static void __init pb92_init(void) -{ - u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000); - - ath79_register_m25p80(NULL); - - ath79_register_mdio(0, ~BIT(0)); - ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); - ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; - ath79_eth0_data.speed = SPEED_1000; - ath79_eth0_data.duplex = DUPLEX_FULL; - ath79_eth0_data.phy_mask = BIT(0); - - ath79_register_eth(0); - - ath79_register_gpio_keys_polled(-1, PB92_KEYS_POLL_INTERVAL, - ARRAY_SIZE(pb92_gpio_keys), - pb92_gpio_keys); - - ath79_register_usb(); - - ath79_register_pci(); -} - -MIPS_MACHINE(ATH79_MACH_PB92, "PB92", "Atheros PB92", pb92_init); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 5893790c61..9d829f9002 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -141,7 +141,6 @@ enum ath79_mach_type { ATH79_MACH_ONION_OMEGA, /* ONION OMEGA */ ATH79_MACH_PB42, /* Atheros PB42 */ ATH79_MACH_PB44, /* Atheros PB44 reference board */ - ATH79_MACH_PB92, /* Atheros PB92 */ ATH79_MACH_QIHOO_C301, /* Qihoo 360 C301 */ ATH79_MACH_R6100, /* NETGEAR R6100 */ ATH79_MACH_RB_2011G, /* Mikrotik RouterBOARD 2011UAS-2HnD */ diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default index aa898ee827..220239f86b 100644 --- a/target/linux/ar71xx/mikrotik/config-default +++ b/target/linux/ar71xx/mikrotik/config-default @@ -59,7 +59,6 @@ # CONFIG_ATH79_MACH_OM5P is not set # CONFIG_ATH79_MACH_PB42 is not set # CONFIG_ATH79_MACH_PB44 is not set -# CONFIG_ATH79_MACH_PB92 is not set # CONFIG_ATH79_MACH_QIHOO_C301 is not set # CONFIG_ATH79_MACH_R6100 is not set CONFIG_ATH79_MACH_RB2011=y diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default index 49480f2be8..1759f0e6a3 100644 --- a/target/linux/ar71xx/nand/config-default +++ b/target/linux/ar71xx/nand/config-default @@ -35,7 +35,6 @@ # CONFIG_ATH79_MACH_OM2P is not set # CONFIG_ATH79_MACH_PB42 is not set # CONFIG_ATH79_MACH_PB44 is not set -# CONFIG_ATH79_MACH_PB92 is not set # CONFIG_ATH79_MACH_RW2458N is not set # CONFIG_ATH79_MACH_TEW_632BRP is not set # CONFIG_ATH79_MACH_TEW_673GRU is not set -- 2.25.1