diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-21 17:08:19 +0100 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2018-03-21 17:08:19 +0100 |
| commit | 367ee3274d00fe7224e04ae73fb5d876ec45f58a (patch) | |
| tree | c4e09d3b346a939436b656e3d6e37c21b875c2e8 | |
| parent | 7e1e29de757b23de7befc54e2bfc01e60b903170 (diff) | |
| download | upstream-367ee3274d00fe7224e04ae73fb5d876ec45f58a.tar.gz upstream-367ee3274d00fe7224e04ae73fb5d876ec45f58a.tar.bz2 upstream-367ee3274d00fe7224e04ae73fb5d876ec45f58a.zip | |
uboot-sunxi: fix build by adding comparabilities for old dtc
We use the dtc from the kernel and that does not have all the options
which u-boot would like to use now. make these parameters optional.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
[wigyori@uid0.hu: renamed to 221-compatible-old-dtc.patch from 220-]
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
| -rw-r--r-- | package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch b/package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch new file mode 100644 index 0000000000..1b88de3e2a --- /dev/null +++ b/package/boot/uboot-sunxi/patches/221-compatible-old-dtc.patch @@ -0,0 +1,52 @@ +Revert the commit c0e032e0090d65 ("scripts/dtc: Update to upstream +version v1.4.3") +OpenWrt uses the dtc from the kernel also in u-boot, but when we compile +against kernel 4.9 we run into some errors because it is too old now. +Add the options only when they are supported to make it compatible with +dtc from kernel 4.9. + +--- a/scripts/Kbuild.include ++++ b/scripts/Kbuild.include +@@ -172,6 +172,11 @@ ld-version = $(shell $(LD) --version | $ + # Usage: $(call ld-ifversion, -ge, 22252, y) + ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3) || echo $(4)) + ++# dtc-option ++# Usage: DTC_FLAGS += $(call dtc-option,-Wno-unit_address_vs_reg) ++dtc-option = $(call try-run,\ ++ echo '/dts-v1/; / {};' | $(DTC) $(1),$(1),$(2)) ++ + ###### + + ### +--- a/scripts/Makefile.extrawarn ++++ b/scripts/Makefile.extrawarn +@@ -58,8 +58,8 @@ endif + + KBUILD_CFLAGS += $(warning) + +-dtc-warning-2 += -Wnode_name_chars_strict +-dtc-warning-2 += -Wproperty_name_chars_strict ++dtc-warning-2 += $(call dtc-option,-Wnode_name_chars_strict) ++dtc-warning-2 += $(call dtc-option,-Wproperty_name_chars_strict) + + dtc-warning := $(dtc-warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) + dtc-warning += $(dtc-warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) +@@ -70,11 +70,11 @@ DTC_FLAGS += $(dtc-warning) + else + + # Disable noisy checks by default +-DTC_FLAGS += -Wno-unit_address_vs_reg +-DTC_FLAGS += -Wno-simple_bus_reg +-DTC_FLAGS += -Wno-unit_address_format +-DTC_FLAGS += -Wno-pci_bridge +-DTC_FLAGS += -Wno-pci_device_bus_num +-DTC_FLAGS += -Wno-pci_device_reg ++DTC_FLAGS += $(call dtc-option,-Wno-unit_address_vs_reg) ++DTC_FLAGS += $(call dtc-option,-Wno-simple_bus_reg) ++DTC_FLAGS += $(call dtc-option,-Wno-unit_address_format) ++DTC_FLAGS += $(call dtc-option,-Wno-pci_bridge) ++DTC_FLAGS += $(call dtc-option,-Wno-pci_device_bus_num) ++DTC_FLAGS += $(call dtc-option,-Wno-pci_device_reg) + + endif |