OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 9... Line 9...
9   9  
10 ################################################# 10 #################################################
11 # Images 11 # Images
Line 12... Line 12...
12 ################################################# 12 #################################################
Line 13... Line 13...
13   13  
14 DEVICE_VARS += MKUBIFS_OPTS UBOOT BOOT_SCRIPT 14 DEVICE_VARS += MKUBIFS_OPTS
15   15  
Line 49... Line 49...
49 $(TAR) -C $@.boot \ 49 $(TAR) -C $@.boot \
50 --numeric-owner --owner=0 --group=0 --transform "s,./,./boot/," \ 50 --numeric-owner --owner=0 --group=0 --transform "s,./,./boot/," \
51 -czvf $@ . 51 -czvf $@ .
52 endef 52 endef
Line 53... Line -...
53   -  
54 define Build/boot-scr -  
55 mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -  
56 -n '$(DEVICE_ID) OpenWrt bootscript' \ -  
57 -d ./bootscript-$(DEVICE_NAME) \ -  
58 $(BIN_DIR)/boot.scr -  
59 endef -  
60   -  
61 define Build/imx6-sdcard -  
62 rm -rf $@.boot -  
63 mkdir -p $@.boot -  
64   -  
65 $(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img $@.boot/u-boot.img -  
66 $(CP) $(IMAGE_KERNEL) $@.boot/uImage -  
67   -  
68 $(foreach dts,$(DEVICE_DTS), \ -  
69 $(CP) \ -  
70 $(DTS_DIR)/$(dts).dtb \ -  
71 $@.boot/; -  
72 ) -  
73   -  
74 mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -  
75 -n '$(DEVICE_ID) OpenWrt bootscript' \ -  
76 -d $(BOOT_SCRIPT) \ -  
77 $@.boot/boot.scr -  
78   -  
79 cp $@ $@.fs -  
80   -  
81 $(SCRIPT_DIR)/gen_image_generic.sh $@ \ -  
82 $(CONFIG_TARGET_KERNEL_PARTSIZE) \ -  
83 $@.boot \ -  
84 $(CONFIG_TARGET_ROOTFS_PARTSIZE) \ -  
85 $@.fs \ -  
86 1024 -  
87   -  
88 dd if=$(STAGING_DIR_IMAGE)/$(UBOOT)-SPL of=$@ bs=1024 seek=1 conv=notrunc -  
89   -  
90 rm -rf $@.boot $@.fs -  
91 endef -  
92   53  
93 ################################################# 54 #################################################
94 # Devices 55 # Devices
Line 95... Line 56...
95 ################################################# 56 #################################################
Line 102... Line 63...
102 KERNEL_INSTALL := 1 63 KERNEL_INSTALL := 1
103 KERNEL_SUFFIX := -uImage 64 KERNEL_SUFFIX := -uImage
104 KERNEL_NAME := zImage 65 KERNEL_NAME := zImage
105 KERNEL_PREFIX := $$(IMAGE_PREFIX) 66 KERNEL_PREFIX := $$(IMAGE_PREFIX)
106 KERNEL := kernel-bin | uImage none 67 KERNEL := kernel-bin | uImage none
-   68 IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
107 IMAGES := 69 IMAGES :=
108 endef 70 endef
Line 109... Line 71...
109   71  
110 define Device/ventana 72 define Device/ventana
Line 132... Line 94...
132 kmod-hwmon-gsc \ 94 kmod-hwmon-gsc \
133 kmod-leds-gpio kmod-pps-gpio \ 95 kmod-leds-gpio kmod-pps-gpio \
134 kobs-ng 96 kobs-ng
135 KERNEL += | boot-overlay 97 KERNEL += | boot-overlay
136 IMAGES := nand.ubi bootfs.tar.gz 98 IMAGES := nand.ubi bootfs.tar.gz
137 IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2) -  
138 UBINIZE_PARTS = boot=$$(KDIR_KERNEL_IMAGE).boot.ubifs=15 99 UBINIZE_PARTS = boot=$$(KDIR_KERNEL_IMAGE).boot.ubifs=15
139 BOOT_SCRIPT := bootscript-ventana -  
140 IMAGE/nand.ubi := append-ubi 100 IMAGE/nand.ubi := append-ubi
141 IMAGE/bootfs.tar.gz := bootfs.tar.gz | install-dtb 101 IMAGE/bootfs.tar.gz := bootfs.tar.gz | install-dtb
142 IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) 102 IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2)
143 PAGESIZE := 2048 103 PAGESIZE := 2048
144 BLOCKSIZE := 128k 104 BLOCKSIZE := 128k
Line 161... Line 121...
161 DEVICE_TITLE := Wandboard Dual 121 DEVICE_TITLE := Wandboard Dual
162 DEVICE_DTS := imx6dl-wandboard 122 DEVICE_DTS := imx6dl-wandboard
163 endef 123 endef
164 TARGET_DEVICES += wandboard 124 TARGET_DEVICES += wandboard
Line 165... Line -...
165   -  
166 define Device/cubox-i -  
167 KERNEL := kernel-bin | install-dtb -  
168 UBOOT := mx6cuboxi -  
169 BOOT_SCRIPT = bootscript-cubox -  
170 DEVICE_NAME := cubox -  
171 DEVICE_TITLE := SolidRun CuBox-i -  
172 DEVICE_PACKAGES := kmod-drm-imx kmod-drm-imx-hdmi kmod-usb-hid -  
173 DEVICE_DTS := imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard -  
174 IMAGES := combined.bin -  
175 FILESYSTEMS := squashfs -  
176 IMAGE/combined.bin := append-rootfs | pad-extra 128k | imx6-sdcard -  
177 endef -  
178 TARGET_DEVICES += cubox-i -  
179   125