Changeset 40762


Ignore:
Timestamp:
2014-05-14T12:08:56+02:00 (4 years ago)
Author:
hauke
Message:

brcm47xx: image: respect device flash block size

We should be more careful and don't generate 128K JFFS2 images for
devices with flashes using 64K blocks (nor the other way).

Signed-off-by: Rafał Miłecki <zajec5@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/image/Makefile

    r40761 r40762  
    7272endef 
    7373 
     74# $(1): filesystem type. 
     75# $(2): device model (used for output file). 
     76# $(3): board_id (device specific magic). 
     77# $(4): region. 
     78# $(5): simplified filesystem type (without block size). 
     79define Image/Build/Chk 
     80        $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(2)-$(5).chk -k $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx -b $(3) -r $(4) 
     81endef 
     82 
    7483define trxalign/jffs2-128k 
    7584-a 0x20000 -f $(KDIR)/root.$(1) 
     
    100109# $(1): filesystem type. 
    101110define Image/Build/jffs2-64k 
     111        $(call Image/Build/Chk,$(1),wgr614_v8,U12H072T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     112        $(call Image/Build/Chk,$(1),wndr3300_v1,U12H093T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     113        $(call Image/Build/Chk,$(1),wndr3400_v1,U12H155T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     114        $(call Image/Build/Chk,$(1),wndr3400_v2,U12H187T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     115        $(call Image/Build/Chk,$(1),wndr3700_v3,U12H194T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     116        $(call Image/Build/Chk,$(1),wndr4000,U12H181T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     117        $(call Image/Build/Chk,$(1),wnr834b_v2,U12H081T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     118        $(call Image/Build/Chk,$(1),wnr2000v2,U12H114T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     119        $(call Image/Build/Chk,$(1),wnr3500L,U12H136T99_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
     120        $(call Image/Build/Chk,$(1),wnr3500v2,U12H127T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    102121        $(call Image/Build/CyberTAN,$(1),wrt54g3g,W54F,2.20.1,$(patsubst jffs2-%,jffs2,$(1))) 
    103122        $(call Image/Build/CyberTAN,$(1),wrt54g3g-em,W3GN,2.20.1,$(patsubst jffs2-%,jffs2,$(1))) 
     
    126145        $(call Image/Build/CyberTAN,$(1),e3200_v1,3200,1.0.1,$(patsubst jffs2-%,jffs2,$(1))) 
    127146        $(call Image/Build/CyberTAN,$(1),e4200_v1,4200,1.0.5,$(patsubst jffs2-%,jffs2,$(1))) 
     147        $(call Image/Build/Huawei,$(1),e970,$(1)) 
    128148        $(call Image/Build/Motorola,$(1),wa840g,2,$(patsubst jffs2-%,jffs2,$(1))) 
    129149        $(call Image/Build/Motorola,$(1),we800g,3,$(patsubst jffs2-%,jffs2,$(1))) 
     150        $(call Image/Build/Motorola,$(1),wr850g,1,$(1)) 
     151        $(call Image/Build/USR,$(1),usr5461,$(1)) 
    130152        $(call Image/Build/Edi,$(1),ps1208mfg,$(patsubst jffs2-%,jffs2,$(1))) 
    131153        $(call Image/Build/dwl3150,$(1),$(patsubst jffs2-%,jffs2,$(1))) 
     
    143165 
    144166# $(1): filesystem type. 
    145 # $(2): device model (used for output file). 
    146 # $(3): board_id (device specific magic). 
    147 # $(4): region. 
    148 # $(5): simplified filesystem type (without block size). 
    149 define Image/Build/Chk 
    150         $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(2)-$(5).chk -k $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx -b $(3) -r $(4) 
    151 endef 
    152  
    153 # $(1): filesystem type. 
    154167define Image/Build 
    155168        $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \ 
     
    160173                $(call trxalign/$(1),$(1)) 
    161174        $(call Image/Build/$(1),$(1)) 
    162         $(call Image/Build/Motorola,$(1),wr850g,1,$(1)) 
    163         $(call Image/Build/USR,$(1),usr5461,$(1)) 
    164         $(call Image/Build/Huawei,$(1),e970,$(1)) 
    165         $(call Image/Build/Chk,$(1),wgr614_v8,U12H072T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    166175#       $(call Image/Build/Chk,$(1),wgr614_v9,U12H094T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    167         $(call Image/Build/Chk,$(1),wndr3300_v1,U12H093T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    168         $(call Image/Build/Chk,$(1),wndr3400_v1,U12H155T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    169         $(call Image/Build/Chk,$(1),wndr3400_v2,U12H187T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    170176#       $(call Image/Build/Chk,$(1),wndr3400_vcna,U12H155T01_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    171         $(call Image/Build/Chk,$(1),wndr3700_v3,U12H194T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    172         $(call Image/Build/Chk,$(1),wndr4000,U12H181T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    173         $(call Image/Build/Chk,$(1),wnr834b_v2,U12H081T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    174         $(call Image/Build/Chk,$(1),wnr2000v2,U12H114T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    175         $(call Image/Build/Chk,$(1),wnr3500L,U12H136T99_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    176177#       $(call Image/Build/Chk,$(1),wnr3500U,U12H136T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    177         $(call Image/Build/Chk,$(1),wnr3500v2,U12H127T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    178178#       $(call Image/Build/Chk,$(1),wnr3500v2_VC,U12H127T70_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) 
    179179ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) 
Note: See TracChangeset for help on using the changeset viewer.