X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fimage%2FMakefile;h=72ac8141444865f1c1f4985deb9f6844f9a016b4;hb=ef4fc00c91bd669335cb0481f7ca29ddc2b053d1;hp=5d8e6ff7d5b8f8677f9cb254fb388bf7545e8219;hpb=bc6be3e953e778e338157f43febc7eecb1994cef;p=openwrt%2Fopenwrt.git diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index 5d8e6ff7d5..72ac814144 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -41,7 +41,7 @@ define trxalign/jffs2-64k -a 0x10000 -f $(KDIR)/root.$(1) endef define trxalign/squashfs --a 1024 -f $(KDIR)/root.$(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark +-a 1024 -f $(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark endef ################################################# @@ -51,10 +51,11 @@ endef define Build/trx-with-loader $(STAGING_DIR_HOST)/bin/trx \ -m 33554432 \ - -o $@ \ + -o $@.new \ -f $(KDIR)/loader.gz \ -f $(IMAGE_KERNEL) \ - $(call trxalign/$(FILESYSTEM),$(FILESYSTEM)) + $(call trxalign/$(FILESYSTEM),$@) + mv $@.new $@ endef define Build/trx-v2-with-loader @@ -64,16 +65,17 @@ define Build/trx-v2-with-loader -o $@.new \ -f $(KDIR)/loader.gz \ -f $(KDIR)/vmlinux.lzma \ - $(call trxalign/$(FILESYSTEM),$(FILESYSTEM),$@) + $(call trxalign/$(FILESYSTEM),$@,$@.pattern) mv $@.new $@ endef define Build/trx-without-loader $(STAGING_DIR_HOST)/bin/trx \ -m 33554432 \ - -o $@ \ + -o $@.new \ -f $(IMAGE_KERNEL) \ - $(call trxalign/$(FILESYSTEM),$(FILESYSTEM)) + $(call trxalign/$(FILESYSTEM),$@) + mv $@.new $@ endef define Build/asus-trx @@ -99,7 +101,7 @@ define Build/linksys-bin endef define Build/linksys-pattern-partition - $(STAGING_DIR_HOST)/bin/addpattern -5 -p $(DEVICE_ID) -v v$(VERSION) $(if $(SERIAL),-s $(SERIAL)) -i /dev/null -o $@ + $(STAGING_DIR_HOST)/bin/addpattern -5 -p $(DEVICE_ID) -v v$(VERSION) $(if $(SERIAL),-s $(SERIAL)) -i /dev/null -o $@.pattern endef define Build/motorola-bin @@ -136,9 +138,10 @@ define Device/Default KERNEL := kernel-bin IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2) KERNEL_NAME = vmlinux.lzma + KERNEL_INITRAMFS_NAME = vmlinux-initramfs.lzma FILESYSTEMS := $(FS_64K) IMAGES := trx - IMAGE/trx := trx-with-loader + IMAGE/trx := append-rootfs | trx-with-loader endef define Device/standard @@ -148,33 +151,33 @@ endef define Device/standard-noloader-gz DEVICE_TITLE := Image with gzipped kernel KERNEL_NAME = vmlinux.gz - IMAGE/trx := trx-without-loader + IMAGE/trx := append-rootfs | trx-without-loader endef define Device/standard-noloader-nodictionarylzma DEVICE_TITLE := Image with LZMA compressed kernel matching CFE decompressor KERNEL_NAME = vmlinux-nodictionary.lzma - IMAGE/trx := trx-without-loader + IMAGE/trx := append-rootfs | trx-without-loader endef define Device/asus IMAGES := trx - IMAGE/trx := trx-with-loader | asus-trx + IMAGE/trx := append-rootfs | trx-with-loader | asus-trx endef define Device/linksys IMAGES := bin - IMAGE/bin := trx-with-loader | linksys-bin + IMAGE/bin := append-rootfs | trx-with-loader | linksys-bin endef define Device/motorola IMAGES := bin - IMAGE/bin := trx-with-loader | motorola-bin + IMAGE/bin := append-rootfs | trx-with-loader | motorola-bin endef define Device/netgear IMAGES := chk - IMAGE/chk := trx-with-loader | netgear-chk + IMAGE/chk := append-rootfs | trx-with-loader | netgear-chk endef ################################################# @@ -307,7 +310,7 @@ TARGET_DEVICES += asus-wl-hdd25 define Device/dlink-dwl-3150 DEVICE_TITLE := D-Link DWL-3150 IMAGES := bin - IMAGE/bin := trx-with-loader | tailed-bin + IMAGE/bin := append-rootfs | trx-with-loader | tailed-bin BIN_TAIL := BCM-5352-2050-0000000-01 endef TARGET_DEVICES += dlink-dwl-3150 @@ -315,7 +318,7 @@ TARGET_DEVICES += dlink-dwl-3150 define Device/edimax-ps1208-mfg DEVICE_TITLE := Edimax PS-1208MFg IMAGES := bin - IMAGE/bin := trx-with-loader | edimax-bin + IMAGE/bin := append-rootfs | trx-with-loader | edimax-bin endef TARGET_DEVICES += edimax-ps1208-mfg @@ -323,7 +326,7 @@ define Device/huawei-e970 DEVICE_TITLE := Huawei E970 KERNEL_NAME = vmlinux.gz IMAGES := bin - IMAGE/bin := trx-without-loader | huawei-bin + IMAGE/bin := append-rootfs | trx-without-loader | huawei-bin endef TARGET_DEVICES += huawei-e970 @@ -347,8 +350,8 @@ define Device/linksys-wrt54g3gv2-vf DEVICE_TITLE := Linksys WRT54G3GV2-VF FILESYSTEMS := $(FS_128K) IMAGES := noheader.bin bin - IMAGE/noheader.bin := linksys-pattern-partition | trx-v2-with-loader - IMAGE/bin := linksys-pattern-partition | trx-v2-with-loader | linksys-bin + IMAGE/noheader.bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader + IMAGE/bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader | linksys-bin DEVICE_ID := 3G2V VERSION := 3.00.24 SERIAL := 6 @@ -447,7 +450,7 @@ define Device/netgear-wgt634u DEVICE_TITLE := Netgear WGT634U FILESYSTEMS := $(FS_128K) IMAGES := bin - IMAGE/bin := trx-with-loader | prepend-with-elf + IMAGE/bin := append-rootfs | trx-with-loader | prepend-with-elf endef TARGET_DEVICES += netgear-wgt634u @@ -470,7 +473,7 @@ TARGET_DEVICES += netgear-wnr834b-v2 define Device/usrobotics-usr5461 DEVICE_TITLE := USRobotics USR5461 IMAGES := bin - IMAGE/bin := trx-with-loader | usrobotics-bin + IMAGE/bin := append-rootfs | trx-with-loader | usrobotics-bin endef TARGET_DEVICES += usrobotics-usr5461 @@ -760,6 +763,14 @@ define Device/netgear-wn2500rp-v1 endef TARGET_DEVICES += netgear-wn2500rp-v1 +define Device/netgear-wn3000rp + DEVICE_TITLE := Netgear WN3000RP + $(Device/netgear) + NETGEAR_BOARD_ID := U12H163T01_NETGEAR + NETGEAR_REGION := 1 +endef +TARGET_DEVICES += netgear-wn3000rp + define Device/netgear-wndr3400-v1 DEVICE_TITLE := Netgear WNDR3400 v1 $(Device/netgear) @@ -824,14 +835,6 @@ define Device/netgear-wnr2000v2 endef TARGET_DEVICES += netgear-wnr2000v2 -define Device/netgear-wnr3000rp - DEVICE_TITLE := Netgear WNR3000RP - $(Device/netgear) - NETGEAR_BOARD_ID := U12H163T01_NETGEAR - NETGEAR_REGION := 1 -endef -TARGET_DEVICES += netgear-wnr3000rp - define Device/netgear-wnr3500l-v1-north-america DEVICE_TITLE := Netgear WNR3500L v1 North America $(Device/netgear)