From e616100eab84464f09baa93b3fe5c15087a385c1 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 11 Mar 2019 22:04:51 +0100 Subject: efi_loader: fix build error for freestanding.o Since commit f51a226436a87 ("efi_loader: provide freestanding library") in parallel builds errors lib/efi_selftest/../efi_loader/efi_freestanding.o: file not recognized: File truncated occur. Obviously make cannot correctly sequence parallel builds with a dependency like ../efi_loader/efi_freestanding.o. Fixes: f51a226436a87 ("efi_loader: provide freestanding library") Signed-off-by: Heinrich Schuchardt --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index ec5c41ec56..70de9bb13a 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -390,7 +390,7 @@ $(obj)/efi_reloc.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_RELOC:.o=.c) $(recordmcoun $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) -$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/../efi_loader/efi_freestanding.o +$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_freestanding.o $(call cmd,efi_ld) # ACPI -- cgit From e3ada91e49848ddcd3293a737cf08e48b2d72e42 Mon Sep 17 00:00:00 2001 From: Dalon Westergreen Date: Wed, 20 Mar 2019 13:15:21 -0700 Subject: ARM: socfpga: Build sfp image only for Gen5 and Arria10 devices The sfp file is only valid for Gen5 (Cyclone5 & Arria5) and Arria10 devices. The file should only be built for these devices. Signed-off-by: Dalon Westergreen --- scripts/Makefile.spl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 9d5921606e..54b160d72b 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -212,7 +212,7 @@ ifdef CONFIG_SAMSUNG ALL-y += $(obj)/$(BOARD)-spl.bin endif -ifdef CONFIG_ARCH_SOCFPGA +ifneq ($(CONFIG_TARGET_SOCFPGA_GEN5)$(CONFIG_TARGET_SOCFPGA_ARRIA10),) ALL-y += $(obj)/$(SPL_BIN).sfp endif -- cgit From 00717b00a585fcf2856de29481506c6389b032d3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 22 Mar 2019 09:47:39 -0400 Subject: scripts/Makefile.extrawarn: Silence more DTC warnings While our "extrawarns" logic has gotten out of sync with upstream Kbuild, for now lets start by bringing in the latest set of DTC_FLAGS from the Linux Kernel 5.0 to match their behavior in silencing warnings from dtc. Cc: Masahiro Yamada Signed-off-by: Tom Rini --- scripts/Makefile.extrawarn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn index 7ed520f555..1105c76be1 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -74,5 +74,7 @@ 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 += -Wno-avoid_unnecessary_addr_size +DTC_FLAGS += -Wno-alias_paths endif -- cgit From ac31d0d87365efe7724afd75253af1ab54159656 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 27 Feb 2019 15:20:34 +0100 Subject: exynos: replace CONFIG_ENV_SPI_BASE by CONFIG_SYS_SPI_BASE Replace CONFIG_ENV_SPI_BASE by the better CONFIG_SYS_SPI_BASE (it is not the location for environment but the location for U-Boot) and, as it is the only platform with use this define, remove it from whitelist. Signed-off-by: Patrick Delaunay --- scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index db00376d92..05035d13b3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -498,7 +498,6 @@ CONFIG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 CONFIG_ENV_SIZE_FLEX CONFIG_ENV_SIZE_REDUND -CONFIG_ENV_SPI_BASE CONFIG_ENV_SPI_BUS CONFIG_ENV_SPI_CS CONFIG_ENV_SPI_MAX_HZ -- cgit From 14453fbfadc2f98ca35d6033140466c7a4b4947a Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 27 Feb 2019 15:20:36 +0100 Subject: Convert CONFIG_SF_DEFAULT_* to Kconfig This converts the following to Kconfig: CONFIG_SF_DEFAULT_BUS CONFIG_SF_DEFAULT_CS CONFIG_SF_DEFAULT_MODE CONFIG_SF_DEFAULT_SPEED I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue. Signed-off-by: Patrick Delaunay --- scripts/config_whitelist.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 05035d13b3..f8de25483c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1700,10 +1700,6 @@ CONFIG_SET_DFU_ALT_BUF_LEN CONFIG_SET_DFU_ALT_INFO CONFIG_SFIO CONFIG_SF_DATAFLASH -CONFIG_SF_DEFAULT_BUS -CONFIG_SF_DEFAULT_CS -CONFIG_SF_DEFAULT_MODE -CONFIG_SF_DEFAULT_SPEED CONFIG_SGI_IP28 CONFIG_SH4_PCI CONFIG_SH73A0 -- cgit From c95e632de4a474d89fa733a83a39c66236960edf Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 27 Feb 2019 15:20:37 +0100 Subject: Convert CONFIG_DEFAULT_SPI_* to Kconfig This converts the following to Kconfig: CONFIG_DEFAULT_SPI_BUS CONFIG_DEFAULT_SPI_MODE Signed-off-by: Patrick Delaunay --- scripts/config_whitelist.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f8de25483c..8c7c1592a5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -340,8 +340,6 @@ CONFIG_DEEP_SLEEP CONFIG_DEFAULT CONFIG_DEFAULT_CONSOLE CONFIG_DEFAULT_IMMR -CONFIG_DEFAULT_SPI_BUS -CONFIG_DEFAULT_SPI_MODE CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -- cgit