diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-03-11 21:41:20 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-03-11 21:41:20 +0000 |
| commit | 3b8cd0e6ca9fa61b282ebda2731d29dbd7724043 (patch) | |
| tree | 8adbf3750b5e9df28b2474482aff405cfeaff4f4 | |
| parent | 49368c0c2a008644860bca48bfa68f4bbae769fe (diff) | |
| download | upstream-3b8cd0e6ca9fa61b282ebda2731d29dbd7724043.tar.gz upstream-3b8cd0e6ca9fa61b282ebda2731d29dbd7724043.tar.bz2 upstream-3b8cd0e6ca9fa61b282ebda2731d29dbd7724043.zip | |
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@gmail.com>
Backport of r49006
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49007 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/brcm47xx/image/Makefile | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index c603396d0d..42a239e87b 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -149,6 +149,19 @@ define Device/Default IMAGE/trx := trx-with-loader endef +define Device/standard +endef + +define Device/standard-noloader-gz + KERNEL_NAME = vmlinux.gz + IMAGE/trx := trx-without-loader +endef + +define Device/standard-noloader-nodictionarylzma + KERNEL_NAME = vmlinux-nodictionary.lzma + IMAGE/trx := trx-without-loader +endef + define Device/asus IMAGES := trx IMAGE/trx := trx-with-loader | asus-trx @@ -217,6 +230,8 @@ ifeq ($(SUBTARGET),generic) # BCMA SoC with SSB WiFi $(eval $(call LinksysDevice,wrt610n-v2,610N,2.0.0)) $(eval $(call LinksysDevice,e3000-v1,61XN,1.0.3)) + + TARGET_DEVICES += standard endif ################################################# @@ -308,6 +323,8 @@ ifeq ($(SUBTARGET),legacy) $(eval $(call NetgearDevice,wgr614-v8,U12H072T00_NETGEAR,2)) $(eval $(call NetgearDevice,wndr3300-v1,U12H093T00_NETGEAR,2)) $(eval $(call NetgearDevice,wnr834b-v2,U12H081T00_NETGEAR,2)) + + TARGET_DEVICES += standard standard-noloader-gz endif ################################################# @@ -366,6 +383,8 @@ ifeq ($(SUBTARGET),mips74k) # $(eval $(call NetgearDevice,wnr3500u,U12H136T00_NETGEAR,2)) $(eval $(call NetgearDevice,wnr3500-v2,U12H127T00_NETGEAR,2)) # $(eval $(call NetgearDevice,wnr3500-v2-vc,U12H127T70_NETGEAR,2)) + + TARGET_DEVICES += standard standard-noloader-nodictionarylzma endif ################################################# @@ -379,15 +398,7 @@ endef # $(1): filesystem type. define Image/Build - $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \ - -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ - $(call trxalign/$(1),$(1)) - $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-noloader-nodictionary.trx \ - -f $(KDIR)/vmlinux-nodictionary.lzma \ - $(call trxalign/$(1),$(1)) - $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx \ - -f $(KDIR)/vmlinux.gz \ - $(call trxalign/$(1),$(1)) + # TODO: Move it to Device/* ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(call Image/Build/Initramfs) endif |