Changeset 49006


Ignore:
Timestamp:
2016-03-11T22:31:34+01:00 (23 months 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@…>

File:
1 edited

Legend:

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

    r48975 r49006  
    142142endef 
    143143 
     144define Device/standard 
     145endef 
     146 
     147define Device/standard-noloader-gz 
     148        KERNEL_NAME = vmlinux.gz 
     149        IMAGE/trx := trx-without-loader 
     150endef 
     151 
     152define Device/standard-noloader-nodictionarylzma 
     153        KERNEL_NAME = vmlinux-nodictionary.lzma 
     154        IMAGE/trx := trx-without-loader 
     155endef 
     156 
    144157define Device/asus 
    145158        IMAGES := trx 
     
    210223  $(eval $(call LinksysDevice,wrt610n-v2,610N,2.0.0)) 
    211224  $(eval $(call LinksysDevice,e3000-v1,61XN,1.0.3)) 
     225 
     226  TARGET_DEVICES += standard 
    212227endif 
    213228 
     
    301316  $(eval $(call NetgearDevice,wndr3300-v1,U12H093T00_NETGEAR,2)) 
    302317  $(eval $(call NetgearDevice,wnr834b-v2,U12H081T00_NETGEAR,2)) 
     318 
     319  TARGET_DEVICES += standard standard-noloader-gz 
    303320endif 
    304321 
     
    360377  $(eval $(call NetgearDevice,wnr3500-v2,U12H127T00_NETGEAR,2)) 
    361378#  $(eval $(call NetgearDevice,wnr3500-v2-vc,U12H127T70_NETGEAR,2)) 
     379 
     380  TARGET_DEVICES += standard standard-noloader-nodictionarylzma 
    362381endif 
    363382 
     
    380399# $(1): filesystem type. 
    381400define Image/Build 
    382         $(STAGING_DIR_HOST)/bin/trx \ 
    383                 -m 33554432 \ 
    384                 -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \ 
    385                 -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ 
    386                 $(call trxalign/$(1),$(1)) 
    387         $(STAGING_DIR_HOST)/bin/trx \ 
    388                 -m 33554432 \ 
    389                 -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-noloader-nodictionary.trx \ 
    390                 -f $(KDIR)/vmlinux-nodictionary.lzma \ 
    391                 $(call trxalign/$(1),$(1)) 
    392         $(STAGING_DIR_HOST)/bin/trx \ 
    393                 -m 33554432 \ 
    394                 -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx \ 
    395                 -f $(KDIR)/vmlinux.gz \ 
    396                 $(call trxalign/$(1),$(1)) 
     401        # TODO: Move it to Device/* 
    397402ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) 
    398403        $(call Image/Build/Initramfs) 
Note: See TracChangeset for help on using the changeset viewer.