brcm63xx: use more systematic names for image and DTS files

[oweals/openwrt.git] / target / linux / brcm63xx / image / Makefile

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 21fc69e24efb29ebaa6e2d01a6ddef709e2891b9..cc1660aa25ba9137d7e9adc2347acc1283264a66 100644 (file)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -132,11 +132,6 @@ define Build/spw303v-bin
        mv $@.spw303v $@
 endef
 
-define Build/xor-image
-       $(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor
-       mv $@.xor $@
-endef
-
 define Build/zyxel-bin
        $(STAGING_DIR_HOST)/bin/zyxbcm -i $@ -o $@.zyxel
        mv $@.zyxel $@
@@ -166,6 +161,8 @@ define Device/Default
   KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
   KERNEL_INITRAMFS_SUFFIX := .elf
   DEVICE_DTS_DIR := ../dts
+  SOC = bcm$$(CFE_CHIP_ID)
+  DEVICE_DTS = $$(SOC)-$(subst _,-,$(1))
 endef
 
 ATH5K_PACKAGES := kmod-ath5k wpad-basic