OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 DEVICE_VARS += LOADER_FLASH_OFFS TPLINK_BOARD_ID TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION TPLINK_HWID TPLINK_HWREV 1 DEVICE_VARS += LOADER_FLASH_OFFS TPLINK_BOARD_ID TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION TPLINK_HWID TPLINK_HWREV
Line -... Line 2...
-   2  
-   3 define Build/copy-file
-   4 cat "$(1)" > "$@"
-   5 endef
2   6  
3 # Arguments: <output name> <kernel offset> 7 # Arguments: <output name> <kernel offset>
4 define Build/loader-okli 8 define Build/loader-okli
5 dd if=$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE) bs=$(word 2,$(1)) conv=sync of="$@.new" 9 dd if=$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE) bs=$(word 2,$(1)) conv=sync of="$@.new"
6 cat "$@" >> "$@.new" 10 cat "$@" >> "$@.new"
Line 42... Line 46...
42   46  
43   47  
44 define Device/tplink 48 define Device/tplink
45 TPLINK_HWREV := 0x1 -  
46 TPLINK_HEADER_VERSION := 1 -  
47 IMAGES := sysupgrade.bin factory.bin -  
48 endef -  
49   49 TPLINK_HWREV := 0x1
50 define Device/tplink-lzma 50 TPLINK_HEADER_VERSION := 1
51 $(Device/tplink) 51 LOADER_TYPE := gz
-   52 KERNEL := kernel-bin | patch-cmdline | lzma
52 KERNEL := kernel-bin | patch-cmdline | lzma 53 KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | tplink-v1-header
53 KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | tplink-v1-header 54 IMAGES := sysupgrade.bin factory.bin
54 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade 55 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
Line 55... Line 56...
55 IMAGE/factory.bin := append-rootfs | mktplinkfw factory 56 IMAGE/factory.bin := append-rootfs | mktplinkfw factory
56 endef 57 endef
57   -  
58 define Device/tplink-nolzma 58  
59 $(Device/tplink) 59 define Device/tplink-nolzma
60 LOADER_TYPE := gz 60 $(Device/tplink)
61 LOADER_FLASH_OFFS := 0x22000 -  
62 COMPILE := loader-$(1).gz 61 LOADER_FLASH_OFFS := 0x22000
63 COMPILE/loader-$(1).gz := loader-okli-compile -  
64 KERNEL_NAME := vmlinux.bin.lzma 62 COMPILE := loader-$(1).gz
65 KERNEL := kernel-bin | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680 -  
66 KERNEL_INITRAMFS_NAME := vmlinux-initramfs.bin.lzma -  
67 KERNEL_INITRAMFS := kernel-bin | loader-kernel-cmdline | tplink-v1-header -  
68 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -  
69 IMAGE/factory.bin := append-rootfs | mktplinkfw factory -  
70 endef -  
71   -  
72 define Device/tplink-safeloader -  
73 $(Device/tplink) -  
74 KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header -  
75 IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ 63 COMPILE/loader-$(1).gz := loader-okli-compile
Line 76... Line 64...
76 append-metadata | check-size $$$$(IMAGE_SIZE) 64 KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680
77 IMAGE/factory.bin := append-rootfs | tplink-safeloader factory 65 KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel-cmdline | tplink-v1-header
78 endef 66 endef
Line 88... Line 76...
88 TPLINK_FLASHLAYOUT := 8M 76 TPLINK_FLASHLAYOUT := 8M
89 IMAGE_SIZE := 7936k 77 IMAGE_SIZE := 7936k
90 endef 78 endef
Line 91... Line 79...
91   79  
92 define Device/tplink-4mlzma 80 define Device/tplink-4mlzma
93 $(Device/tplink-lzma) 81 $(Device/tplink)
94 TPLINK_FLASHLAYOUT := 4Mlzma 82 TPLINK_FLASHLAYOUT := 4Mlzma
95 IMAGE_SIZE := 3904k 83 IMAGE_SIZE := 3904k
Line 96... Line 84...
96 endef 84 endef
97   85  
98 define Device/tplink-8mlzma 86 define Device/tplink-8mlzma
99 $(Device/tplink-lzma) 87 $(Device/tplink)
100 TPLINK_FLASHLAYOUT := 8Mlzma 88 TPLINK_FLASHLAYOUT := 8Mlzma
Line 101... Line 89...
101 IMAGE_SIZE := 7936k 89 IMAGE_SIZE := 7936k
102 endef 90 endef
103   91  
104 define Device/tplink-16mlzma 92 define Device/tplink-16mlzma
105 $(Device/tplink-lzma) 93 $(Device/tplink)