OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 150... | Line 150... | |||
| 150 | rm -f $(1).gz |
150 | rm -f $(1).gz |
|
| 151 | gzip -9n $(1) |
151 | gzip -9n $(1) |
|
| 152 | endef |
152 | endef |
|
| 153 | endif |
153 | endif |
|
| Line 154... | Line -... | |||
| 154 | |
- | ||
| 155 | |
- | ||
| 156 | # Disable noisy checks by default as in upstream |
- | ||
| 157 | ifeq ($(strip $(call kernel_patchver_ge,4.6.0)),1) |
- | ||
| 158 | DTC_FLAGS += -Wno-unit_address_vs_reg |
- | ||
| 159 | endif |
- | ||
| 160 | ifeq ($(strip $(call kernel_patchver_ge,4.11.0)),1) |
- | ||
| 161 | DTC_FLAGS += \ |
- | ||
| 162 | -Wno-unit_address_vs_reg \ |
- | ||
| 163 | -Wno-simple_bus_reg \ |
- | ||
| 164 | -Wno-unit_address_format \ |
- | ||
| 165 | -Wno-pci_bridge \ |
- | ||
| 166 | -Wno-pci_device_bus_num \ |
- | ||
| 167 | -Wno-pci_device_reg |
- | ||
| 168 | endif |
- | ||
| 169 | ifeq ($(strip $(call kernel_patchver_ge,4.16.0)),1) |
- | ||
| 170 | DTC_FLAGS += \ |
- | ||
| 171 | -Wno-avoid_unnecessary_addr_size \ |
- | ||
| 172 | -Wno-alias_paths |
- | ||
| 173 | endif |
- | ||
| 174 | ifeq ($(strip $(call kernel_patchver_ge,4.17.0)),1) |
- | ||
| 175 | DTC_FLAGS += \ |
- | ||
| 176 | -Wno-graph_child_address \ |
- | ||
| 177 | -Wno-graph_port \ |
- | ||
| 178 | -Wno-unique_unit_address |
- | ||
| 179 | endif |
- | ||
| 180 | |
154 | |
|
| 181 | # $(1) source dts file |
155 | # $(1) source dts file |
|
| 182 | # $(2) target dtb file |
156 | # $(2) target dtb file |
|
| 183 | # $(3) extra CPP flags |
157 | # $(3) extra CPP flags |
|
| 184 | # $(4) extra DTC flags |
158 | # $(4) extra DTC flags |
|
| Line 188... | Line 162... | |||
| 188 | -I$(DTS_DIR)/include \ |
162 | -I$(DTS_DIR)/include \ |
|
| 189 | -I$(LINUX_DIR)/include/ \ |
163 | -I$(LINUX_DIR)/include/ \ |
|
| 190 | -undef -D__DTS__ $(3) \ |
164 | -undef -D__DTS__ $(3) \ |
|
| 191 | -o $(2).tmp $(1) |
165 | -o $(2).tmp $(1) |
|
| 192 | $(LINUX_DIR)/scripts/dtc/dtc -O dtb \ |
166 | $(LINUX_DIR)/scripts/dtc/dtc -O dtb \ |
|
| 193 | -i$(dir $(1)) $(DTC_FLAGS) $(4) \ |
167 | -i$(dir $(1)) $(4) \ |
|
| 194 | -o $(2) $(2).tmp |
168 | -o $(2) $(2).tmp |
|
| 195 | $(RM) $(2).tmp |
169 | $(RM) $(2).tmp |
|
| 196 | endef |
170 | endef |
|
| Line 197... | Line 171... | |||
| 197 | |
171 | |
|
| Line 227... | Line 201... | |||
| 227 | |
201 | |
|
| 228 | define Image/mkfs/squashfs |
202 | define Image/mkfs/squashfs |
|
| 229 | $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \ |
203 | $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \ |
|
| 230 | -nopad -noappend -root-owned \ |
204 | -nopad -noappend -root-owned \ |
|
| 231 | -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \ |
205 | -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \ |
|
| - | 206 | -processors 1 \ |
||
| 232 | -processors 1 |
207 | $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH)) |
|
| Line 233... | Line 208... | |||
| 233 | endef |
208 | endef |
|
| 234 | |
209 | |
|
| 235 | # $(1): board name |
210 | # $(1): board name |
|
| Line 302... | Line 277... | |||
| 302 | ( cd $(TARGET_DIR); find . | cpio -o -H newc -R root:root | gzip -9n >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) |
277 | ( cd $(TARGET_DIR); find . | cpio -o -H newc -R root:root | gzip -9n >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) |
|
| 303 | endef |
278 | endef |
|
| 304 | endif |
279 | endif |
|
| Line 305... | Line 280... | |||
| 305 | |
280 | |
|
| 306 | mkfs_packages = $(filter-out @%,$(PACKAGES_$(call param_get,pkg,pkg=$(target_params)))) |
281 | mkfs_packages = $(filter-out @%,$(PACKAGES_$(call param_get,pkg,pkg=$(target_params)))) |
|
| 307 | mkfs_packages_add = $(foreach pkg,$(filter-out -%,$(mkfs_packages)),$(pkg)$(call GetABISuffix,$(pkg))) |
282 | mkfs_packages_add = $(filter-out -%,$(mkfs_packages)) |
|
| 308 | mkfs_packages_remove = $(foreach pkg,$(patsubst -%,%,$(filter -%,$(mkfs_packages))),$(pkg)$(call GetABISuffix,$(pkg))) |
283 | mkfs_packages_remove = $(patsubst -%,%,$(filter -%,$(mkfs_packages))) |
|
| Line 309... | Line 284... | |||
| 309 | mkfs_cur_target_dir = $(call mkfs_target_dir,pkg=$(target_params)) |
284 | mkfs_cur_target_dir = $(call mkfs_target_dir,pkg=$(target_params)) |
|
| 310 | |
285 | |
|
| 311 | opkg_target = \ |
286 | opkg_target = \ |
|
| Line 344... | Line 319... | |||
| 344 | KERNEL_INITRAMFS = $$(KERNEL) |
319 | KERNEL_INITRAMFS = $$(KERNEL) |
|
| 345 | KERNEL_SIZE:= |
320 | KERNEL_SIZE:= |
|
| 346 | CMDLINE:= |
321 | CMDLINE:= |
|
| Line 347... | Line 322... | |||
| 347 | |
322 | |
|
| 348 | IMAGES := |
- | ||
| 349 | ARTIFACTS := |
323 | IMAGES := |
|
| 350 | IMAGE_PREFIX := $(IMG_PREFIX)-$(1) |
324 | IMAGE_PREFIX := $(IMG_PREFIX)-$(1) |
|
| 351 | IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) |
325 | IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) |
|
| 352 | KERNEL_PREFIX = $$(IMAGE_PREFIX) |
326 | KERNEL_PREFIX = $$(IMAGE_PREFIX) |
|
| 353 | KERNEL_SUFFIX := -kernel.bin |
327 | KERNEL_SUFFIX := -kernel.bin |
|
| Line 384... | Line 358... | |||
| 384 | |
358 | |
|
| 385 | FILESYSTEMS := $(TARGET_FILESYSTEMS) |
359 | FILESYSTEMS := $(TARGET_FILESYSTEMS) |
|
| Line 386... | Line 360... | |||
| 386 | endef |
360 | endef |
|
| 387 | |
361 | |
|
| - | 362 | DEFAULT_DEVICE_VARS := \ |
||
| 388 | DEFAULT_DEVICE_VARS := \ |
363 | DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_SIZE KERNEL_INITRAMFS_IMAGE \ |
|
| 389 | DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE KERNEL_SIZE \ |
364 | KERNEL_LOADADDR DEVICE_DTS DEVICE_DTS_CONFIG DEVICE_DTS_DIR BOARD_NAME \ |
|
| 390 | CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \ |
365 | CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI \ |
|
| 391 | VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \ |
366 | BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \ |
|
| Line 392... | Line 367... | |||
| 392 | DEVICE_DTS_CONFIG DEVICE_DTS_DIR BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \ |
367 | UBINIZE_OPTS UIMAGE_NAME UBINIZE_PARTS \ |
|
| 393 | IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR |
368 | SUPPORTED_DEVICES IMAGE_METADATA |
|
| Line 394... | Line 369... | |||
| 394 | |
369 | |
|
| Line 521... | Line 496... | |||
| 521 | $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)) |
496 | $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)) |
|
| 522 | cp $$^ $$@ |
497 | cp $$^ $$@ |
|
| Line 523... | Line 498... | |||
| 523 | |
498 | |
|
| Line 524... | Line -... | |||
| 524 | endef |
- | ||
| 525 | |
- | ||
| 526 | define Device/Build/artifact |
- | ||
| 527 | $$(_TARGET): $(BIN_DIR)/$(IMAGE_PREFIX)-$(1) |
- | ||
| 528 | $(eval $(call Device/Export,$(KDIR)/tmp/$(IMAGE_PREFIX)-$(1))) |
- | ||
| 529 | $(KDIR)/tmp/$(IMAGE_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE) |
- | ||
| 530 | @rm -f $$@ |
- | ||
| 531 | $$(call concat_cmd,$(ARTIFACT/$(1))) |
- | ||
| 532 | |
- | ||
| 533 | .IGNORE: $(BIN_DIR)/$(IMAGE_PREFIX)-$(1) |
- | ||
| 534 | |
- | ||
| 535 | $(BIN_DIR)/$(IMAGE_PREFIX)-$(1): $(KDIR)/tmp/$(IMAGE_PREFIX)-$(1) |
- | ||
| 536 | cp $$^ $$@ |
- | ||
| 537 | |
- | ||
| 538 | endef |
499 | endef |
|
| 539 | |
500 | |
|
| 540 | define Device/Build |
501 | define Device/Build |
|
| Line 541... | Line 502... | |||
| 541 | $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1))) |
502 | $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1))) |
|
| 542 | $(call Device/Build/kernel,$(1)) |
503 | $(call Device/Build/kernel,$(1)) |
|
| Line 543... | Line 504... | |||
| 543 | |
504 | |
|
| 544 | $$(eval $$(foreach compile,$$(COMPILE), \ |
505 | $$(eval $$(foreach compile,$$(COMPILE), \ |
|
| 545 | $$(call Device/Build/compile,$$(compile),$(1)))) |
506 | $$(call Device/Build/compile,$$(compile),$(1)))) |
|
| 546 | |
- | ||
| 547 | $$(eval $$(foreach image,$$(IMAGES), \ |
- | ||
| 548 | $$(foreach fs,$$(filter $(TARGET_FILESYSTEMS),$$(FILESYSTEMS)), \ |
- | ||
| 549 | $$(call Device/Build/image,$$(fs),$$(image),$(1))))) |
- | ||
| 550 | |
507 | |
|
| Line 551... | Line 508... | |||
| 551 | $$(eval $$(foreach artifact,$$(ARTIFACTS), \ |
508 | $$(eval $$(foreach image,$$(IMAGES), \ |
|
| 552 | $$(call Device/Build/artifact,$$(artifact)))) |
509 | $$(foreach fs,$$(filter $(TARGET_FILESYSTEMS),$$(FILESYSTEMS)), \ |
|
| 553 | |
510 | $$(call Device/Build/image,$$(fs),$$(image),$(1))))) |
|
| Line 604... | Line 561... | |||
| 604 | image_prepare: compile |
561 | image_prepare: compile |
|
| 605 | mkdir -p $(BIN_DIR) $(KDIR)/tmp |
562 | mkdir -p $(BIN_DIR) $(KDIR)/tmp |
|
| 606 | $(call Image/Prepare) |
563 | $(call Image/Prepare) |
|
| Line 607... | Line 564... | |||
| 607 | |
564 | |
|
| 608 | legacy-images-prepare-make: image_prepare |
565 | legacy-images-prepare-make: image_prepare |
|
| Line 609... | Line 566... | |||
| 609 | $(MAKE) legacy-images-prepare BIN_DIR="$(BIN_DIR)" |
566 | $(MAKE) legacy-images-prepare |
|
| 610 | |
567 | |
|
| 611 | else |
568 | else |
|
| 612 | image_prepare: |
569 | image_prepare: |
|
| Line 628... | Line 585... | |||
| 628 | $(call Image/Build,$(fs)) |
585 | $(call Image/Build,$(fs)) |
|
| 629 | ) |
586 | ) |
|
| Line 630... | Line 587... | |||
| 630 | |
587 | |
|
| 631 | legacy-images-make: install-images |
588 | legacy-images-make: install-images |
|
| 632 | $(call Image/mkfs/ubifs/legacy) |
589 | $(call Image/mkfs/ubifs/legacy) |
|
| Line 633... | Line 590... | |||
| 633 | $(MAKE) legacy-images BIN_DIR="$(BIN_DIR)" |
590 | $(MAKE) legacy-images |
|
| 634 | |
591 | |
|
| Line 635... | Line 592... | |||
| 635 | install: install-images |
592 | install: install-images |
|