summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/image/Makefile
diff options
context:
space:
mode:
authorcshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-28 22:04:40 +0000
committercshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-28 22:04:40 +0000
commit9dd6c43103f12ece08732fbc4661efc4b17b4d18 (patch)
tree3fb509113ae669be5d89715b6a59e245cc0e77a2 /target/linux/brcm63xx/image/Makefile
parentd26482830ebe68452ed97ed36192abbb543d00d5 (diff)
bcm63xx: Add board id override fixup.
Add a fixup for the kernel to check the bcm tag of the image for a boardid in the information1 field, and use that instead of the supplied one by cfe. This is triggered by a + at the start of the information1 field. Also modify the image generation to generate apropriately tagged images. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24189 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/image/Makefile')
-rw-r--r--target/linux/brcm63xx/image/Makefile16
1 files changed, 13 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 588745cd2c..589e47c561 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -37,7 +37,17 @@ define Image/Build/CFE
--output $(BIN_DIR)/openwrt-$(4)-$(1)-cfe.bin \
--boardid $(2) --chipid $(3) --entry $(KERNEL_ENTRY) \
--load-addr $(LOADADDR) --rsa-signature "$(5)" \
- --info1 "$(call Image/LimitName16,$(4))" --info2 $(1) \
+ --info1 "-$(call Image/LimitName16,$(4))" --info2 $(1) \
+ $(6) $(7) $(8) $(9)
+endef
+
+define Image/Build/CFEFIXUP
+ # 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 "+$(call Image/LimitName16,$(4))" --info2 $(1) \
$(6) $(7) $(8) $(9)
endef
@@ -48,7 +58,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 "$(call Image/LimitName16,$(5))" --info2 $(1)
+ --image-offset $(4) --info1 "-$(call Image/LimitName16,$(5))" --info2 $(1)
endef
define Image/Build/RG100A
@@ -57,7 +67,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 "$(call Image/LimitName16,$(5))" --info2 $(1)
+ --image-offset $(4) --info1 "-$(call Image/LimitName16,$(5))" --info2 $(1)
endef
define Image/Build/RedBoot