summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorcshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-23 20:17:08 +0000
committercshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-23 20:17:08 +0000
commit97de625a9bec39e549f09a9ceae10bf91457d92c (patch)
tree776aea29e7d118ca12293a66b3afc38fbcfc118b /target/linux/brcm63xx
parente79fbe8597bbf59003bbc47e0ce042e956de7376 (diff)
[brcm63xx] image: Limited image name put into the info1 field to 16 characters and eliminted the OpenWRT revision. This makes using the image (router) name as the board name possible, so that boards with same real boardid but different GPIOs can be detected and the correct GPIOs used.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24118 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/image/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 4f41889a5..64711383c 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -27,13 +27,17 @@ define trxalign/squashfs
-a 1024
endef
+define Image/LimitName16
+ $(shell expr substr $(1) 1 16)
+endef
+
define Image/Build/CFE
# Generate the tagged image
$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
--output $(BIN_DIR)/openwrt-$(4)-$(1)-cfe.bin \
--boardid $(2) --chipid $(3) --entry $(KERNEL_ENTRY) \
--load-addr $(LOADADDR) --rsa-signature "$(5)" \
- --info1 "$(4) $(REVISION)" --info2 $(1) \
+ --info1 "$(call Image/LimitName16,$(4))" --info2 $(1) \
$(6) $(7) $(8) $(9)
endef
@@ -44,7 +48,7 @@ define Image/Build/CFEAGPF
--boardid $(2) --chipid $(3) --entry $(LOADADDR) \
--load-addr $(LOADADDR) --tag-version 8 \
--signature2 IMAGE --block-size 0x20000 \
- --image-offset $(4) --info1 "$(5) $(REVISION)" --info2 $(1)
+ --image-offset $(4) --info1 "$(call Image/LimitName16,$(5))" --info2 $(1)
endef
define Image/Build/RG100A
@@ -53,7 +57,7 @@ define Image/Build/RG100A
--output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
--boardid $(2) --chipid $(3) --entry $(LOADADDR) \
--load-addr $(LOADADDR) --block-size 0x20000 \
- --image-offset $(4) --info1 "$(5) $(REVISION)" --info2 $(1)
+ --image-offset $(4) --info1 "$(call Image/LimitName16,$(5))" --info2 $(1)
endef
define Image/Build/RedBoot
@@ -109,7 +113,7 @@ define Image/Build
# Various routers
$(call Image/Build/CFE,$(1),96345GW2,6345,96345GW2-generic)
$(call Image/Build/CFE,$(1),96345GW2,6345,96348GW2-bc221,,--layoutver 5)
- $(call Image/Build/CFE,$(1),96345GW2,6345,92345GW2-revision,OpenWRT-$(REVISION))
+ $(call Image/Build/CFE,$(1),96345GW2,6345,92345GW2-rev,OpenWRT-$(REVISION))
$(call Image/Build/CFE,$(1),96348GW,6348,96348GW-generic,,)
$(call Image/Build/CFE,$(1),96348GW,6348,96348GW-bc221,,--layoutver 5)
$(call Image/Build/CFE,$(1),6338GW,6338,6338GW-generic,,)