Ignore:
Timestamp:
2012-04-04T18:06:25+02:00 (4 years ago)
Author:
florian
Message:

[orion] update wrt350nv2-builder to v2.4 and use new functionality for target orion_generic

Signed-off-by: Matthias Bücher <mail@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/orion/image/generic.mk

    r23883 r31199  
    11# 
    2 # Copyright (C) 2008-2010 OpenWrt.org 
     2# Copyright (C) 2008-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    66# 
    77 
     8### DO NOT INDENT LINES CONTAINING $(call xyz) AS THIS MAY CHANGE THE CONTEXT 
     9### OF THE FIRST LINE IN THE CALLED VARIABLE (NOTE: variable!) 
     10### see http://www.gnu.org/software/make/manual/html_node/Call-Function.html#Call-Function 
     11### ACTUALLY IT IS A SIMPLE MACRO EXPANSION 
     12 
     13### use round brackets for make variables, and curly brackets for shell variables 
     14 
    815define Image/Prepare 
     16### Dummy comment for indented calls of Image/Prepare 
    917        cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage 
    1018endef 
    1119 
    1220define Image/BuildKernel 
     21### Dummy comment for indented calls of Image/BuildKernel 
    1322        # Orion Kernel uImages 
    1423 # WRT350N v2: mach id 1633 (0x661) 
     
    5261        mkdir "${TMP_DIR}/$2_webupgrade" 
    5362 # create parameter file 
    54         echo ":kernel $5 ${BIN_DIR}/openwrt-$2-uImage" >"${TMP_DIR}/$2_webupgrade/$2.par" 
    55         echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par" 
     63        echo ':image 0 $(BIN_DIR)/openwrt-$(2)-$(1).img' >'$(TMP_DIR)/$(2)_webupgrade/$(2).par' 
    5664        [ ! -f "$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" ] || ( \ 
    5765                echo ":u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" >>"${TMP_DIR}/$2_webupgrade/$2.par"; ) 
     
    5967 # create bin file for recovery and webupgrade image 
    6068        ( cd "${TMP_DIR}/$2_webupgrade"; \ 
    61                 "${STAGING_DIR_HOST}/bin/$2-builder" \ 
     69                "${STAGING_DIR_HOST}/bin/wrt350nv2-builder" \ 
    6270                        -v -b "${TMP_DIR}/$2_webupgrade/$2.par"; \ 
    6371        ) 
     
    6573        $(CP) "${TMP_DIR}/$2_webupgrade/wrt350n.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin" 
    6674 # create webupgrade image for stock firmware update mechanism 
    67         zip "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${TMP_DIR}/$2_webupgrade/wrt350n.bin" 
    68         "${STAGING_DIR_HOST}/bin/$2-builder" -v -z "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${BIN_DIR}/openwrt-$2-$1-webupgrade.img" 
     75        ( cd '$(TMP_DIR)/$(2)_webupgrade'; \ 
     76                zip 'wrt350n.zip' 'wrt350n.bin'; \ 
     77        ) 
     78        "${STAGING_DIR_HOST}/bin/wrt350nv2-builder" -v -z "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${BIN_DIR}/openwrt-$2-$1-webupgrade.img" 
    6979        rm -rf "${TMP_DIR}/$2_webupgrade" 
    7080endef 
    7181 
    7282define Image/Build 
     83### Dummy comment for indented calls of Image/Build with $(1) 
    7384$(call Image/Build/$(1),$(1)) 
    7485$(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1)) 
Note: See TracChangeset for help on using the changeset viewer.