diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-19 13:19:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-19 16:07:12 -0400 |
| commit | e9a1ff9724348408144c7f1c5b5cc26130ba46e5 (patch) | |
| tree | 68b56f117206d121b4a7e567b0209c02283c98e6 /scripts | |
| parent | b6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (diff) | |
| parent | f76f3e3b44328fe6229650540109af93750fd5f0 (diff) | |
Merge branch 'master' into next
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.host | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 5 |
2 files changed, 1 insertions, 6 deletions
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) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 22a0f2bf8a..49e3b3847e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -653,12 +653,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 |