build: Drop CONFIG_SPL_BUILD guards in some cases

Given gcc-6.1 and later we can now safely have strings discarded when
the functions are unused.  This lets us drop certain cases of not
building something so that we don't have the strings brought in when the
code was discarded.  Simplify the code now by dropping guards we don't
need now.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Chander Kashyap <k.chander@samsung.com>
Cc: Thomas Abraham <thomas.ab@samsung.com>
Cc: Vipin Kumar <vipin.kumar@st.com>
Cc: Wenyou Yang <wenyou.yang@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-12-21 22:13:22 -05:00
parent 2c33b0c7d8
commit ec75fab302
9 changed files with 5 additions and 30 deletions

View file

@ -8,7 +8,4 @@
obj-y += generic.o obj-y += generic.o
obj-y += timer.o obj-y += timer.o
obj-y += devices.o obj-y += devices.o
ifndef CONFIG_SPL_BUILD
obj-y += relocate.o obj-y += relocate.o
endif

View file

@ -10,7 +10,4 @@
obj-y += generic.o obj-y += generic.o
obj-y += timer.o obj-y += timer.o
obj-y += mx35_sdram.o obj-y += mx35_sdram.o
ifndef CONFIG_SPL_BUILD
obj-y += relocate.o obj-y += relocate.o
endif

View file

@ -4,8 +4,4 @@
# #
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
obj-y = generic.o timer.o reset.o obj-y += generic.o timer.o reset.o relocate.o
ifndef CONFIG_SPL_BUILD
obj-y += relocate.o
endif

View file

@ -4,8 +4,4 @@
# #
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
obj-y = generic.o reset.o timer.o obj-y += generic.o timer.o reset.o relocate.o
ifndef CONFIG_SPL_BUILD
obj-y += relocate.o
endif

View file

@ -8,8 +8,6 @@
# #
obj-y += interrupts.o obj-y += interrupts.o
ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_PCI) += pci_io.o obj-$(CONFIG_PCI) += pci_io.o
endif
obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-$(CONFIG_CMD_BOOTZ) += bootm.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o

View file

@ -6,7 +6,5 @@
# #
obj-y += board.o obj-y += board.o
ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o
obj-$(CONFIG_DM_VIDEO) += video_display.o obj-$(CONFIG_DM_VIDEO) += video_display.o
endif

View file

@ -5,7 +5,4 @@
# #
obj-y += arndale_spl.o obj-y += arndale_spl.o
ifndef CONFIG_SPL_BUILD
obj-y += arndale.o obj-y += arndale.o
endif

View file

@ -5,6 +5,4 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifndef CONFIG_SPL_BUILD
obj-y += espresso7420.o obj-y += espresso7420.o
endif

View file

@ -5,6 +5,4 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifndef CONFIG_SPL_BUILD obj-y += spear600.o
obj-y := spear600.o
endif