OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 DEVICE_VARS += IMAGE_SIZE DTB_SIZE
-define Build/boot-img
-	$(RM) -rf $@.bootdir
-	mkdir -p $@.bootdir/boot
+define Device/Default
+  PROFILES := Default
-	$(CP) $@.scr $@.bootdir/boot/boot.scr
+  KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
-	$(CP) $(IMAGE_KERNEL).dtb $@.bootdir/boot/$(DEVICE_DTB)
-	$(CP) $(IMAGE_KERNEL) $@.bootdir/boot/uImage
+  DEVICE_DTS :=
-	genext2fs --block-size $(BLOCKSIZE:%k=%Ki) \
+  KERNEL_ENTRY := 0x00000000
-		--size-in-blocks $$((1024 * $(CONFIG_TARGET_KERNEL_PARTSIZE))) \
-		--root $@.bootdir $@.boot
+  KERNEL_LOADADDR := 0x00000000
-	# convert it to revision 1 - needed for u-boot ext2load
-	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.boot
+  DEVICE_DTS_DIR := ../dts
-	$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.boot > /dev/null
+  SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
 endef
-define Build/boot-script
 	$(STAGING_DIR_HOST)/bin/mkimage -A powerpc -T script -C none -n "$(PROFILE) Boot Script" \
-		-d mbl_boot.scr \
+define Build/dtb
+	$(call Image/BuildDTB,../dts/$(DEVICE_DTS).dts,$@.dtb,,--space $(DTB_SIZE))
-		$@.scr
+endef
 endef
+define Build/prepend-dtb
-define Build/copy-file
-	cat "$(1)" > "$@"
-endef
-define Build/create-uImage-dtb
+	cat "$@.dtb.uimage" "$@" > "$@.new"
-	# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
+	mv "$@.new" "$@"
-	-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
+endef
-		-O linux -T kernel -C none \
-		-n '$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
-		-d "$@.dtb" "$@.dtb.uimage"
-endef
+define Build/export-dtb
 	cp $(IMAGE_KERNEL).dtb $@
-define Build/dtb
+endef
-	$(call Image/BuildDTB,../dts/$(DEVICE_DTS).dts,$@.dtb,,--space $(DTB_SIZE))
-endef
+ifeq ($(SUBTARGET),nand)
-define Build/export-dtb
+define Image/cpiogz
-	cp $(IMAGE_KERNEL).dtb $@
+	( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(KDIR_TMP)/$(IMG_PREFIX)-rootfs.cpio.gz )
 		dd if=$@ bs=$(BLOCKSIZE) conv=sync; \
 	) > $@.new
 	@mv $@.new $@
 endef
+define Build/MerakiAdd-initramfs
+	$(call Image/cpiogz)
+	-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) -O linux -T ramdisk \
+		-C gzip -n "$(PROFILE) rootfs" \
+		-d $(KDIR_TMP)/$(IMG_PREFIX)-rootfs.cpio.gz \
+		$(KDIR_TMP)/$(IMG_PREFIX)-uramdisk.image.gz
+	( \
+		dd if=$@ bs=1k conv=sync; \
+		dd if=$(KDIR_TMP)/$(IMG_PREFIX)-uramdisk.image.gz bs=$(BLOCKSIZE) conv=sync; \
+	) > $@.new
+	@mv $@.new $@
+endef
 define Build/MerakiNAND
 	-$(STAGING_DIR_HOST)/bin/mkmerakifw \
 		-B $(BOARD_NAME) -s \
 		-i $@ \
 		-o $@.new
 	@cp $@.new $@
-endef
-define Build/MuImage-initramfs
-	rm -rf $@.fakerd $@.new
-	dd if=/dev/zero of=$@.fakerd bs=32 count=1 conv=sync
-	# Netgear used an old uboot that doesn't have FIT support.
-	# So we are stuck with either a full ext2/4 fs in a initrd.
-	# ... or we try to make the "multi" image approach to work
-	# for us.
-	#
-	# Sadly, the "multi" image has to consists of three
-	# "fixed" parts in the following "fixed" order:
-	# 1. The kernel which is in $@
-	# 2. The (fake) initrd which is in $@.fakerd
-	# 3. The device tree binary which is in $@.dtb
-	#
-	# Now, given that we use the function for the kernel which
-	# already has a initramfs image inside, we still have to
-	# add a "fake" initrd (which a mkimage header) in the second
-	# part of the legacy multi image. Since we need to put the
-	# device tree stuff into part 3.
-	-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) -O linux -T multi \
-		-C $(1) -a $(KERNEL_LOADADDR) -e $(KERNEL_ENTRY) \
-		-n '$(BOARD_NAME) initramfs' -d $@:$@.fakerd:$@.dtb $@.new
-	mv $@.new $@
-	rm -rf $@.fakerd
-endef
-define Build/prepend-dtb
-	cat "$@.dtb.uimage" "$@" > "$@.new"
-	mv "$@.new" "$@"
-endef
-define Image/cpiogz
-	( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(KDIR_TMP)/$(IMG_PREFIX)-rootfs.cpio.gz )
-endef
-define Device/Default
-  PROFILES := Default
-  KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
-  DEVICE_DTS :=
-  KERNEL_ENTRY := 0x00000000
-  KERNEL_LOADADDR := 0x00000000
-  DEVICE_DTS_DIR := ../dts
-  SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
-endef
-ifeq ($(SUBTARGET),nand)
+endef
 define Device/meraki_mr24
   DEVICE_TITLE := Cisco Meraki MR24
   DEVICE_PACKAGES := kmod-spi-gpio -swconfig
   BOARD_NAME := mr24
   DEVICE_DTS := meraki-mr24
   BLOCKSIZE := 63k
