Changeset 49007


Ignore:
Timestamp:
2016-03-11T22:41:20+01:00 (2 years ago)
Author:
rmilecki
Message:

brcm47xx: image: create standard TRX images using new building system

Apart from using our new building system there are 2 more changes:

1) Limit amount of images
So far we were generating all standard images (optimized one and two
with no loader) for every SUBTARGET. This is not needed, as e.g. the
only device requiring gzipped kernel is legacy Huawei E970.

2) Change output names
The new image building system requires specifying device name. This
forced picking some and resulted in:
openwrt-brcm47xx-$(SUBTARGET)-squashfs.trx
openwrt-brcm47xx-$(SUBTARGET)-squashfs-gz.trx
openwrt-brcm47xx-$(SUBTARGET)-squashfs-noloader-nodictionary.trx
becoming:
openwrt-brcm47xx-$(SUBTARGET)-standard-squashfs.trx
openwrt-brcm47xx-$(SUBTARGET)-standard-noloader-gz-squashfs.trx
openwrt-brcm47xx-$(SUBTARGET)-standard-noloader-nodictionarylzma-squashfs.trx

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

Backport of r49006

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/chaos_calmer/target/linux/brcm47xx/image/Makefile

    r49003 r49007  
    150150endef 
    151151 
     152define Device/standard 
     153endef 
     154 
     155define Device/standard-noloader-gz 
     156        KERNEL_NAME = vmlinux.gz 
     157        IMAGE/trx := trx-without-loader 
     158endef 
     159 
     160define Device/standard-noloader-nodictionarylzma 
     161        KERNEL_NAME = vmlinux-nodictionary.lzma 
     162        IMAGE/trx := trx-without-loader 
     163endef 
     164 
    152165define Device/asus 
    153166        IMAGES := trx 
     
    218231  $(eval $(call LinksysDevice,wrt610n-v2,610N,2.0.0)) 
    219232  $(eval $(call LinksysDevice,e3000-v1,61XN,1.0.3)) 
     233 
     234  TARGET_DEVICES += standard 
    220235endif 
    221236 
     
    309324  $(eval $(call NetgearDevice,wndr3300-v1,U12H093T00_NETGEAR,2)) 
    310325  $(eval $(call NetgearDevice,wnr834b-v2,U12H081T00_NETGEAR,2)) 
     326 
     327  TARGET_DEVICES += standard standard-noloader-gz 
    311328endif 
    312329 
     
    367384  $(eval $(call NetgearDevice,wnr3500-v2,U12H127T00_NETGEAR,2)) 
    368385#  $(eval $(call NetgearDevice,wnr3500-v2-vc,U12H127T70_NETGEAR,2)) 
     386 
     387  TARGET_DEVICES += standard standard-noloader-nodictionarylzma 
    369388endif 
    370389 
     
    380399# $(1): filesystem type. 
    381400define Image/Build 
    382         $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \ 
    383                 -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ 
    384                 $(call trxalign/$(1),$(1)) 
    385         $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-noloader-nodictionary.trx \ 
    386                 -f $(KDIR)/vmlinux-nodictionary.lzma \ 
    387                 $(call trxalign/$(1),$(1)) 
    388         $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx \ 
    389                 -f $(KDIR)/vmlinux.gz \ 
    390                 $(call trxalign/$(1),$(1)) 
     401        # TODO: Move it to Device/* 
    391402ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) 
    392403        $(call Image/Build/Initramfs) 
Note: See TracChangeset for help on using the changeset viewer.