diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-20 07:32:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-20 07:32:04 -0400 |
| commit | 842d049be23976ebcbb2522fa8d752d3aae8631a (patch) | |
| tree | ca4ff1ffa3d447d51e945ce4cd9f75f6e80babe9 /scripts | |
| parent | eed05148c261e3b5f00b11a7a14bf0222b80a0ac (diff) | |
| parent | 4e9bce12432492aa7a7c2121d9fae1640606ace5 (diff) | |
| download | u-boot-842d049be23976ebcbb2522fa8d752d3aae8631a.tar.gz u-boot-842d049be23976ebcbb2522fa8d752d3aae8631a.tar.xz u-boot-842d049be23976ebcbb2522fa8d752d3aae8631a.zip | |
Merge branch '2021-04-20-assorted-improvements'
- ARM64 GIC fix, CONFIG_IRQ now moved to Kconfig
- IDE, lz4 fixes
- octeontx cleanups / enhancements
- highbank DM migration
- psci updates
- Enable use of -fstack-protector
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 6 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index ca988224da..c69525fa74 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -67,6 +67,12 @@ include $(srctree)/scripts/Makefile.lib KBUILD_CFLAGS += -ffunction-sections -fdata-sections LDFLAGS_FINAL += --gc-sections +ifeq ($(CONFIG_$(SPL_TPL_)STACKPROTECTOR),y) +KBUILD_CFLAGS += -fstack-protector-strong +else +KBUILD_CFLAGS += -fno-stack-protector +endif + # FIX ME cpp_flags := $(KBUILD_CPPFLAGS) $(PLATFORM_CPPFLAGS) $(UBOOTINCLUDE) \ $(NOSTDINC_FLAGS) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b24fa36da0..a2fcafd2e6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -149,7 +149,6 @@ CONFIG_BTB CONFIG_BUFNO_AUTO_INCR_BIT CONFIG_BUILD_ENVCRC CONFIG_BUS_WIDTH -CONFIG_CALXEDA_XGMAC CONFIG_CDP_APPLIANCE_VLAN_TYPE CONFIG_CDP_CAPABILITIES CONFIG_CDP_DEVICE_ID |