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 be70ed2..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,11 +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 \
-               $(call imgname,$(1),$(2)).bin
+               -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::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
@@ -40,14 +64,14 @@ endef
 #
 # Cellvision CAS-771
 #
-define Image/Build/Board/CAS-771/Initramfs
+define Image/Build/Board/CAS771/Initramfs
        $(call Image/Build/LZMAKernel/Admboot,cas-771,gz)
 endef
 
 #
 # Cellvision CAS-771W
 #
-define Image/Build/Board/CAS-771W/Initramfs
+define Image/Build/Board/CAS771W/Initramfs
        $(call Image/Build/LZMAKernel/Admboot,cas-771w,gz)
 endef
 
@@ -168,57 +192,83 @@ endef
 #
 # Compex WP54G-WRT
 #
-define Image/Build/Board/WP54G-WRT
+define Image/Build/Board/WP54GWRT
        $(call Image/Build/Compex,$(1),wp54g-wrt)
 endef
 
-define Image/Build/Board/WP54G-WRT/squashfs
-       $(call Image/Build/Board/WP54G-WRT,squashfs)
+define Image/Build/Board/WP54GWRT/squashfs
+       $(call Image/Build/Board/WP54GWRT,squashfs)
 endef
 
-define Image/Build/Board/WP54G-WRT/jffs2-64k
-       $(call Image/Build/Board/WP54G-WRT,jffs2-64k)
+define Image/Build/Board/WP54GWRT/jffs2-64k
+       $(call Image/Build/Board/WP54GWRT,jffs2-64k)
 endef
 
-define Image/Build/Board/WP54G-WRT/Initramfs
+define Image/Build/Board/WP54GWRT/Initramfs
        $(call Image/Build/LZMAKernel/KArgs,wp54g-wrt,bin)
 endef
 
 #
-# Edimax BR-6104K/KP
+# Edimax BR-6104K
 #
-define Image/Build/Board/BR-6104K
+define Image/Build/Board/BR6104K
        $(call Image/Build/Edimax,$(1),br-6104k)
 endef
 
-define Image/Build/Board/BR-6104K/squashfs
-       $(call Image/Build/Board/BR-6104K,squashfs)
+define Image/Build/Board/BR6104K/squashfs
+       $(call Image/Build/Board/BR6104K,squashfs)
 endef
 
-define Image/Build/Board/BR-6104K/jffs2-64k
-       $(call Image/Build/Board/BR-6104K,jffs2-64k)
+define Image/Build/Board/BR6104K/Initramfs
+       $(call Image/Build/LZMAKernel/Admboot,br-6104k,gz)
 endef
 
-define Image/Build/Board/BR-6104K/Initramfs
-       $(call Image/Build/LZMAKernel/Admboot,br-6104k,gz)
+#
+# 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
+#
+define Image/Build/Board/BR6104WG
+       $(call Image/Build/Edimax,$(1),br-6104wg)
+endef
+
+define Image/Build/Board/BR6104WG/squashfs
+       $(call Image/Build/Board/BR6104WG,squashfs)
+endef
+
+define Image/Build/Board/BR6104WG/Initramfs
+       $(call Image/Build/LZMAKernel/Admboot,br-6104wg,gz)
 endef
 
 #
 # Infineon EASY 83000
 #
-define Image/Build/Board/EASY-83000
+define Image/Build/Board/EASY83000
        $(call Image/Build/Infineon,$(1),easy-83000)
 endef
 
-define Image/Build/Board/EASY-83000/squashfs
-       $(call Image/Build/Board/EASY-83000,squashfs)
+define Image/Build/Board/EASY83000/squashfs
+       $(call Image/Build/Board/EASY83000,squashfs)
 endef
 
-define Image/Build/Board/EASY-83000/jffs2-64k
-       $(call Image/Build/Board/EASY-83000,jffs2-64k)
+define Image/Build/Board/EASY83000/jffs2-64k
+       $(call Image/Build/Board/EASY83000,jffs2-64k)
 endef
 
-define Image/Build/Board/EASY-83000/Initramfs
+define Image/Build/Board/EASY83000/Initramfs
        $(call Image/Build/LZMAKernel/Admboot,easy-83000,gz)
 endef
 
@@ -233,8 +283,8 @@ endef
 # Groups
 #
 define Image/Build/Group/Cellvision
-       $(call Image/Build/Board/CAS-771/$(1))
-       $(call Image/Build/Board/CAS-771W/$(1))
+       $(call Image/Build/Board/CAS771/$(1))
+       $(call Image/Build/Board/CAS771W/$(1))
 endef
 
 define Image/Build/Group/WP54G
@@ -242,22 +292,23 @@ define Image/Build/Group/WP54G
        $(call Image/Build/Board/WP54AG/$(1))
        $(call Image/Build/Board/WPP54G/$(1))
        $(call Image/Build/Board/WPP54AG/$(1))
-       $(call Image/Build/Board/WP54G-WRT/$(1))
+       $(call Image/Build/Board/WP54GWRT/$(1))
 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/BR-6104K/$(1))
+       $(call Image/Build/Board/BR6104K/$(1))
+       $(call Image/Build/Board/BR6104KP/$(1))
+       $(call Image/Build/Board/BR6104WG/$(1))
 endef
 
 define Image/Build/Group/Infineon
-       $(call Image/Build/Board/EASY-83000/$(1))
+       $(call Image/Build/Board/EASY83000/$(1))
 endef
 
 define Image/Build/Group/All
@@ -300,12 +351,20 @@ define Image/Build/Profile/NP28G
        $(call Image/Build/Board/NP28G/$(1))
 endef
 
-define Image/Build/Profile/CAS-771
-       $(call Image/Build/Board/CAS-771/$(1))
+define Image/Build/Profile/CAS771
+       $(call Image/Build/Board/CAS771/$(1))
+endef
+
+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/CAS-771W
-       $(call Image/Build/Board/CAS-771W/$(1))
+define Image/Build/Profile/BR6104KP
+       $(call Image/Build/Board/BR6104KP/$(1))
 endef
 
 define Image/Build/Profile/RouterBoard