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 f5de6734fe60d1c7799951f661f609cdcd23ed39..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 $@
@@ -151,7 +146,7 @@ define Build/redboot-bin
        $(TOPDIR)/scripts/redboot-script.pl \
                -k $(BIN_DIR)/$(REDBOOT_PREFIX)-vmlinux.gz \
                -r $(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(IMAGE_ROOTFS)) \
-               -a $(strip $(LOADADDR)) -f 0xbe430000 -l 0x7c0000 \
+               -a $(strip $(LOADER_ENTRY)) -f 0xbe430000 -l 0x7c0000 \
                -s 0x1000 -t 20 -o $@.redbootscript
        dd if="$@.redbootscript" of="$@.redbootscript.padded" bs=4096 conv=sync
        cat \
@@ -166,16 +161,18 @@ 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-mini
-ATH9K_PACKAGES := kmod-ath9k wpad-mini
-B43_PACKAGES := kmod-b43 wpad-mini
+ATH5K_PACKAGES := kmod-ath5k wpad-basic
+ATH9K_PACKAGES := kmod-ath9k wpad-basic
+B43_PACKAGES := kmod-b43 wpad-basic
 BRCMWL_PACKAGES := kmod-brcm-wl nas wlc
-RT28_PACKAGES := kmod-rt2800-pci wpad-mini
-RT61_PACKAGES := kmod-rt61-pci wpad-mini
-USB1_PACKAGES := kmod-usb-ohci kmod-ledtrig-usbdev
-USB2_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev
+RT28_PACKAGES := kmod-rt2800-pci wpad-basic
+RT61_PACKAGES := kmod-rt61-pci wpad-basic
+USB1_PACKAGES := kmod-usb-ohci kmod-usb-ledtrig-usbport
+USB2_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 
 include bcm63xx.mk