ixp4xx: Split into two subtargets, one normal and one for boards which boot directly...

[openwrt.git] / target / linux / adm5120 / image / router_le.mk

diff --git a/target/linux/adm5120/image/router_le.mk b/target/linux/adm5120/image/router_le.mk
index ec7673f..4cb070e 100644 (file)
--- 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,15 +29,18 @@ 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))
+       $(call Image/Build/TRXEdimax,$(call imgname,$(1),$(2)).trx,$(1))
        $(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -d -w \
-               -r $(KDIR)/loader-$(2).gz \
-               -x $(call imgname,$(1),$(2)).trx \
+               -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 \
-               -x $(call imgname,$(1),$(2)).trx \
+               -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
 
 define Image/Build/Infineon
@@ -189,7 +209,7 @@ define Image/Build/Board/WP54GWRT/Initramfs
 endef
 
 #
-# Edimax BR-6104K/KP
+# Edimax BR-6104K
 #
 define Image/Build/Board/BR6104K
        $(call Image/Build/Edimax,$(1),br-6104k)
@@ -203,6 +223,21 @@ define Image/Build/Board/BR6104K/Initramfs
        $(call Image/Build/LZMAKernel/Admboot,br-6104k,gz)
 endef
 
+#
+# Edimax BR-6104KP
+#
+define Image/Build/Board/BR6104KP
+       $(call Image/Build/Edimax,$(1),br-6104kp)
+endef
+
+define Image/Build/Board/BR6104KP/squashfs
+       $(call Image/Build/Board/BR6104KP,squashfs)
+endef
+
+define Image/Build/Board/BR6104KP/Initramfs
+       $(call Image/Build/LZMAKernel/Admboot,br-6104kp,gz)
+endef
+
 #
 # Edimax BR-6104WG
 #
@@ -263,12 +298,12 @@ endef
 define Image/Build/Group/Compex
        $(call Image/Build/Board/NP27G/$(1))
        $(call Image/Build/Board/NP28G/$(1))
-
        $(call Image/Build/Group/WP54G,$(1))
 endef
 
 define Image/Build/Group/Edimax
        $(call Image/Build/Board/BR6104K/$(1))
+       $(call Image/Build/Board/BR6104KP/$(1))
        $(call Image/Build/Board/BR6104WG/$(1))
 endef
 
@@ -324,10 +359,14 @@ define Image/Build/Profile/CAS771W
        $(call Image/Build/Board/CAS771W/$(1))
 endef
 
-define Image/Build/Profile/BR6104KP
+define Image/Build/Profile/BR6104K
        $(call Image/Build/Board/BR6104K/$(1))
 endef
 
+define Image/Build/Profile/BR6104KP
+       $(call Image/Build/Board/BR6104KP/$(1))
+endef
+
 define Image/Build/Profile/RouterBoard
        $(call Image/Build/Board/RB1xx/$(1))
 endef