X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fapm821xx%2Fimage%2FMakefile;h=48eef643e148d661351db1b94cf89e5b2a7a52de;hb=f478ec2007b93b87fba606eae49688753281c85f;hp=25ee67b673aa9aad4afb5dbce62586f53557033a;hpb=63b525dd6b209af5554a2d053efd4b3ce6f60c9c;p=openwrt%2Fopenwrt.git diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 25ee67b673..48eef643e1 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -69,23 +69,59 @@ define Device/mr24 DEVICE_PACKAGES := kmod-spi-gpio kmod-ath9k wpad-mini DEVICE_PROFILE := MR24 DEVICE_DTS := MR24 - BLOCKSIZE := 64512 + BLOCKSIZE := 63k IMAGES := sysupgrade.tar DTB_SIZE := 64512 - KERNEL_SIZE := 2048k + KERNEL_SIZE := 1984k IMAGE_SIZE := 8191k KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND - KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | gzip | uImage gzip | MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | MerakiNAND + KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | lzma | uImage lzma | \ + check-size $$(KERNEL_SIZE) | \ + MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \ + MerakiNAND IMAGE/sysupgrade.tar := sysupgrade-tar + UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += mr24 +define Device/mx60 + DEVICE_TITLE := Cisco Meraki MX60 + DEVICE_PACKAGES := kmod-spi-gpio swconfig kmod-usb-ledtrig-usbport \ + kmod-usb-dwc2 kmod-usb-storage block-mount + DEVICE_PROFILE := MX60 + DEVICE_DTS := 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 + # MX60 kernel header definition which is found at + # ./tools/firmware-utils/src/mkmerakifw.c, line 103~ + KERNEL_SIZE := 2984k + IMAGE_SIZE := 1021m + KERNEL := kernel-bin | gzip | uImage gzip | MerakiAdd-dtb | MerakiNAND + KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | gzip | uImage gzip | \ + check-size $$(KERNEL_SIZE) | \ + MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \ + MerakiNAND + IMAGE/sysupgrade.tar := sysupgrade-tar + UBINIZE_OPTS := -E 5 +endef +TARGET_DEVICES += mx60 + +define Device/mx60w +$(Device/mx60) + DEVICE_TITLE := Cisco Meraki MX60W + DEVICE_PACKAGES += kmod-ath9k wpad-mini +endef +TARGET_DEVICES += mx60w + define Build/create-uImage-dtb # flat_dt target expect FIT image - which WNDR4700's uboot doesn't support -$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \ -O linux -T kernel -C none \ -n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' \ - -d $@.dtb $@.new + -d $(IMAGE_KERNEL).dtb $@.new @mv $@.new $@ endef @@ -138,7 +174,7 @@ endef define Device/WNDR4700 DEVICE_TITLE := Netgear Centria N900 WNDR4700/WNDR4720 DEVICE_PACKAGES := badblocks block-mount e2fsprogs \ - kmod-ath9k kmod-dm kmod-fs-ext4 kmod-fs-vfat kmod-ledtrig-usbdev \ + kmod-ath9k kmod-dm kmod-fs-ext4 kmod-fs-vfat kmod-usb-ledtrig-usbport \ kmod-md-mod kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-iso8859-15 \ kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \ partx-utils swconfig wpad-mini @@ -147,18 +183,19 @@ define Device/WNDR4700 DEVICE_DTS := wndr4700 PAGESIZE := 2048 SUBPAGESIZE := 512 - BLOCKSIZE := 131072 + BLOCKSIZE := 128k DTB_SIZE := 131008 - IMAGE_SIZE:=25559040 + IMAGE_SIZE := 24960k IMAGES := factory.img sysupgrade.tar KERNEL_SIZE := 1920k - KERNEL := kernel-bin | lzma | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | append-fakerootfs + KERNEL := dtb | kernel-bin | lzma | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | append-fakerootfs KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip - IMAGE/factory.img := dtb | create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \ + IMAGE/factory.img := create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \ netgear-dni | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.tar := sysupgrade-tar NETGEAR_BOARD_ID := WNDR4700 NETGEAR_HW_ID := 29763875+128+256 + UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += WNDR4700 @@ -178,10 +215,10 @@ define Build/boot-img mkdir -p $@.bootdir/boot $(CP) $@.scr $@.bootdir/boot/boot.scr - $(CP) $@.dtb $@.bootdir/boot/$(DEVICE_DTB) + $(CP) $(IMAGE_KERNEL).dtb $@.bootdir/boot/$(DEVICE_DTB) $(CP) $(IMAGE_KERNEL) $@.bootdir/boot/uImage - genext2fs --block-size $(BLOCKSIZE) --size-in-blocks $$((1024 * $(BOOT_SIZE))) --root $@.bootdir $@.boot + 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 @@ -193,36 +230,22 @@ define Build/hdd-img $(if $(CONFIG_TARGET_IMAGES_GZIP),gzip -9n -c $@ > $(BIN_DIR)/$(notdir $@).gz) endef -define Build/uRamdisk - $(STAGING_DIR_HOST)/bin/mkimage \ - -A powerpc -T ramdisk -C gzip \ - -n "$(DEVICE_NAME) rootfs" \ - -d $@ $@.new - mv $@.new $@ -endef - -define Build/recovery-tar - sh ./mbl_gen_recovery_tar.sh \ - --profile $(DEVICE_PROFILE) \ - --dtb $(IMAGE_KERNEL).dtb \ - --dtbname $(DEVICE_DTB) \ - --kernel $(IMAGE_KERNEL) \ - --rootfs $@ \ - $@ +define Build/export-dtb + cp $(IMAGE_KERNEL).dtb $@ endef define Device/MyBookLiveDefault IMAGE_SIZE := 48m - BLOCKSIZE := 1024 + BLOCKSIZE := 1k DTB_SIZE := 16384 KERNEL := kernel-bin | dtb | gzip | uImage gzip + KERNEL_INITRAMFS := kernel-bin | dtb | gzip | uImage gzip BOOT_SIZE := 8 - IMAGES := rootfs.img recovery.tar kernel.dtb + IMAGES := rootfs.img kernel.dtb DEVICE_DTB := apollo3g.dtb FILESYSTEMS := ext4 - IMAGE/kernel.dtb := append-dtb - IMAGE/rootfs.img := boot-script | dtb | boot-img | hdd-img - IMAGE/recovery.tar := append-rootfs | gzip | uRamdisk | recovery-tar + IMAGE/kernel.dtb := export-dtb + IMAGE/rootfs.img := boot-script | boot-img | hdd-img endef define Device/MyBookLiveSingle @@ -237,7 +260,7 @@ TARGET_DEVICES += MyBookLiveSingle define Device/MyBookLiveDuo $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live Duo - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev kmod-usb-storage kmod-fs-vfat wpad-mini + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini DEVICE_DTS := apollo3g-duo DEVICE_PROFILE := ap2nc endef