From patchwork Wed Feb 27 22:18:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1049167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T39tXV7B"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 448qpc190sz9sBF for ; Thu, 28 Feb 2019 09:19:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=SPeyzlfR9ubbokyIuD4QzDcthIuxzAJZKK3bc72Qm2c=; b=T39tXV7B5C0gZDVADWKxM9qtZQ 1t1cIB6A0UVuOl6MniCTFi71ugGNVLxJW+nLjnl+erWZ1pfBqxHTF+6dolOAhJnOCGoB0iHCiePJ3 agdS6BkqZJsMAX9n4aNyZzDRXZntGO7dbYl8w47hUdHM+FHej96g11EENE6zhfp5bxIjecZ89H9MW hxCB99HBQVqxUxYwI2fmy5YIRWCcmF1T1JfAZp3C0YadvD1EdZx+4HiP5J6cRbzzZVwrXKbO2+PNf F97UGU3O0cBOcIJGLBqYP8kp+z3XN7ah4S5/gXRt1NyX/uTVaBbZn0c6LhRU1Pg8oDvcE44KMwM6y 3R8m44cA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gz7XV-0004ii-6D; Wed, 27 Feb 2019 22:18:57 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gz7Ws-0003o4-Cw for openwrt-devel@lists.openwrt.org; Wed, 27 Feb 2019 22:18:20 +0000 Received: from localhost.localdomain ([188.194.105.77]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MVdUQ-1gXilt3iaK-00Ra2C for ; Wed, 27 Feb 2019 23:18:13 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Wed, 27 Feb 2019 23:18:09 +0100 Message-Id: <20190227221809.1697-7-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190227221809.1697-1-freifunk@adrianschmutzler.de> References: <20190227221809.1697-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:SzOAEpbAZpf8X9MpkPzb+xZL5EzhF8QrbRqFCw9DeAdkkAxD9Tt Cp8PA9zOUijdNp9VKRL9dIYwFku88+V5M9Hie5djt4Uxx7UFNiSNOGGAKHJPulCqDBfg21Y M8wPjywjrruuySGvDi+EwxorexMwXtDAGG8JBRQMrEa1239kI19nVzWjy5NlxHf+0IKuPsa k7Cl9eeN9fQuFYON7jO2w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:wu3gjp1+9bI=:K1snnXG/yQlqit8rONp+YA wFPDqPFhb2INBy03NZdBHzKiKsNbRI2JiyGUctmzhiaXzC63eJ+B7cz5p15QwLHXiuyNFyYKa MU39HJpWqI3Y8oLB0/tKdvWNua93avExDQx2hpuPzgXhBpb5Za+tHhdXXDmMaQ1dOQV1Q/0Xw b6HQAeopr1sXgVIyP0WvrieJRibsnWKEXH2MRncEdevdobg91EWiqxVFpSXWgch+QBSagDzqB uyURBzTOnKS6cosLe/1RYwBKkDxOvweQDRlV7mUf1psncxOZO4nCAoZCQhELd4vd65aT721eh 1LbHK8qVz1ax8dSTxD1iqvP03kthQ24XeYZMPOcpuQoBZgBfmc5USa0mOz0MKqrp4gEynIJ94 HfhswGnP7he03gHQpr1SKJYYss6VbvzMz6Nju8k0qmF5+Tfro8YzdTL5/II32RKXweWsjW9Ux QxAZsfR4v2SNW/AtfJqDCvHRvm3/Dar22AUqrTkt2CAUY/eOCiFhkqq4yDh9x0KnMJQ4w2+3H N0fXBDx57d5kgp/Zk2araKhTtmVjuTqH/MTyvw69ZZ99sTgDrhAZ82FCt6Meh9fIGB1+FTphC ULsB1daFzrVGtJY6UmW5yTJkePdsMDE6W7xB8GP3OSYb1d7OyaIKm5wd/FAf+eHRU8IUbnBVl D4KoNtcd2JhhmBdeh79vvoULLiqhD+y+EzY0MnrCrcn2HtMi5BFdaE9Av1ot10WDrfKelZoRb OAFUwR1elzIp3FfmrOG0sChnxN234Yk+6oq6EtCEOsf3va86M3m15xdgMF+t1V1m/u9h39i6J kjEy6n0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190227_141818_736560_686BFC98 X-CRM114-Status: GOOD ( 12.04 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.13 listed in list.dnswl.org] Subject: [OpenWrt-Devel] [PATCH v3 6/6] ramips: Merge ath9k-eeprom extraction to common eeprom.sh X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This uses the common eeprom extraction functions in eeprom.sh. As a by-product, this will bring the speed enhancement through blockwise reading to the ramips target. This patch is based on the proposed unification by Petr Štetiar. Signed-off-by: Adrian Schmutzler --- New in v3: This is cut out from Petr's initial unification proposal, as I do not own a ramips device to test. --- .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 32 +++++----------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 13a4687251..60b0e68bff 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -1,24 +1,5 @@ #!/bin/sh -rt2x00_eeprom_die() { - echo "rt2x00 eeprom: " "$*" - exit 1 -} - -rt2x00_eeprom_extract() { - local part=$1 - local offset=$2 - local count=$3 - local mtd - - mtd=$(find_mtd_part $part) - [ -n "$mtd" ] || \ - rt2x00_eeprom_die "no mtd device found for partition $part" - - dd if=$mtd of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count 2>/dev/null || \ - rt2x00_eeprom_die "failed to extract from $mtd" -} - jboot_eeprom_extract() { local part=$1 local offset=$2 @@ -26,21 +7,21 @@ jboot_eeprom_extract() { mtd=$(find_mtd_part $part) [ -n "$mtd" ] || \ - rt2x00_eeprom_die "no mtd device found for partition $part" + eeprom_die "no mtd device found for partition $part" jboot_config_read -i $mtd -o $offset -e /lib/firmware/$FIRMWARE 2>/dev/null || \ - rt2x00_eeprom_die "failed to extract from $mtd" + eeprom_die "failed to extract from $mtd" } rt2x00_eeprom_set_macaddr() { local macaddr=$1 [ -n "$macaddr" ] || \ - rt2x00_eeprom_die "invalid wlan mac address" + eeprom_die "invalid wlan mac address" macaddr_2bin $macaddr | dd of=/lib/firmware/$FIRMWARE \ conv=notrunc bs=1 seek=4 count=6 2>/dev/null || \ - rt2x00_eeprom_die "failed to write mac address to eeprom file" + eeprom_die "failed to write mac address to eeprom file" } FW="/lib/firmware/$FIRMWARE" @@ -48,6 +29,7 @@ FW="/lib/firmware/$FIRMWARE" . /lib/functions.sh . /lib/functions/system.sh +. /lib/functions/eeprom.sh board=$(board_name) @@ -67,11 +49,11 @@ case "$FIRMWARE" in ;; tiny-ac) wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR) - rt2x00_eeprom_extract "factory" 0 512 + mtd_eeprom_extract "factory" 0 512 rt2x00_eeprom_set_macaddr $wifi_mac ;; *) - rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!" + eeprom_die "Please define mtd-eeprom in $board DTS file!" ;; esac ;;