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 d2a381431d91bb2461949fbb1509adc53cb3305c..cc1660aa25ba9137d7e9adc2347acc1283264a66 100644 (file)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -34,11 +34,6 @@ define Build/Compile
 endef
 
 ### Kernel scripts ###
-define Build/append-dtb
-       $(call Image/BuildDTB,../dts/$(DEVICE_DTS).dts,$@.dtb)
-       cat $@.dtb >> $@
-endef
-
 define Build/hcs-initramfs
        $(STAGING_DIR_HOST)/bin/hcsmakeimage --magic_bytes=$(HCS_MAGIC_BYTES) \
                --rev_maj=$(HCS_REV_MAJ) --rev_min=$(HCS_REV_MIN) --input_file=$@ \
@@ -103,16 +98,16 @@ $(shell expr substr "$(1)" 1 16)
 endef
 
 define Image/FileSystemStrip
-$(subst root.,,$(notdir $(1)))
+$(firstword $(subst +,$(space),$(subst root.,,$(notdir $(1)))))
 endef
 
 define Build/cfe-bin
-       $(STAGING_DIR_HOST)/bin/imagetag -i $(word 1,$^) -f $(word 2,$^) \
+       $(STAGING_DIR_HOST)/bin/imagetag -i $(IMAGE_KERNEL) -f $(IMAGE_ROOTFS) \
                --output $@ --boardid $(CFE_BOARD_ID) --chipid $(CFE_CHIP_ID) \
                --entry $(LOADER_ENTRY) --load-addr $(LOADER_ENTRY) \
                --info1 "$(call Image/LimitName16,$(DEVICE_NAME))" \
-               --info2 "$(call Image/FileSystemStrip,$(word 2,$^))" \
-               $(call rootfspad/$(call Image/FileSystemStrip,$(word 2,$^))) \
+               --info2 "$(call Image/FileSystemStrip,$(IMAGE_ROOTFS))" \
+               $(call rootfspad/$(call Image/FileSystemStrip,$(IMAGE_ROOTFS))) \
                $(CFE_EXTRAS) $(1)
 endef
 
@@ -120,15 +115,15 @@ define Build/cfe-old-bin
        $(TOPDIR)/scripts/brcmImage.pl -t -p \
                -o $@ -b $(CFE_BOARD_ID) -c $(CFE_CHIP_ID) \
                -e $(LOADER_ENTRY) -a $(LOADER_ENTRY) \
-               -k $(word 1,$^) -r $(word 2,$^) \
+               -k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) \
                $(CFE_EXTRAS)
 endef
 
 define Build/cfe-spw303v-bin
-       $(STAGING_DIR_HOST)/bin/imagetag -i $(word 1,$^) -f $(word 2,$^) \
+       $(STAGING_DIR_HOST)/bin/imagetag -i $(IMAGE_KERNEL) -f $(IMAGE_ROOTFS) \
                --output $@ --boardid $(CFE_BOARD_ID) --chipid $(CFE_CHIP_ID) \
                --entry $(LOADER_ENTRY) --load-addr $(LOADER_ENTRY) \
-               $(call rootfspad/$(call Image/FileSystemStrip,$(word 2,$^))) \
+               $(call rootfspad/$(call Image/FileSystemStrip,$(IMAGE_ROOTFS))) \
                $(CFE_EXTRAS) $(1)
 endef
 
@@ -137,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 $@
@@ -149,20 +139,20 @@ endef
 
 define Build/redboot-bin
        # Prepare kernel and rootfs
-       dd if=$(word 1,$^) of=$(BIN_DIR)/$(REDBOOT_PREFIX)-vmlinux.gz bs=65536 conv=sync
-       dd if=$(word 2,$^) of=$(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(word 2,$^)) bs=64k conv=sync
-       echo -ne \\xDE\\xAD\\xC0\\xDE >> $(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(word 2,$^))
+       dd if=$(IMAGE_KERNEL) of=$(BIN_DIR)/$(REDBOOT_PREFIX)-vmlinux.gz bs=65536 conv=sync
+       dd if=$(IMAGE_ROOTFS) of=$(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(IMAGE_ROOTFS)) bs=64k conv=sync
+       echo -ne \\xDE\\xAD\\xC0\\xDE >> $(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(IMAGE_ROOTFS))
        # Generate the scripted image
        $(TOPDIR)/scripts/redboot-script.pl \
                -k $(BIN_DIR)/$(REDBOOT_PREFIX)-vmlinux.gz \
-               -r $(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(word 2,$^)) \
-               -a $(strip $(LOADADDR)) -f 0xbe430000 -l 0x7c0000 \
+               -r $(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(IMAGE_ROOTFS)) \
+               -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 \
                "$@.redbootscript.padded" \
                "$(BIN_DIR)/$(REDBOOT_PREFIX)-vmlinux.gz" \
-               "$(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(word 2,$^))" \
+               "$(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(IMAGE_ROOTFS))" \
                > "$@"
 endef
 
@@ -170,18 +160,19 @@ define Device/Default
   PROFILES = Default $$(DEVICE_NAME)
   KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
   KERNEL_INITRAMFS_SUFFIX := .elf
-  DEVICE_DTS :=
+  DEVICE_DTS_DIR := ../dts
+  SOC = bcm$$(CFE_CHIP_ID)
+  DEVICE_DTS = $$(SOC)-$(subst _,-,$(1))
 endef
-DEVICE_VARS += DEVICE_DTS
 
-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