From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 2 Oct 2007 09:09:55 +0000 (+0000)
Subject: [adm5120] make image names shorten
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d5165737964ac122241efa157e7797e615e51904;p=openwrt%2Fsvn-archive%2Farchive.git

[adm5120] make image names shorten

SVN-Revision: 9089
---

diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile
index ba3dd38f7e..710e82be5c 100644
--- a/target/linux/adm5120/image/Makefile
+++ b/target/linux/adm5120/image/Makefile
@@ -12,7 +12,7 @@ IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
 JFFS2EOF := $(KDIR)/jffs2.eof
 
 define imgname
-$(IMGNAME)-$(patsubst jffs2-%,jffs2,$(1))-$(2)
+$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
 endef
 
 define Build/Clean
@@ -35,7 +35,7 @@ endef
 
 define Image/Build/LZMAKernel
 	$(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
-		LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(2) \
+		LOADER=openwrt-$(BOARD)-$(KERNEL)-$(1)-ramfs.$(2) \
 		LOADER_DATA=$(KDIR)/vmlinux.lzma \
 		LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
 		CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
diff --git a/target/linux/adm5120/image/router_le.mk b/target/linux/adm5120/image/router_le.mk
index 54b9c4adca..be70ed21a5 100644
--- a/target/linux/adm5120/image/router_le.mk
+++ b/target/linux/adm5120/image/router_le.mk
@@ -226,7 +226,7 @@ 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
 
 #
@@ -266,6 +266,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
 
 #
@@ -311,14 +312,14 @@ 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