[adm5120] reduce wasted flash space by ~56K on Edimax devices, thanks to Bernhard...

[15.05/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 5d98e58..0fc6309 100644 (file)
--- a/target/linux/adm5120/image/router_le.mk
+++ b/target/linux/adm5120/image/router_le.mk
@@ -14,9 +14,14 @@ 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 \
+               -r $(KDIR)/loader-$(2).gz::8192 \
                -x $(call imgname,$(1),$(2)).trx \
-               $(call imgname,$(1),$(2)).bin
+               $(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 \
+               $(call imgname,$(1),$(2))-xmodem.bin
+       rm -f $(call imgname,$(1),$(2)).trx
 endef
 
 define Image/Build/Infineon
@@ -40,14 +45,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 +173,68 @@ 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
 #
-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/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/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-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
 
@@ -226,15 +242,15 @@ endef
 # Mikrotik RB-1xx
 #
 define Image/Build/Board/RB1xx/Initramfs
-       $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-ramfs-rb1xx.elf
+       $(CP) $(KDIR)/vmlinux.elf $(call imgname,netboot,rb1xx)
 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,7 +258,7 @@ 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
@@ -253,11 +269,12 @@ define Image/Build/Group/Compex
 endef
 
 define Image/Build/Group/Edimax
-       $(call Image/Build/Board/BR-6104K/$(1))
+       $(call Image/Build/Board/BR6104K/$(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
@@ -266,6 +283,7 @@ define Image/Build/Group/All
        $(call Image/Build/Group/Edimax,$(1))
        $(call Image/Build/Group/Cellvision,$(1))
        $(call Image/Build/Group/Infineon,$(1))
+       $(call Image/Build/Board/RB1xx/$(1))
 endef
 
 #
@@ -292,33 +310,37 @@ define Image/Build/Profile/WP54G
 endef
 
 define Image/Build/Profile/NP27G
-       $(call Image/Build/Group/NP27G,$(1))
+       $(call Image/Build/Board/NP27G/$(1))
 endef
 
 define Image/Build/Profile/NP28G
-       $(call Image/Build/Group/NP28G,$(1))
+       $(call Image/Build/Board/NP28G/$(1))
+endef
+
+define Image/Build/Profile/CAS771
+       $(call Image/Build/Board/CAS771/$(1))
 endef
 
-define Image/Build/Profile/CAS-771
-       $(call Image/Build/Board/CAS-771,$(1))
+define Image/Build/Profile/CAS771W
+       $(call Image/Build/Board/CAS771W/$(1))
 endef
 
-define Image/Build/Profile/CAS-771W
-       $(call Image/Build/Board/CAS-771W,$(1))
+define Image/Build/Profile/BR6104KP
+       $(call Image/Build/Board/BR6104K/$(1))
 endef
 
 define Image/Build/Profile/RouterBoard
        $(call Image/Build/Board/RB1xx/$(1))
 endef
 
-ifeq ($(PROFILE),Routerboard)
+ifeq ($(PROFILE),RouterBoard)
   define Image/cmdline/yaffs2
-       root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit
+       root=/dev/mtdblock3 rootfstype=yaffs2 init=/etc/preinit
   endef
 
   define Image/BuildKernel/RouterBoard
-       $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-rb1xx-vmlinux
-       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux.elf \
+       $(CP) $(KDIR)/vmlinux.elf $(call imgname,kernel,rb1xx)
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel,rb1xx) \
                '$(strip $(call Image/cmdline/yaffs2))'
   endef