[package] ppp: enable multilink support (#4837)

[openwrt.git] / target / linux / adm5120 / image / Makefile

diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile
index ea13017..f42c045 100644 (file)
--- a/target/linux/adm5120/image/Makefile
+++ b/target/linux/adm5120/image/Makefile
@@ -8,10 +8,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 include $(INCLUDE_DIR)/image.mk
 
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)

-IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
+IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)
+JFFS2BLOCK := $(KDIR)/jffs2.block
+JFFS2MARK := $(KDIR)/jffs2.mark

 
 define imgname
 
 define imgname

-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1))-$(2)
+$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))

 endef
 
 define Build/Clean
 endef
 
 define Build/Clean


@@ -20,6 +22,12 @@ endef
 
 define Image/Prepare
        cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
 
 define Image/Prepare
        cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma

+       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
 endef
 
 define Image/Build/Loader


@@ -31,7 +39,7 @@ endef
 
 define Image/Build/LZMAKernel
        $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
 
 define Image/Build/LZMAKernel
        $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \

-               LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(2) \
+               LOADER=openwrt-$(BOARD)-$(1)-ramfs.$(2) \

                LOADER_DATA=$(KDIR)/vmlinux.lzma \
                LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
                CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
                LOADER_DATA=$(KDIR)/vmlinux.lzma \
                LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
                CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \


@@ -46,6 +54,10 @@ define Image/Build/LZMAKernel/Admboot
        $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0x6D8,y,$(1))
 endef
 
        $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0x6D8,y,$(1))
 endef
 

+define Image/Build/LZMAKernel/Cellvision
+       $(call Image/Build/LZMAKernel,$(1),$(3),0x80500000,0x6D8,y,$(2))
+endef
+

 define Image/Build/LZMAKernel/KArgs
        $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0,y,$(1))
 endef
 define Image/Build/LZMAKernel/KArgs
        $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0,y,$(1))
 endef


@@ -53,11 +65,13 @@ endef
 define trxalign/jffs2-128k
 -a 0x20000 -f $(KDIR)/root.jffs2-128k
 endef
 define trxalign/jffs2-128k
 -a 0x20000 -f $(KDIR)/root.jffs2-128k
 endef

+

 define trxalign/jffs2-64k
 -a 0x10000 -f $(KDIR)/root.jffs2-64k
 endef
 define trxalign/jffs2-64k
 -a 0x10000 -f $(KDIR)/root.jffs2-64k
 endef

+

 define trxalign/squashfs
 define trxalign/squashfs

--a 1024 -f $(KDIR)/root.squashfs
+-a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2BLOCK)

 endef
 
 define Image/Build/TRX
 endef
 
 define Image/Build/TRX