From patchwork Mon Feb 16 18:19:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. D. Pinney" X-Patchwork-Id: 440314 X-Patchwork-Delegate: luka@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D2411140216 for ; Tue, 17 Feb 2015 05:17:53 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1743028BCE1; Mon, 16 Feb 2015 19:17:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 69AD428BCC7 for ; Mon, 16 Feb 2015 19:17:02 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-ob0-f179.google.com (mail-ob0-f179.google.com [209.85.214.179]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 16 Feb 2015 19:17:02 +0100 (CET) Received: by mail-ob0-f179.google.com with SMTP id wp4so44905181obc.10 for ; Mon, 16 Feb 2015 10:17:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=dQvTWEPVJOFp9jnBa8RSH9yN67DrQchXvV95KLmIxpc=; b=VXLsszSF345mUw8s1XZAFqBPweXmGRtOJEL4x1JKKh5tkGN4F0aUoN0CUJJEDhVLpa v0UmrKZsg0tgZ81ze8qDm2iYcYIWZF8Fib793xqLB6n14v9HGjTW7NLPB+mooWlUKfwK BHX3v4KyZtjE431lsSx2rQQfCuwUp5McWrV24A1Pn/kh9dP+6VjNvHX4DsZcPtZQo2rQ YTNhe73kPz6yEPL9LikvGxZ4eD7zWczNjxreHiBznCjgBSKy5abFWUc/usNgCA2UzHeF i74Y94fWD7EeIKGqOUr+hRj8NDrMcfiK9M2eNpzfZ6IwTVLIKjklKqEXj49nPr18Yh9M IqCQ== X-Received: by 10.202.183.138 with SMTP id h132mr15593292oif.132.1424110622537; Mon, 16 Feb 2015 10:17:02 -0800 (PST) Received: from brown.lan ([72.192.76.134]) by mx.google.com with ESMTPSA id rt10sm9659311obb.7.2015.02.16.10.17.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Feb 2015 10:17:02 -0800 (PST) From: "L. D. Pinney" To: OpenWrt Development List Date: Mon, 16 Feb 2015 12:19:54 -0600 Message-Id: <1424110794-2256-1-git-send-email-ldpinney@gmail.com> X-Mailer: git-send-email 2.1.3 Subject: [OpenWrt-Devel] [PATCH][v2] BB : kirkwood : Seagate GoFlex Net "Board Name" and cleanup X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Add the diag.sh file for failsafe LEDs. Cleanup uci-defaults for network and LEDs. Sets the "fault" LEDs in uci-defaults to off Add the GoFlex Net "Board Name" Remove kmod-rtc-marvell from default packages, as the GoFlex net does not have a Real Time Clock. V2 adds led "name" in uci-defaults missing from V1. Signed-off-by: L. D. Pinney --- target/linux/kirkwood/base-files/etc/diag.sh | 37 +++++++++++++++++++++++++++++++++++++ target/linux/kirkwood/base-files/etc/uci-defaults/01_leds | 17 ++++++++++------- target/linux/kirkwood/base-files/etc/uci-defaults/02_network | 13 ++++--------- target/linux/kirkwood/base-files/lib/kirkwood.sh | 4 ++++ target/linux/kirkwood/profiles/110-nas.mk | 2 +- 5 files changed, 56 insertions(+), 17 deletions(-) diff --git a/target/linux/kirkwood/base-files/etc/diag.sh b/target/linux/kirkwood/base-files/etc/diag.sh new file mode 100755 index 0000000..29445d5 --- /dev/null +++ b/target/linux/kirkwood/base-files/etc/diag.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Copyright (C) 2014 OpenWrt.org + +. /lib/functions/leds.sh +. /lib/kirkwood.sh + +get_status_led() { + case $(kirkwood_board_name) in + dockstar|\ + goflexnet|\ + pogo_e02) + status_led="status:orange:fault" + ;; + ea4500) + status_led="ea4500:white:health" + ;; + esac +} + +set_state() { + get_status_led + + case "$1" in + preinit) + status_led_blink_preinit + ;; + failsafe) + status_led_blink_failsafe + ;; + preinit_regular) + status_led_blink_preinit_regular + ;; + done) + status_led_on + ;; + esac +} diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds index 07c1a0e..9961913 100644 --- a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds +++ b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds @@ -9,22 +9,25 @@ board=$(kirkwood_board_name) case "$board" in -"dockstar") - ucidef_set_led_default "health" "status:green:health" "1" - ucidef_set_led_default "fault" "status:orange:fault" "1" +"dockstar"|\ +"pogo_e02") + ucidef_set_led_default "health" "health" "status:green:health" "1" + ucidef_set_led_default "fault" "fault" "status:orange:fault" "0" ;; "ea4500") ucidef_set_led_default "health" "ea4500:white:health" "1" ucidef_set_led_default "pulse" "ea4500:white:pulse" "1" ;; +"goflexnet") + ucidef_set_led_default "health" "health" "status:green:health" "1" + ucidef_set_led_default "fault" "fault" "status:orange:fault" "0" + ucidef_set_led_default "status" "status" "status:white:misc" "0" + ;; "ib62x0") ucidef_set_led_default "health" "ib62x0:green:os" "1" ucidef_set_led_default "fault" "ib62x0:red:os" "1" ;; -"pogo_e02") - ucidef_set_led_default "health" "status:green:health" "1" - ucidef_set_led_default "fault" "status:orange:fault" "1" - ;; + *) ;; esac diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network index e795d65..cff31a8 100644 --- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network +++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network @@ -28,15 +28,10 @@ board=$(kirkwood_board_name) ucidef_set_interface_loopback case "$board" in -"dockstar") - set_lan_dhcp "eth0" - ;; -"iconnect") - set_lan_dhcp "eth0" - ;; -"ib62x0") - set_lan_dhcp "eth0" - ;; +"dockstar"|\ +"goflexnet"|\ +"iconnect"|\ +"ib62x0"|\ "pogo_e02") set_lan_dhcp "eth0" ;; diff --git a/target/linux/kirkwood/base-files/lib/kirkwood.sh b/target/linux/kirkwood/base-files/lib/kirkwood.sh index ba080f4..e2a84a7 100755 --- a/target/linux/kirkwood/base-files/lib/kirkwood.sh +++ b/target/linux/kirkwood/base-files/lib/kirkwood.sh @@ -17,6 +17,10 @@ kirkwood_board_detect() { name="dockstar" ;; + "Seagate GoFlex Net") + name="goflexnet" + ;; + "Iomega Iconnect") name="iconnect" ;; diff --git a/target/linux/kirkwood/profiles/110-nas.mk b/target/linux/kirkwood/profiles/110-nas.mk index eff5952..daad904 100644 --- a/target/linux/kirkwood/profiles/110-nas.mk +++ b/target/linux/kirkwood/profiles/110-nas.mk @@ -25,7 +25,7 @@ define Profile/GOFLEXNET NAME:=Seagate GoFlexNet PACKAGES:= \ kmod-ata-core kmod-ata-marvell-sata \ - kmod-rtc-marvell kmod-usb2 kmod-usb-storage \ + kmod-usb2 kmod-usb-storage \ uboot-envtools endef