OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 7... Line 7...
7 # 7 #
Line 8... Line 8...
8   8  
9 include $(TOPDIR)/rules.mk 9 include $(TOPDIR)/rules.mk
Line 10... Line 10...
10 include $(INCLUDE_DIR)/kernel.mk 10 include $(INCLUDE_DIR)/kernel.mk
Line 11... Line 11...
11   11  
Line 12... Line 12...
12 PKG_VERSION:=2018.11 12 PKG_VERSION:=2017.11
Line 13... Line 13...
13   13  
14 PKG_HASH:=737c93f2ea03fec669e840dbee32bcf6238e6924ff5f20e4f1c472ee24e5d37e 14 PKG_HASH:=6a018fd3caf58f3dcfa23ee989a82bd35df03af71872b9dca8c6d758a0d26c05
Line 148... Line 148...
148 BUILD_SUBTARGET:=cortexa7 148 BUILD_SUBTARGET:=cortexa7
149 NAME:=Orange Pi R1 (H2+) 149 NAME:=Orange Pi R1 (H2+)
150 BUILD_DEVICES:=sun8i-h2-plus-orangepi-r1 150 BUILD_DEVICES:=sun8i-h2-plus-orangepi-r1
151 endef 151 endef
Line 152... Line -...
152   -  
153 define U-Boot/orangepi_zero -  
154 BUILD_SUBTARGET:=cortexa7 -  
155 NAME:=Orange Pi Zero (H2+) -  
156 BUILD_DEVICES:=sun8i-h2-plus-orangepi-zero -  
157 endef -  
158   -  
159 define U-Boot/orangepi_one -  
160 BUILD_SUBTARGET:=cortexa7 -  
161 NAME:=Orange Pi One (H3) -  
162 BUILD_DEVICES:=sun8i-h3-orangepi-one -  
163 endef -  
164   152  
165 define U-Boot/orangepi_pc 153 define U-Boot/orangepi_pc
166 BUILD_SUBTARGET:=cortexa7 154 BUILD_SUBTARGET:=cortexa7
167 NAME:=Orange Pi PC (H3) 155 NAME:=Orange Pi PC (H3)
168 BUILD_DEVICES:=sun8i-h3-orangepi-pc 156 BUILD_DEVICES:=sun8i-h3-orangepi-pc
Line 192... Line 180...
192 BUILD_DEVICES:=sun50i-h5-nanopi-neo-plus2 180 BUILD_DEVICES:=sun50i-h5-nanopi-neo-plus2
193 DEPENDS:=+PACKAGE_u-boot-nanopi_neo_plus2:arm-trusted-firmware-sunxi 181 DEPENDS:=+PACKAGE_u-boot-nanopi_neo_plus2:arm-trusted-firmware-sunxi
194 UENV:=a64 182 UENV:=a64
195 endef 183 endef
Line 196... Line -...
196   -  
197 define U-Boot/nanopi_neo2 -  
198 BUILD_SUBTARGET:=cortexa53 -  
199 NAME:=NanoPi NEO2 (H5) -  
200 BUILD_DEVICES:=sun50i-h5-nanopi-neo2 -  
201 DEPENDS:=+PACKAGE_u-boot-nanopi_neo2:arm-trusted-firmware-sunxi -  
202 UENV:=a64 -  
203 endef -  
204   184  
205 define U-Boot/pine64_plus 185 define U-Boot/pine64_plus
206 BUILD_SUBTARGET:=cortexa53 186 BUILD_SUBTARGET:=cortexa53
207 NAME:=Pine64 Plus A64 187 NAME:=Pine64 Plus A64
208 BUILD_DEVICES:=sun50i-a64-pine64-plus 188 BUILD_DEVICES:=sun50i-a64-pine64-plus
209 DEPENDS:=+PACKAGE_u-boot-pine64_plus:arm-trusted-firmware-sunxi 189 DEPENDS:=+PACKAGE_u-boot-pine64_plus:arm-trusted-firmware-sunxi
210 UENV:=a64 190 UENV:=a64
Line 211... Line -...
211 endef -  
212   -  
213 define U-Boot/Sinovoip_BPI_M2_Plus -  
214 BUILD_SUBTARGET:=cortexa7 -  
215 NAME:=Bananapi M2 Plus -  
216 BUILD_DEVICES:=sun8i-h3-bananapi-m2-plus -  
217 endef 191 endef
218   192  
219 define U-Boot/sopine_baseboard 193 define U-Boot/sopine_baseboard
220 BUILD_SUBTARGET:=cortexa53 194 BUILD_SUBTARGET:=cortexa53
221 NAME:=Sopine Baseboard 195 NAME:=Sopine Baseboard
Line 231... Line 205...
231 BUILD_DEVICES:=sun50i-h5-orangepi-zero-plus 205 BUILD_DEVICES:=sun50i-h5-orangepi-zero-plus
232 DEPENDS:=+PACKAGE_u-boot-orangepi_zero_plus:arm-trusted-firmware-sunxi 206 DEPENDS:=+PACKAGE_u-boot-orangepi_zero_plus:arm-trusted-firmware-sunxi
233 UENV:=a64 207 UENV:=a64
234 endef 208 endef
Line 235... Line -...
235   -  
236 define U-Boot/orangepi_pc2 -  
237 BUILD_SUBTARGET:=cortexa53 -  
238 NAME:=Xunlong Orange Pi PC2 -  
239 BUILD_DEVICES:=sun50i-h5-orangepi-pc2 -  
240 DEPENDS:=+PACKAGE_u-boot-orangepi_pc2:arm-trusted-firmware-sunxi -  
241 UENV:=a64 -  
242 endef -  
243   209  
244 UBOOT_TARGETS := \ 210 UBOOT_TARGETS := \
245 A10-OLinuXino-Lime \ 211 A10-OLinuXino-Lime \
246 A13-OLinuXino \ 212 A13-OLinuXino \
247 A20-OLinuXino-Lime \ 213 A20-OLinuXino-Lime \
Line 261... Line 227...
261 Linksprite_pcDuino3 \ 227 Linksprite_pcDuino3 \
262 Lamobo_R1 \ 228 Lamobo_R1 \
263 nanopi_m1_plus \ 229 nanopi_m1_plus \
264 nanopi_neo \ 230 nanopi_neo \
265 nanopi_neo_plus2 \ 231 nanopi_neo_plus2 \
266 nanopi_neo2 \ -  
267 orangepi_zero \ -  
268 orangepi_r1 \ 232 orangepi_r1 \
269 orangepi_one \ -  
270 orangepi_pc \ 233 orangepi_pc \
271 orangepi_plus \ 234 orangepi_plus \
272 orangepi_2 \ 235 orangepi_2 \
273 orangepi_pc2 \ -  
274 pangolin \ 236 pangolin \
275 pine64_plus \ 237 pine64_plus \
276 Sinovoip_BPI_M2_Plus \ -  
277 sopine_baseboard \ 238 sopine_baseboard \
278 orangepi_zero_plus 239 orangepi_zero_plus
Line 279... Line 240...
279   240  
Line 280... Line 241...
280 UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes 241 UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
281   242  
Line 282... Line 243...
282 UBOOT_MAKE_FLAGS += \ 243 UBOOT_MAKE_FLAGS += \
283 BL31=$(STAGING_DIR_IMAGE)/bl31.bin 244 BL31=$(STAGING_DIR_IMAGE)/bl31.bin
-   245  
-   246 define Build/InstallDev
-   247 $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
284   248 ifeq ($(SUBTARGET),cortexa53)
-   249 cat $(PKG_BUILD_DIR)/spl/sunxi-spl.bin $(PKG_BUILD_DIR)/u-boot.itb > $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-u-boot-with-spl.bin
285 define Build/InstallDev 250 else
286 $(INSTALL_DIR) $(STAGING_DIR_IMAGE) 251 $(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-u-boot-with-spl.bin
287 $(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-u-boot-with-spl.bin 252 endif
Line 288... Line 253...
288 mkimage -C none -A arm -T script -d uEnv-$(UENV).txt \ 253 mkimage -C none -A arm -T script -d uEnv-$(UENV).txt \