OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 5... Line 5...
5 include $(TOPDIR)/rules.mk 5 include $(TOPDIR)/rules.mk
6 include $(INCLUDE_DIR)/image.mk 6 include $(INCLUDE_DIR)/image.mk
Line 7... Line 7...
7   7  
Line 8... Line -...
8 DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT -  
9   -  
10 define rootfs_align -  
11 $(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1)))))) -  
12 endef -  
13   -  
14 # combine kernel and rootfs into one image -  
15 # mktplinkfw <type> <optional extra arguments to mktplinkfw binary> -  
16 # <type> is "sysupgrade" or "factory" -  
17 # -  
18 # -a align the rootfs start on an <align> bytes boundary -  
19 # -j add jffs2 end-of-filesystem markers -  
20 # -s strip padding from end of the image -  
21 # -X reserve <size> bytes in the firmware image (hexval prefixed with 0x) -  
22 define Build/mktplinkfw -  
23 -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -  
24 -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \ -  
25 -k $(IMAGE_KERNEL) \ -  
26 -r $@ \ -  
27 -o $@.new \ -  
28 -j -X 0x40000 \ -  
29 -a $(call rootfs_align,$(FILESYSTEM)) \ -  
30 $(wordlist 2,$(words $(1)),$(1)) \ -  
31 $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ -  
32 endef 8 DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT
33   9  
34 define Device/Default 10 define Device/Default
35 PROFILES := Default 11 PROFILES := Default
36 DEVICE_DTS := $(1) 12 DEVICE_DTS := $(1)
37 KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) 13 KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
38 KERNEL_ENTRY := 0x00000000 14 KERNEL_ENTRY := 0x00000000
39 KERNEL_LOADADDR := 0x00000000 15 KERNEL_LOADADDR := 0x00000000
Line -... Line 16...
-   16 KERNEL := kernel-bin
-   17 endef
-   18  
-   19 define Build/tplink-v1-image
-   20 $(STAGING_DIR_HOST)/bin/mktplinkfw \
-   21 -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \
-   22 -N "$(VERSION_DIST)" -V $(REVISION) \
-   23 -k $(IMAGE_KERNEL) \
-   24 -r $(IMAGE_ROOTFS) \
-   25 -j \
-   26 $(1) \
40 KERNEL := kernel-bin 27 -o $@
Line 41... Line 28...
41 endef 28 endef
42   29  
43 ifeq ($(SUBTARGET),generic) 30 ifeq ($(SUBTARGET),generic)
44   31  
45 define Device/tl-wdr4900-v1 32 define Device/tl-wdr4900-v1
46 DEVICE_TITLE := TP-Link TL-WDR4900 33 DEVICE_TITLE := TP-Link TL-WDR4900
47 DEVICE_PACKAGES := kmod-ath9k wpad-basic 34 DEVICE_PACKAGES := kmod-ath9k wpad-mini
48 TPLINK_HWID := 0x49000001 -  
49 TPLINK_HWREV := 1 35 TPLINK_HWID := 0x49000001
50 TPLINK_FLASHLAYOUT := 16Mppc 36 TPLINK_HWREV := 1
51 KERNEL_NAME := cuImage.tl-wdr4900-v1 37 TPLINK_FLASHLAYOUT := 16Mppc
52 KERNEL_INITRAMFS := 38 KERNEL_NAME := cuImage.tl-wdr4900-v1
53 SUPPORTED_DEVICES:=tl-wdr4900-v1 tplink,tl-wdr4900-v1 39 SUPPORTED_DEVICES:=tl-wdr4900-v1 tplink,tl-wdr4900-v1
54 IMAGES := fdt.bin factory.bin sysupgrade.bin 40 IMAGES := fdt.bin factory.bin sysupgrade.bin
55 IMAGE/fdt.bin := append-dtb 41 IMAGE/fdt.bin := append-dtb
Line 56... Line -...
56 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata -  
57 IMAGE/factory.bin := append-rootfs | mktplinkfw factory -  
58 endef -  
59 TARGET_DEVICES += tl-wdr4900-v1 -  
60   -  
61 define Device/red-15w-rev1 -  
62 DEVICE_TITLE := Sophos RED 15w Rev.1 -  
63 DEVICE_PACKAGES := kmod-usb2 -  
64 # Original firmware uses a dedicated DTB-partition. -  
65 # The bootloader however supports FIT-images. -  
66 KERNEL = kernel-bin | gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb -  
67 SUPPORTED_DEVICES := sophos,red-15w-rev1 -  
68 IMAGES := sysupgrade.bin 42 IMAGE/factory.bin := tplink-v1-image
Line 69... Line 43...
69 IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata 43 IMAGE/sysupgrade.bin := tplink-v1-image -s | append-metadata
Line 70... Line 44...
70 endef 44 endef
71 TARGET_DEVICES += red-15w-rev1 45 TARGET_DEVICES += tl-wdr4900-v1
72   46  
73 endif 47 endif
74   48  
75 ifeq ($(SUBTARGET),p1020) 49 ifeq ($(SUBTARGET),p1020)
76   50  
77 define Device/hiveap-330 51 define Device/hiveap-330
Line 88... Line 62...
88 append-rootfs | pad-rootfs $$(BLOCKSIZE) | pad-to 41216k | check-size 41216k | \ 62 append-rootfs | pad-rootfs $$(BLOCKSIZE) | pad-to 41216k | check-size 41216k | \
89 append-kernel | append-metadata 63 append-kernel | append-metadata
90 endef 64 endef
91 TARGET_DEVICES += hiveap-330 65 TARGET_DEVICES += hiveap-330
Line 92... Line -...
92   -  
93 define Device/panda -  
94 DEVICE_TITLE := OCEDO Panda -  
95 DEVICE_PACKAGES := kmod-rtc-ds1307 kmod-usb2 uboot-envtools -  
96 KERNEL = kernel-bin | gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb -  
97 PAGESIZE := 2048 -  
98 SUBPAGESIZE := 512 -  
99 BLOCKSIZE := 128k -  
100 SUPPORTED_DEVICES := ocedo,panda -  
101 IMAGES := fdt.bin sysupgrade.bin -  
102 IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata -  
103 IMAGE/fdt.bin := append-dtb -  
104 endef -  
105 TARGET_DEVICES += panda -  
106   -  
107 endif -  
108   -  
109 ifeq ($(SUBTARGET),p2020) -  
110   -  
111 define Device/p2020rdb -  
112 DEVICE_TITLE := Freescale P2020RDB -  
113 DEVICE_DTS_DIR := $(DTS_DIR)/fsl -  
114 DEVICE_PACKAGES := kmod-hwmon-core kmod-hwmon-lm90 kmod-rtc-ds1307 \ -  
115 kmod-gpio-pca953x kmod-eeprom-at24 -  
116 BLOCKSIZE := 128k -  
117 KERNEL := kernel-bin | gzip | \ -  
118 fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb -  
119 SUPPORTED_DEVICES := fsl,P2020RDB -  
120 IMAGES := sysupgrade.bin -  
121 IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ -  
122 pad-rootfs $$(BLOCKSIZE) | append-metadata -  
123 endef -  
124 TARGET_DEVICES += p2020rdb -  
125   66  
Line 126... Line 67...
126 endif 67 endif