-  IMAGES := sysupgrade.bin
+  IMAGES := sysupgrade.tar
   DTB_SIZE := 64512
   IMAGE_SIZE := 8191k
   KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND
   KERNEL_INITRAMFS := kernel-bin | lzma | dtb | MuImage-initramfs lzma
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5
   SUPPORTED_DEVICES += mr24
 endef
 TARGET_DEVICES += meraki_mr24
 define Device/meraki_mx60
   DEVICE_TITLE := Cisco Meraki MX60/MX60W
   DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
-		     kmod-usb-storage block-mount
+  kmod-usb-storage block-mount
   BOARD_NAME := mx60
   DEVICE_DTS := meraki-mx60
+  BLOCKSIZE := 63k
+  IMAGES := sysupgrade.tar
+  DTB_SIZE := 64512
+  # The kernel size will need to match the offset defined in mkmerakifw.c,
+  # otherwise the final image will fail to boot. This is set within the
-  BLOCKSIZE := 63k
+  # MX60 kernel header definition which is found at
-  IMAGES := sysupgrade.bin
-  DTB_SIZE := 64512
+  # ./tools/firmware-utils/src/mkmerakifw.c, line 103~
-  IMAGE_SIZE := 1021m
+  KERNEL_SIZE := 2984k
+  IMAGE_SIZE := 1021m
+  KERNEL := kernel-bin | gzip | uImage gzip | MerakiAdd-dtb | MerakiNAND
+  KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | gzip | uImage gzip | \
-  KERNEL_SIZE := 4031k
+		      check-size $$(KERNEL_SIZE) | \
-  KERNEL := kernel-bin | gzip | uImage gzip | MerakiAdd-dtb | MerakiNAND
+		      MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \
-  KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip
+		      MerakiNAND
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5
   SUPPORTED_DEVICES += mx60
 endef
-TARGET_DEVICES += meraki_mx60
-define Device/netgear_wndap6x0
-  DEVICE_PACKAGES := kmod-eeprom-at24
-  SUBPAGESIZE := 256
-  PAGESIZE := 512
+TARGET_DEVICES += meraki_mx60
-  BLOCKSIZE := 16k
-  DTB_SIZE := 32768
-  IMAGE_SIZE := 27392k
-  IMAGES := sysupgrade.bin factory.img
+define Build/create-uImage-dtb
-  KERNEL_SIZE := 4032k
+	# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
-  KERNEL := dtb | kernel-bin | gzip | MuImage-initramfs gzip
+	-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+		-O linux -T kernel -C none \
-  IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
+		-n '$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
+		-d "$@.dtb" "$@.dtb.uimage"
+endef
+define Build/MuImage-initramfs
+	rm -rf $@.fakerd $@.new
+	dd if=/dev/zero of=$@.fakerd bs=32 count=1 conv=sync
+	# Netgear used an old uboot that doesn't have FIT support.
-  UBINIZE_OPTS := -E 5
+	# So we are stuck with either a full ext2/4 fs in a initrd.
-endef
+	# ... or we try to make the "multi" image approach to work
+	# for us.
+	#
+	# Sadly, the "multi" image has to consists of three
+	# "fixed" parts in the following "fixed" order:
+	# 1. The kernel which is in $@
+	# 2. The (fake) initrd which is in $@.fakerd
+	# 3. The device tree binary which is in $@.dtb
-define Device/netgear_wndap620
+	#
-  $(Device/netgear_wndap6x0)
+	# Now, given that we use the function for the kernel which
-  DEVICE_TITLE := Netgear WNDAP620 - Premium Wireless-N
+	# already has a initramfs image inside, we still have to
-  DEVICE_DTS := netgear-wndap620
+	# add a "fake" initrd (which a mkimage header) in the second
-endef
+	# part of the legacy multi image. Since we need to put the
+	# device tree stuff into part 3.
-TARGET_DEVICES += netgear_wndap620
 	-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) -O linux -T multi \
