diff options
Diffstat (limited to 'target/linux/adm5120')
| -rw-r--r-- | target/linux/adm5120/image/Makefile | 14 | ||||
| -rw-r--r-- | target/linux/adm5120/image/router_le.mk | 37 | ||||
| -rw-r--r-- | target/linux/adm5120/router_le/profiles/Edimax.mk | 11 |
3 files changed, 49 insertions, 13 deletions
diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile index 710e82be5c..ee8cf42ea8 100644 --- a/target/linux/adm5120/image/Makefile +++ b/target/linux/adm5120/image/Makefile @@ -9,7 +9,8 @@ include $(INCLUDE_DIR)/image.mk LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL) -JFFS2EOF := $(KDIR)/jffs2.eof +JFFS2BLOCK := $(KDIR)/jffs2.block +JFFS2MARK := $(KDIR)/jffs2.mark define imgname $(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1)) @@ -21,9 +22,12 @@ endef define Image/Prepare cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma - rm -f $(JFFS2EOF) - touch $(JFFS2EOF) - $(call prepare_generic_squashfs,$(JFFS2EOF)) + rm -f $(JFFS2BLOCK) + touch $(JFFS2BLOCK) + $(call prepare_generic_squashfs,$(JFFS2BLOCK)) + rm -f $(JFFS2MARK) + touch $(JFFS2MARK) + $(call add_jffs2_mark,$(JFFS2MARK)) endef define Image/Build/Loader @@ -63,7 +67,7 @@ define trxalign/jffs2-64k endef define trxalign/squashfs --a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2EOF) +-a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2BLOCK) endef define Image/Build/TRX diff --git a/target/linux/adm5120/image/router_le.mk b/target/linux/adm5120/image/router_le.mk index 135b8dff53..f08ed564dd 100644 --- a/target/linux/adm5120/image/router_le.mk +++ b/target/linux/adm5120/image/router_le.mk @@ -5,6 +5,23 @@ # See /LICENSE for more information. # +define trxedimax/jffs2-128k +-a 0x20000 -f $(KDIR)/root.jffs2-128k +endef + +define trxedimax/jffs2-64k +-a 0x10000 -f $(KDIR)/root.jffs2-64k +endef + +define trxedimax/squashfs +-a 1024 -f $(KDIR)/root.squashfs +endef + +define Image/Build/TRXEdimax + $(STAGING_DIR_HOST)/bin/trx -o $(1) -f $(KDIR)/vmlinux.lzma \ + $(call trxedimax/$(2)) +endef + define Image/Build/Compex $(call Image/Build/Loader,$(2),gz,0x80500000,0,y,$(2)) $(call Image/Build/TRX,$(call imgname,$(1),$(2)).trx,$(1),$(KDIR)/loader-$(2).gz) @@ -12,14 +29,16 @@ endef define Image/Build/Edimax $(call Image/Build/Loader,$(2),gz,0x80500000,0x6D8,y,$(2)) - $(call Image/Build/TRXNoloader,$(call imgname,$(1),$(2)).trx,$(1)) - $(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -d -w \ - -r $(KDIR)/loader-$(2).gz::8192 \ - -x $(call imgname,$(1),$(2)).trx \ + $(call Image/Build/TRXEdimax,$(call imgname,$(1),$(2)).trx,$(1)) + $(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -v -v -d -w \ + -r $(KDIR)/loader-$(2).gz::0x1000 \ + -x $(call imgname,$(1),$(2)).trx:0x10000 \ + -x $(JFFS2MARK):0x10000 \ $(call imgname,$(1),$(2))-webui.bin - $(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -d \ - -r $(KDIR)/loader-$(2).gz::8192 \ - -x $(call imgname,$(1),$(2)).trx \ + $(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -v -v -d \ + -r $(KDIR)/loader-$(2).gz::0x1000 \ + -x $(call imgname,$(1),$(2)).trx:0x10000 \ + -x $(JFFS2MARK):0x10000 \ $(call imgname,$(1),$(2))-xmodem.bin rm -f $(call imgname,$(1),$(2)).trx endef @@ -340,6 +359,10 @@ define Image/Build/Profile/CAS771W $(call Image/Build/Board/CAS771W/$(1)) endef +define Image/Build/Profile/BR6104K + $(call Image/Build/Board/BR6104K/$(1)) +endef + define Image/Build/Profile/BR6104KP $(call Image/Build/Board/BR6104KP/$(1)) endef diff --git a/target/linux/adm5120/router_le/profiles/Edimax.mk b/target/linux/adm5120/router_le/profiles/Edimax.mk index 34798b2381..9b0ca65c2b 100644 --- a/target/linux/adm5120/router_le/profiles/Edimax.mk +++ b/target/linux/adm5120/router_le/profiles/Edimax.mk @@ -5,8 +5,16 @@ # See /LICENSE for more information. # +define Profile/BR6104K + NAME:=Edimax BR-6104K (Unofficial) +endef + +define Profile/BR6104K/Description + Package set optimized for the Edimax BR-6104K +endef + define Profile/BR6104KP - NAME:=Edimax BR-6104KP + NAME:=Edimax BR-6104KP (Unofficial) PACKAGES:=kmod-usb-core kmod-usb-adm5120 endef @@ -14,4 +22,5 @@ define Profile/BR6104KP/Description Package set optimized for the Edimax BR-6104KP endef +$(eval $(call Profile,BR6104K)) $(eval $(call Profile,BR6104KP)) |