From a638bd349ea438256daf9c1f323402a137c55e03 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Wed, 24 Aug 2022 10:37:23 +0200 Subject: kbuild: add KBUILD_HOSTLDFLAGS to cmd_host-csingle When compiling executables from a single.c file, the linker is also invoked. Pass the flags like the other linker commands. cherry-pick kbuild change from Linux: 63185b46cdb3 (kbuild: use HOSTLDFLAGS for single .c executables) Signed-off-by: Heiko Thiery Reviewed-by: Simon Glass --- scripts/Makefile.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 69983a19a4..7624304e3e 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -89,7 +89,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) # Create executable from a single .c file # host-csingle -> Executable quiet_cmd_host-csingle = HOSTCC $@ - cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \ + cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \ $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) $(host-csingle): $(obj)/%: $(src)/%.c FORCE $(call if_changed_dep,host-csingle) -- cgit v1.2.3 From f243371798564f9e1a18ba48267c656e1fac9aec Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 5 Sep 2022 20:32:14 -0400 Subject: configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini --- configs/lschlv2_defconfig | 1 - configs/lsxhl_defconfig | 1 - scripts/config_whitelist.txt | 5 ----- 3 files changed, 7 deletions(-) (limited to 'scripts') diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index e9cc632696..cfccfdcfc4 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -60,7 +60,6 @@ CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=25000000 CONFIG_SPI_FLASH_STMICRO=y -CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index b83a072b04..1945b72450 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -61,7 +61,6 @@ CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=25000000 CONFIG_SPI_FLASH_STMICRO=y -CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c5e8942a76..f505722f6b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -654,12 +654,7 @@ CONFIG_SYS_FM1_DTSEC4_RISER_PHY_ADDR CONFIG_SYS_FM1_DTSEC5_PHY_ADDR CONFIG_SYS_FM1_QSGMII11_PHY_ADDR CONFIG_SYS_FM1_QSGMII21_PHY_ADDR -CONFIG_SYS_FM2_10GEC1_PHY_ADDR CONFIG_SYS_FM2_CLK -CONFIG_SYS_FM2_DTSEC1_PHY_ADDR -CONFIG_SYS_FM2_DTSEC2_PHY_ADDR -CONFIG_SYS_FM2_DTSEC3_PHY_ADDR -CONFIG_SYS_FM2_DTSEC4_PHY_ADDR CONFIG_SYS_FM_MURAM_SIZE CONFIG_SYS_FPGAREG_DIPSW CONFIG_SYS_FPGAREG_FREQ -- cgit v1.2.3