-define Device/netgear_wndap660
-  $(Device/netgear_wndap6x0)
+		-C $(1) -a $(KERNEL_LOADADDR) -e $(KERNEL_ENTRY) \
-  DEVICE_TITLE := Netgear WNDAP660 - Dual Radio Dual Band Wireless-N
+		-n '$(BOARD_NAME) initramfs' -d $@:$@.fakerd:$@.dtb $@.new
-  DEVICE_DTS := netgear-wndap660
+	mv $@.new $@
-endef
+	rm -rf $@.fakerd
   PAGESIZE := 2048
   SUBPAGESIZE := 512
   BLOCKSIZE := 128k
   DTB_SIZE := 131008
   IMAGE_SIZE := 24960k
-  IMAGES := factory.img sysupgrade.bin
+  IMAGES := factory.img sysupgrade.tar kernel.dtb
-  ARTIFACTS := device-tree.dtb
   KERNEL_SIZE := 3584k
   # append a fake/empty rootfs to fool netgear's uboot
   # CHECK_DNI_FIRMWARE_ROOTFS_INTEGRITY in do_chk_dniimg()
   KERNEL := kernel-bin | lzma | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | \
 	    append-uImage-fakehdr filesystem | dtb | create-uImage-dtb | prepend-dtb
   KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip
   IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
 		       netgear-dni | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
-  ARTIFACT/device-tree.dtb := export-dtb | uImage none
+  IMAGE/kernel.dtb := export-dtb | uImage none
   NETGEAR_BOARD_ID := WNDR4700
   NETGEAR_HW_ID := 29763875+128+256
   UBINIZE_OPTS := -E 5
   SUPPORTED_DEVICES += wndr4700
 endef
 endif
+ifeq ($(SUBTARGET),sata)
+### Image scripts for the WD My Book Live Series ###
+define Build/boot-script
+	$(STAGING_DIR_HOST)/bin/mkimage -A powerpc -T script -C none -n "$(PROFILE) Boot Script" \
+		-d mbl_boot.scr \
+		$@.scr
+endef
+define Build/boot-img
+	$(RM) -rf $@.bootdir
-ifeq ($(SUBTARGET),sata)
+	mkdir -p $@.bootdir/boot
+	$(CP) $@.scr $@.bootdir/boot/boot.scr
+	$(CP) $(IMAGE_KERNEL).dtb $@.bootdir/boot/$(DEVICE_DTB)
+	$(CP) $(IMAGE_KERNEL) $@.bootdir/boot/uImage
+	genext2fs --block-size $(BLOCKSIZE:%k=%Ki) --size-in-blocks $$((1024 * $(BOOT_SIZE))) --root $@.bootdir $@.boot
+	# convert it to revision 1 - needed for u-boot ext2load
+	$(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.boot
+	$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.boot > /dev/null
+endef
+define Build/hdd-img
-define Device/wd_mybooklive
+	./mbl_gen_hdd_img.sh $@ $@.boot $(IMAGE_ROOTFS)
-  DEVICE_TITLE := Western Digital My Book Live Series (Single + Duo)
+endef
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic
-  DEVICE_DTS := wd-mybooklive
+define Device/MyBookLiveDefault
-  SUPPORTED_DEVICES += mbl wd,mybooklive-duo
+  IMAGE_SIZE := 48m
   BLOCKSIZE := 1k
   DTB_SIZE := 16384
   KERNEL := kernel-bin | dtb | gzip | uImage gzip
-  KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip
+  KERNEL_INITRAMFS := kernel-bin | dtb | gzip | uImage gzip
-  IMAGES := factory.img.gz kernel.dtb sysupgrade.img.gz
+  BOOT_SIZE := 8
-  ARTIFACTS := apollo3g.dtb
+  IMAGES := rootfs.img.gz kernel.dtb
   DEVICE_DTB := apollo3g.dtb
+  FILESYSTEMS := ext4
+  IMAGE/kernel.dtb := export-dtb
+  IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip | append-metadata
+endef
-  FILESYSTEMS := ext4 squashfs
+define Device/wd_mybooklive
+$(Device/MyBookLiveDefault)
-  IMAGE/factory.img.gz := boot-script | boot-img | hdd-img | gzip
+  DEVICE_TITLE := Western Digital My Book Live
-  IMAGE/sysupgrade.img.gz := boot-script | boot-img | hdd-img | gzip | append-metadata
+  DEVICE_DTS := wd-mybooklive
+  SUPPORTED_DEVICES += mbl
+endef
+TARGET_DEVICES += wd_mybooklive
+define Device/wd_mybooklive-duo
+$(Device/MyBookLiveDefault)
+  DEVICE_TITLE := Western Digital My Book Live Duo
+  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini
+  DEVICE_DTS := wd-mybooklive-duo
-  ARTIFACT/apollo3g.dtb := export-dtb
+  SUPPORTED_DEVICES += mbl
 endef