aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ar71xx')
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/board.d/02_network2
-rw-r--r--target/linux/ar71xx/base-files/etc/diag.sh2
-rw-r--r--target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration3
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh8
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/ar71xx/config-4.43
-rw-r--r--target/linux/ar71xx/config-4.93
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt14
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/Makefile3
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-gs-minibox-v1.c85
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite-v1.c143
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c103
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/machtypes.h4
-rw-r--r--target/linux/ar71xx/generic/config-default3
-rw-r--r--target/linux/ar71xx/image/generic.mk25
15 files changed, 170 insertions, 233 deletions
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 04673fbbab..42b40e35ff 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -28,7 +28,7 @@ ar71xx_setup_interfaces()
mc-mac1200r|\
minibox-v1|\
mynet-n600|\
- oolite|\
+ oolite-v1|\
qihoo-c301|\
r602n|\
rb-750|\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 3550f7dc65..38df0c15d1 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -197,7 +197,7 @@ get_status_led() {
status_led="$board:green:sig4"
;;
dragino2|\
- oolite)
+ oolite-v1)
status_led="$board:red:system"
;;
dw33d|\
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
index b0b0e9a4c5..4dd224b549 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
@@ -55,6 +55,9 @@ dr344)
gl-ar150)
migrate_leds "gl-ar150:wlan=gl-ar150:orange:wlan" "gl-ar150:lan=gl-ar150:green:lan" "gl-ar150:wan=gl-ar150:green:wan"
;;
+oolite-v1)
+ migrate_leds "oolite:=${board}"
+ ;;
wndap360|\
wndr3700|\
wnr2000|\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index fda135072c..96b3e650f1 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -290,12 +290,6 @@ tplink_board_detect() {
"360000"*)
model="TP-Link TL-WDR3600"
;;
- "3C0001"*)
- model="OOLITE"
- ;;
- "3C0002"*)
- model="MINIBOX_V1"
- ;;
"430000"*)
model="TP-Link TL-WDR4300"
;;
@@ -866,7 +860,7 @@ ar71xx_board_detect() {
name="onion-omega"
;;
*"Oolite V1.0")
- name="oolite"
+ name="oolite-v1"
;;
*"Packet Squirrel")
name="packet-squirrel"
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index adc325b34c..c73dbd49ec 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -398,7 +398,7 @@ platform_check_image() {
omy-g1|\
omy-x1|\
onion-omega|\
- oolite|\
+ oolite-v1|\
packet-squirrel|\
re355|\
re450|\
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index dbfe6d7cb4..d49cebf812 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -123,8 +123,7 @@ CONFIG_ATH79=y
# CONFIG_ATH79_MACH_GL_INET is not set
# CONFIG_ATH79_MACH_GL_MIFI is not set
# CONFIG_ATH79_MACH_GL_USB150 is not set
-# CONFIG_ATH79_MACH_GS_MINIBOX_V1 is not set
-# CONFIG_ATH79_MACH_GS_OOLITE is not set
+# CONFIG_ATH79_MACH_GS_OOLITE_V1 is not set
# CONFIG_ATH79_MACH_HIVEAP_121 is not set
# CONFIG_ATH79_MACH_HIWIFI_HC6361 is not set
# CONFIG_ATH79_MACH_HORNET_UB is not set
diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9
index ccc6d43662..c6c5cf3ce3 100644
--- a/target/linux/ar71xx/config-4.9
+++ b/target/linux/ar71xx/config-4.9
@@ -121,8 +121,7 @@ CONFIG_ATH79=y
# CONFIG_ATH79_MACH_GL_INET is not set
# CONFIG_ATH79_MACH_GL_MIFI is not set
# CONFIG_ATH79_MACH_GL_USB150 is not set
-# CONFIG_ATH79_MACH_GS_MINIBOX_V1 is not set
-# CONFIG_ATH79_MACH_GS_OOLITE is not set
+# CONFIG_ATH79_MACH_GS_OOLITE_V1 is not set
# CONFIG_ATH79_MACH_HIVEAP_121 is not set
# CONFIG_ATH79_MACH_HIWIFI_HC6361 is not set
# CONFIG_ATH79_MACH_HORNET_UB 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 50cc00dca9..ed2d42e7f1 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -880,18 +880,8 @@ config ATH79_MACH_EAP300V2
select ATH79_DEV_M25P80
select ATH79_DEV_WMAC
-config ATH79_MACH_GS_MINIBOX_V1
- bool "Gainstrong MiniBox V1.0 support"
- select SOC_AR933X
- select ARH79_DEV_ETH
- select ARH79_DEV_GPIO_BUTTONS
- select ATH79_DEV_LEDS_GPIO
- select ATH79_DEV_M25P80
- select ATH79_DEV_USB
- select ATH79_DEV_WMAC
-
-config ATH79_MACH_GS_OOLITE
- bool "GS Oolite V1 support"
+config ATH79_MACH_GS_OOLITE_V1
+ bool "GainStrong Oolite/Minibox V1.0 support"
select SOC_AR933X
select ARH79_DEV_ETH
select ARH79_DEV_GPIO_BUTTONS
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
index 2e63f25399..54f4053b41 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
@@ -131,8 +131,7 @@ obj-$(CONFIG_ATH79_MACH_GL_DOMINO) += mach-gl-domino.o
obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o
obj-$(CONFIG_ATH79_MACH_GL_MIFI) += mach-gl-mifi.o
obj-$(CONFIG_ATH79_MACH_GL_USB150) += mach-gl-usb150.o
-obj-$(CONFIG_ATH79_MACH_GS_MINIBOX_V1) += mach-gs-minibox-v1.o
-obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o
+obj-$(CONFIG_ATH79_MACH_GS_OOLITE_V1) += mach-gs-oolite-v1.o
obj-$(CONFIG_ATH79_MACH_HIVEAP_121) += mach-hiveap-121.o
obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361) += mach-hiwifi-hc6361.o
obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-minibox-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-minibox-v1.c
deleted file mode 100644
index 47eeb65de8..0000000000
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-minibox-v1.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Gainstrong MiniBox V1.0 board support
- *
- *
- * 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 <linux/gpio.h>
-
-#include <asm/mach-ath79/ath79.h>
-#include <asm/mach-ath79/ar71xx_regs.h>
-
-#include "common.h"
-#include "dev-eth.h"
-#include "dev-gpio-buttons.h"
-#include "dev-leds-gpio.h"
-#include "dev-m25p80.h"
-#include "dev-usb.h"
-#include "dev-wmac.h"
-#include "machtypes.h"
-
-#define GS_MINIBOX_V1_GPIO_BTN_RESET 11
-
-#define GS_MINIBOX_V1_GPIO_LED_SYSTEM 1
-
-#define GS_MINIBOX_V1_KEYS_POLL_INTERVAL 20 /* msecs */
-#define GS_MINIBOX_V1_KEYS_DEBOUNCE_INTERVAL (3 * GS_MINIBOX_V1_KEYS_POLL_INTERVAL)
-
-static const char *gs_minibox_v1_part_probes[] = {
- "tp-link",
- NULL,
-};
-
-static struct flash_platform_data gs_minibox_v1_flash_data = {
- .part_probes = gs_minibox_v1_part_probes,
-};
-
-static struct gpio_led gs_minibox_v1_leds_gpio[] __initdata = {
- {
- .name = "minibox-v1:green:system",
- .gpio = GS_MINIBOX_V1_GPIO_LED_SYSTEM,
- .active_low = 1,
- },
-};
-
-static struct gpio_keys_button gs_minibox_v1_gpio_keys[] __initdata = {
- {
- .desc = "reset",
- .type = EV_KEY,
- .code = KEY_RESTART,
- .debounce_interval = GS_MINIBOX_V1_KEYS_DEBOUNCE_INTERVAL,
- .gpio = GS_MINIBOX_V1_GPIO_BTN_RESET,
- .active_low = 0,
- },
-};
-
-static void __init gs_minibox_v1_setup(void)
-{
- u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
- u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
- ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_minibox_v1_leds_gpio),
- gs_minibox_v1_leds_gpio);
-
- ath79_register_gpio_keys_polled(-1, GS_MINIBOX_V1_KEYS_POLL_INTERVAL,
- ARRAY_SIZE(gs_minibox_v1_gpio_keys),
- gs_minibox_v1_gpio_keys);
-
- ath79_register_usb();
-
- ath79_register_m25p80(&gs_minibox_v1_flash_data);
- ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
- ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
-
- ath79_register_mdio(0, 0x0);
- ath79_register_eth(1);
- ath79_register_eth(0);
-
- ath79_register_wmac(ee, mac);
-}
-
-MIPS_MACHINE(ATH79_MACH_GS_MINIBOX_V1, "MINIBOX-V1",
- "MiniBox V1.0", gs_minibox_v1_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite-v1.c
new file mode 100644
index 0000000000..d424e0f111
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite-v1.c
@@ -0,0 +1,143 @@
+/*
+ * GainStrong Oolite/MiniBox V1.0 boards support
+ *
+ *
+ * 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 <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "dev-usb.h"
+
+#define GS_MINIBOX_V1_GPIO_BTN_RESET 11
+#define GS_MINIBOX_V1_GPIO_LED_SYSTEM 1
+
+#define GS_OOLITE_V1_GPIO_BTN6 6
+#define GS_OOLITE_V1_GPIO_BTN7 7
+#define GS_OOLITE_V1_GPIO_BTN_RESET 11
+#define GS_OOLITE_V1_GPIO_LED_SYSTEM 27
+
+#define GS_KEYS_POLL_INTERVAL 20 /* msecs */
+#define GS_KEYS_DEBOUNCE_INTERVAL (3 * GS_KEYS_POLL_INTERVAL)
+
+static const char *gs_part_probes[] = {
+ "tp-link",
+ NULL,
+};
+
+static struct flash_platform_data gs_flash_data = {
+ .part_probes = gs_part_probes,
+};
+
+static struct gpio_led gs_minibox_v1_leds_gpio[] __initdata = {
+ {
+ .name = "minibox-v1:green:system",
+ .gpio = GS_MINIBOX_V1_GPIO_LED_SYSTEM,
+ .active_low = 1,
+ },
+};
+
+static struct gpio_led gs_oolite_v1_leds_gpio[] __initdata = {
+ {
+ .name = "oolite-v1:red:system",
+ .gpio = GS_OOLITE_V1_GPIO_LED_SYSTEM,
+ .active_low = 1,
+ },
+};
+
+static struct gpio_keys_button gs_minibox_v1_gpio_keys[] __initdata = {
+ {
+ .desc = "reset",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .debounce_interval = GS_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = GS_MINIBOX_V1_GPIO_BTN_RESET,
+ .active_low = 0,
+ },
+};
+
+static struct gpio_keys_button gs_oolite_v1_gpio_keys[] __initdata = {
+ {
+ .desc = "reset",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .debounce_interval = GS_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = GS_OOLITE_V1_GPIO_BTN_RESET,
+ .active_low = 0,
+ }, {
+ .desc = "BTN_6",
+ .type = EV_KEY,
+ .code = BTN_6,
+ .debounce_interval = GS_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = GS_OOLITE_V1_GPIO_BTN6,
+ .active_low = 0,
+ }, {
+ .desc = "BTN_7",
+ .type = EV_KEY,
+ .code = BTN_7,
+ .debounce_interval = GS_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = GS_OOLITE_V1_GPIO_BTN7,
+ .active_low = 0,
+ },
+};
+
+static void __init gs_common_setup(void)
+{
+ u8 *art = (u8 *) KSEG1ADDR(0x1fff1000);
+ u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+
+ ath79_register_usb();
+
+ ath79_register_m25p80(&gs_flash_data);
+
+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+ ath79_register_mdio(0, 0x0);
+ ath79_register_eth(1);
+ ath79_register_eth(0);
+
+ ath79_register_wmac(art, mac);
+}
+
+static void __init gs_minibox_v1_setup(void)
+{
+ gs_common_setup();
+
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_minibox_v1_leds_gpio),
+ gs_minibox_v1_leds_gpio);
+
+ ath79_register_gpio_keys_polled(-1, GS_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(gs_minibox_v1_gpio_keys),
+ gs_minibox_v1_gpio_keys);
+}
+
+static void __init gs_oolite_v1_setup(void)
+{
+ gs_common_setup();
+
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_oolite_v1_leds_gpio),
+ gs_oolite_v1_leds_gpio);
+
+ ath79_register_gpio_keys_polled(-1, GS_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(gs_oolite_v1_gpio_keys),
+ gs_oolite_v1_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_GS_MINIBOX_V1, "MINIBOX-V1", "GainStrong MiniBox V1.0",
+ gs_minibox_v1_setup);
+
+MIPS_MACHINE(ATH79_MACH_GS_OOLITE_V1, "OOLITE-V1", "GainStrong Oolite V1.0",
+ gs_oolite_v1_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c
deleted file mode 100644
index c6cb61c366..0000000000
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Oolite board support
- *
- *
- * 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 <linux/gpio.h>
-
-#include <asm/mach-ath79/ath79.h>
-#include <asm/mach-ath79/ar71xx_regs.h>
-
-#include "common.h"
-#include "dev-eth.h"
-#include "dev-gpio-buttons.h"
-#include "dev-leds-gpio.h"
-#include "dev-m25p80.h"
-#include "dev-wmac.h"
-#include "machtypes.h"
-#include "dev-usb.h"
-
-#define GS_OOLITE_GPIO_BTN6 6
-#define GS_OOLITE_GPIO_BTN7 7
-#define GS_OOLITE_GPIO_BTN_RESET 11
-
-#define GS_OOLITE_GPIO_LED_SYSTEM 27
-
-#define GS_OOLITE_KEYS_POLL_INTERVAL 20 /* msecs */
-#define GS_OOLITE_KEYS_DEBOUNCE_INTERVAL (3 * GS_OOLITE_KEYS_POLL_INTERVAL)
-
-static const char *gs_oolite_part_probes[] = {
- "tp-link",
- NULL,
-};
-
-static struct flash_platform_data gs_oolite_flash_data = {
- .part_probes = gs_oolite_part_probes,
-};
-
-static struct gpio_led gs_oolite_leds_gpio[] __initdata = {
- {
- .name = "oolite:red:system",
- .gpio = GS_OOLITE_GPIO_LED_SYSTEM,
- .active_low = 1,
- },
-};
-
-static struct gpio_keys_button gs_oolite_gpio_keys[] __initdata = {
- {
- .desc = "reset",
- .type = EV_KEY,
- .code = KEY_RESTART,
- .debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
- .gpio = GS_OOLITE_GPIO_BTN_RESET,
- .active_low = 0,
- },
- {
- .desc = "BTN_6",
- .type = EV_KEY,
- .code = BTN_6,
- .debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
- .gpio = GS_OOLITE_GPIO_BTN6,
- .active_low = 0,
- },
- {
- .desc = "BTN_7",
- .type = EV_KEY,
- .code = BTN_7,
- .debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
- .gpio = GS_OOLITE_GPIO_BTN7,
- .active_low = 0,
- },
-};
-
-static void __init gs_oolite_setup(void)
-{
- u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
- u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
- ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_oolite_leds_gpio),
- gs_oolite_leds_gpio);
-
- ath79_register_gpio_keys_polled(-1, GS_OOLITE_KEYS_POLL_INTERVAL,
- ARRAY_SIZE(gs_oolite_gpio_keys),
- gs_oolite_gpio_keys);
-
- ath79_register_usb();
-
- ath79_register_m25p80(&gs_oolite_flash_data);
- ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
- ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
-
- ath79_register_mdio(0, 0x0);
- ath79_register_eth(1);
- ath79_register_eth(0);
-
- ath79_register_wmac(ee, mac);
-}
-
-MIPS_MACHINE(ATH79_MACH_GS_OOLITE, "GS-OOLITE",
- "Oolite V1.0", gs_oolite_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
index 03020f889e..b3250053a6 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -126,8 +126,8 @@ enum ath79_mach_type {
ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */
ATH79_MACH_GL_MIFI, /* GL-MIFI support */
ATH79_MACH_GL_USB150, /* GL.iNet GL-USB150 */
- ATH79_MACH_GS_MINIBOX_V1, /* Gainstrong MiniBox V1.0 */
- ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */
+ ATH79_MACH_GS_MINIBOX_V1, /* GainStrong MiniBox V1.0 */
+ ATH79_MACH_GS_OOLITE_V1, /* GainStrong Oolite V1.0 */
ATH79_MACH_HIVEAP_121, /* Aerohive HiveAP-121*/
ATH79_MACH_HIWIFI_HC6361, /* HiWiFi HC6361 */
ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */
diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default
index 789e94d69f..658e120b96 100644
--- a/target/linux/ar71xx/generic/config-default
+++ b/target/linux/ar71xx/generic/config-default
@@ -94,8 +94,7 @@ CONFIG_ATH79_MACH_GL_DOMINO=y
CONFIG_ATH79_MACH_GL_INET=y
CONFIG_ATH79_MACH_GL_MIFI=y
CONFIG_ATH79_MACH_GL_USB150=y
-CONFIG_ATH79_MACH_GS_MINIBOX_V1=y
-CONFIG_ATH79_MACH_GS_OOLITE=y
+CONFIG_ATH79_MACH_GS_OOLITE_V1=y
CONFIG_ATH79_MACH_HIWIFI_HC6361=y
CONFIG_ATH79_MACH_HORNET_UB=y
CONFIG_ATH79_MACH_JA76PF=y
diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 539fd3c1fe..e1cd21d9cf 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -833,15 +833,25 @@ TARGET_DEVICES += mc-mac1200r
define Device/minibox-v1
$(Device/tplink-16mlzma)
- DEVICE_TITLE := Gainstrong MiniBox V1.0
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
+ DEVICE_TITLE := GainStrong MiniBox V1.0
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb2
BOARDNAME := MINIBOX-V1
DEVICE_PROFILE := MINIBOXV1
TPLINK_HWID := 0x3C000201
CONSOLE := ttyATH0,115200
+ IMAGES := sysupgrade.bin
endef
TARGET_DEVICES += minibox-v1
+define Device/oolite-v1
+ $(Device/minibox-v1)
+ DEVICE_TITLE := GainStrong Oolite V1.0
+ BOARDNAME := OOLITE-V1
+ DEVICE_PROFILE := OOLITEV1
+ TPLINK_HWID := 0x3C000101
+endef
+TARGET_DEVICES += oolite-v1
+
define Device/omy-g1
$(Device/tplink-16mlzma)
DEVICE_TITLE := OMYlink OMY-G1
@@ -959,17 +969,6 @@ define Device/tellstick-znet-lite
endef
TARGET_DEVICES += tellstick-znet-lite
-define Device/oolite
- $(Device/tplink-16mlzma)
- DEVICE_TITLE := Gainstrong OOLITE
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
- BOARDNAME := GS-OOLITE
- DEVICE_PROFILE := OOLITE
- TPLINK_HWID := 0x3C000101
- CONSOLE := ttyATH0,115200
-endef
-TARGET_DEVICES += oolite
-
define Device/n5q
DEVICE_TITLE := ALFA Network N5Q
DEVICE_PACKAGES := rssileds -swconfig
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 08:41:53 +0000