Changeset 35783


Ignore:
Timestamp:
2013-02-25T14:41:54+01:00 (5 years ago)
Author:
blogic
Message:

[lantiq] fixes lantiq dsl firmware naming conventions

Signed-off-by: John Crispin <blogic@…>

Location:
branches/attitude_adjustment/package
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/attitude_adjustment/package/ltq-dsl-app/files/dsl_control

    r33594 r35783  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2008 OpenWrt.org 
     2# Copyright (C) 2012 OpenWrt.org 
     3 
    34START=99 
    4  
    5 . /lib/functions.sh 
    65 
    76EXTRA_COMMANDS="status lucistat" 
     
    279278start() { 
    280279        local annex 
    281         local fwannex 
     280        local firmware 
    282281        local xtu 
    283282        config_load network 
    284         config_get annex adsl annex 
    285         config_get fwannex adsl fwannex 
     283        config_get annex wan annex 
     284        config_get firmware wan firmware 
    286285 
    287286        # get xtu 
    288287        eval "xtu=\"\${annex_$annex}\"" 
    289288 
    290         # check for invalid annex mode 
    291         [ -n "${annex}" -a -z "${xtu}" ] && 
    292                 echo "unknown annex mode $annex" 
    293  
    294         # check for invalid fw annex mode 
    295         [[ "$fwannex" != "a" && "$fwannex" != "b" ]] && 
    296                 echo "invalid fwannex: $fwannex" 
     289        # check for firmware 
     290        [ -z "${firmware}" ] && 
     291                firmware=adsl.bin 
    297292 
    298293        # start CPE dsl daemon in the background 
    299294        service_start /sbin/dsl_cpe_control -i${xtu} \ 
    300295                        -n /sbin/dsl_notify.sh \ 
    301                         -f /lib/firmware/dsl-fw-${fwannex}.bin 
     296                        -f /lib/firmware/${firmware} 
    302297} 
    303298 
     
    310305        DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \ 
    311306        DSL_INTERFACE_STATUS="DOWN" \ 
    312         /sbin/dsl_notify.sh 
     307                /sbin/dsl_notify.sh 
    313308 
    314309        service_stop /sbin/dsl_cpe_control 
  • branches/attitude_adjustment/package/ltq-dsl/Makefile

    r30518 r35783  
    162162        $(INSTALL_DIR) $(1)/lib/firmware/ 
    163163        $(CP) $(PKG_BUILD_DIR)/$(FW_NAME)/ltq-dsl-fw-$(BUILD_VARIANT).bin $(1)/lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin 
    164         ln -s /lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin $(1)/lib/firmware/ModemHWE.bin 
     164        ln -s /lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin $(1)/lib/firmware/adsl.bin 
    165165endef 
    166166 
Note: See TracChangeset for help on using the changeset viewer.