bcm53xx: use the correct kernel image

[openwrt/staging/wigyori.git] / target / linux / bcm53xx / image / Makefile

diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile
index 62544c6492af0ddfbba820aa03e7b5710d20be31..2de5271bd8fdf014e4a8bc29b3ebc89f7c0779d1 100644 (file)
--- a/target/linux/bcm53xx/image/Makefile
+++ b/target/linux/bcm53xx/image/Makefile
@@ -8,49 +8,80 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 define Image/Prepare
+       $(CP) $(DTS_DIR)/*.dtb $(KDIR)/
+
        rm -f $(KDIR)/fs_mark
        echo -ne '\xde\xad\xc0\xde' > $(KDIR)/fs_mark
        $(call prepare_generic_squashfs,$(KDIR)/fs_mark)
+
+       $(CP) ./ubinize.cfg $(KDIR)
 endef
 
-define Image/Build/Initramfs
-       $(call Image/Build/Initramfs/Chk,bcm5301-netgear-r6250,U12H245T00_NETGEAR,2,initramfs)
+define Build/append-dtb
+       cat $(KDIR)/$(DT).dtb >> $@
 endef
 
-define Image/Build/Initramfs/Chk
-       $(call Image/Build/Initramfs/DTB,$(1))
-       $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(1)-$(4).chk -k $(KDIR)/$(IMG_PREFIX)-$(4)-$(1).trx -b $(2) -r $(3)
+define Build/lzma-d16
+       $(STAGING_DIR_HOST)/bin/lzma e $@ -d16 $(1) $@.new
+       @mv $@.new $@
 endef
 
-define Image/Build/Initramfs/DTB
-       $(call Image/Build/DTB,zImage-initramfs,$(1))
-       $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/$(IMG_PREFIX)-initramfs-$(1).trx \
-               -f $(KDIR)/zImage-initramfs-$(1).lzma
+define Build/mkfs/squashfs
+       ( cd $(KDIR); $(STAGING_DIR_HOST)/bin/ubinize -p 128KiB -m 2048 -o $(KDIR)/root-block-0x20000-min-0x800.ubi ubinize.cfg )
+endef
+
+define Build/trx-nand
+       $(STAGING_DIR_HOST)/bin/trx \
+               -o $@ \
+               -f $(word 1,$^) \
+               -a 0x20000 -f $(KDIR)/root-block-0x20000-min-0x800.ubi \
+               -a 0x20000 -A $(KDIR)/fs_mark
+endef
+
+define Build/netgear-chk
+       $(STAGING_DIR_HOST)/bin/mkchkimg \
+               -o $@.new -k $@ -b $(BOARD_ID) -r $(REGION)
+       mv $@.new $@
+endef
+
+DEVICE_VARS += DT BOARD_ID REGION
+
+define Device/Default
+  # .dtb files are prefixed by SoC type, e.g. bcm4708- which is not included in device/image names
+  # extract the full dtb name based on the device info
+  DT := $(patsubst %.dtb,%,$(notdir $(wildcard $(if $(IB),$(KDIR),$(DTS_DIR))/*-$(1).dtb)))
+  KERNEL := kernel-bin | append-dtb | lzma-d16
+  FILESYSTEMS := squashfs
+  KERNEL_NAME := zImage
+  IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
+  IMAGES := trx
+  IMAGE/trx := trx-nand
 endef
 
-define Image/Build/squashfs/DTB
-       $(call Image/Build/DTB,zImage,$(1))
-       $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/$(IMG_PREFIX)-squashfs-$(1).trx \
-               -f $(KDIR)/zImage-$(1).lzma \
-               -a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(KDIR)/fs_mark
+define Device/netgear
+  IMAGES := chk
+  IMAGE/chk := trx-nand | netgear-chk
+  REGION := 1
 endef
 
-define Image/Build/squashfs/Chk
-       $(call Image/Build/squashfs/DTB,$(1))
-       $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(1)-$(4).chk -k $(KDIR)/$(IMG_PREFIX)-$(4)-$(1).trx -b $(2) -r $(3)
+define Device/netgear-r6250
+  $(Device/netgear)
+  BOARD_ID := U12H245T00_NETGEAR
 endef
 
-define Image/Build/DTB
-       rm -f $(KDIR)/$(1)-$(2).lzma
-       rm -f $(KDIR)/$(1)-$(2).dts
-       cat $(KDIR)/$(1) $(LINUX_DIR)/arch/$(ARCH)/boot/dts/$(2).dtb > $(KDIR)/$(1)-$(2).dts;
-       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/$(1)-$(2).dts $(KDIR)/$(1)-$(2).lzma -d16
+define Device/netgear-r6300-v2
+  $(Device/netgear)
+  BOARD_ID := U12H240T00_NETGEAR
 endef
 
-define Image/Build
-       $(call Image/Build/$(1),$(1))
-       $(call Image/Build/squashfs/Chk,bcm5301-netgear-r6250,U12H245T00_NETGEAR,2,squashfs)
+define Device/netgear-r8000
+  $(Device/netgear)
+  BOARD_ID := U12H315T00_NETGEAR
 endef
 
+TARGET_DEVICES += \
+       asus-rt-ac68u asus-rt-n18u asus-rt-ac87u \
+       netgear-r6250 netgear-r6300-v2 netgear-r8000 \
+       buffalo-wzr-1750dhp buffalo-wzr-600dhp2 buffalo-wzr-900dhp
 
 $(eval $(call BuildImage))