diff options
author | Julius Werner <jwerner@chromium.org> | 2018-11-27 17:50:28 -0800 |
---|---|---|
committer | Julius Werner <jwerner@chromium.org> | 2018-12-06 16:13:50 -0800 |
commit | 985ee0b7e8d039105de48f60c0195f391f86a625 (patch) | |
tree | 3bc1b97439d2725dc57e2775b813c6f8543aa613 | |
parent | 0f8aee4e45d3e74f5ebb385c8afcdee6c3b4c73a (diff) |
drivers/console: Link console framework code by default
This patch makes the build system link the console framework code by
default, like it already does with other common libraries (e.g. cache
helpers). This should not make a difference in practice since TF is
linked with --gc-sections, so the linker will garbage collect all
functions and data that are not referenced by any other code. Thus, if a
platform doesn't want to include console code for size reasons and
doesn't make any references to console functions, the code will not be
included in the final binary.
To avoid compatibility issues with older platform ports, only make this
change for the MULTI_CONSOLE_API.
Change-Id: I153a9dbe680d57aadb860d1c829759ba701130d3
Signed-off-by: Julius Werner <jwerner@chromium.org>
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | drivers/arm/pl011/aarch32/pl011_console.S | 2 | ||||
-rw-r--r-- | drivers/arm/pl011/aarch64/pl011_console.S | 2 | ||||
-rw-r--r-- | drivers/console/aarch32/console.S | 4 | ||||
-rw-r--r-- | drivers/console/aarch32/multi_console.S | 4 | ||||
-rw-r--r-- | drivers/console/aarch64/console.S | 4 | ||||
-rw-r--r-- | drivers/console/aarch64/multi_console.S | 4 | ||||
-rw-r--r-- | plat/allwinner/common/allwinner-common.mk | 3 | ||||
-rw-r--r-- | plat/imx/imx8qm/platform.mk | 1 | ||||
-rw-r--r-- | plat/imx/imx8qx/platform.mk | 1 | ||||
-rw-r--r-- | plat/layerscape/board/ls1043/platform.mk | 3 | ||||
-rw-r--r-- | plat/marvell/a3700/common/a3700_common.mk | 1 | ||||
-rw-r--r-- | plat/marvell/a8k/common/a8k_common.mk | 1 | ||||
-rw-r--r-- | plat/meson/gxbb/platform.mk | 3 | ||||
-rw-r--r-- | plat/rockchip/rk3328/platform.mk | 1 | ||||
-rw-r--r-- | plat/rockchip/rk3368/platform.mk | 1 | ||||
-rw-r--r-- | plat/rockchip/rk3399/platform.mk | 1 | ||||
-rw-r--r-- | plat/rpi3/platform.mk | 3 | ||||
-rw-r--r-- | plat/st/stm32mp1/platform.mk | 3 | ||||
-rw-r--r-- | plat/ti/k3/common/plat_common.mk | 1 |
20 files changed, 24 insertions, 20 deletions
@@ -214,6 +214,7 @@ include lib/libc/libc.mk BL_COMMON_SOURCES += common/bl_common.c \ common/tf_log.c \ common/${ARCH}/debug.S \ + drivers/console/${ARCH}/multi_console.S \ lib/${ARCH}/cache_helpers.S \ lib/${ARCH}/misc_helpers.S \ plat/common/plat_bl_common.c \ diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index 46ff2258..5d6b95fe 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -10,11 +10,13 @@ #include <console_macros.S> #include <pl011.h> +#if !MULTI_CONSOLE_API /* * Pull in generic functions to provide backwards compatibility for * platform makefiles */ #include "../../../console/aarch32/console.S" +#endif /* * "core" functions are low-level implementations that don't require diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S index 3886f3b7..7fec0904 100644 --- a/drivers/arm/pl011/aarch64/pl011_console.S +++ b/drivers/arm/pl011/aarch64/pl011_console.S @@ -10,11 +10,13 @@ #include <console_macros.S> #include <pl011.h> +#if !MULTI_CONSOLE_API /* * Pull in generic functions to provide backwards compatibility for * platform makefiles */ #include "../../../console/aarch64/console.S" +#endif /* * "core" functions are low-level implementations that don't require diff --git a/drivers/console/aarch32/console.S b/drivers/console/aarch32/console.S index f9096094..1c380944 100644 --- a/drivers/console/aarch32/console.S +++ b/drivers/console/aarch32/console.S @@ -5,7 +5,9 @@ */ #if MULTI_CONSOLE_API - #include "multi_console.S" + #if ERROR_DEPRECATED + #error "console.S is deprecated, platforms should no longer link it explicitly" + #endif #else #include "deprecated_console.S" #endif diff --git a/drivers/console/aarch32/multi_console.S b/drivers/console/aarch32/multi_console.S index e23b20e5..713dc3c7 100644 --- a/drivers/console/aarch32/multi_console.S +++ b/drivers/console/aarch32/multi_console.S @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#if MULTI_CONSOLE_API + #include <asm_macros.S> #include <assert_macros.S> #include <console.h> @@ -316,3 +318,5 @@ flush_done: mov r0, r5 pop {r5-r6, pc} endfunc console_flush + +#endif /* MULTI_CONSOLE_API */ diff --git a/drivers/console/aarch64/console.S b/drivers/console/aarch64/console.S index f847ed59..669b31a6 100644 --- a/drivers/console/aarch64/console.S +++ b/drivers/console/aarch64/console.S @@ -5,7 +5,9 @@ */ #if MULTI_CONSOLE_API -#include "multi_console.S" +#if ERROR_DEPRECATED +#error "console.S is deprecated, platforms should no longer link it explicitly" +#endif #else #include "deprecated_console.S" #endif diff --git a/drivers/console/aarch64/multi_console.S b/drivers/console/aarch64/multi_console.S index 95423b02..40d500d2 100644 --- a/drivers/console/aarch64/multi_console.S +++ b/drivers/console/aarch64/multi_console.S @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#if MULTI_CONSOLE_API + #include <asm_macros.S> #include <assert_macros.S> #include <console.h> @@ -323,3 +325,5 @@ flush_done: ldp x30, xzr, [sp], #16 ret endfunc console_flush + +#endif /* MULTI_CONSOLE_API */ diff --git a/plat/allwinner/common/allwinner-common.mk b/plat/allwinner/common/allwinner-common.mk index 2dc058f5..f20f5157 100644 --- a/plat/allwinner/common/allwinner-common.mk +++ b/plat/allwinner/common/allwinner-common.mk @@ -15,8 +15,7 @@ PLAT_INCLUDES := -Iinclude/plat/arm/common \ include lib/libfdt/libfdt.mk -PLAT_BL_COMMON_SOURCES := drivers/console/${ARCH}/console.S \ - drivers/ti/uart/${ARCH}/16550_console.S \ +PLAT_BL_COMMON_SOURCES := drivers/ti/uart/${ARCH}/16550_console.S \ ${XLAT_TABLES_LIB_SRCS} \ ${AW_PLAT}/common/plat_helpers.S \ ${AW_PLAT}/common/sunxi_common.c diff --git a/plat/imx/imx8qm/platform.mk b/plat/imx/imx8qm/platform.mk index ce84e2ba..dc45e901 100644 --- a/plat/imx/imx8qm/platform.mk +++ b/plat/imx/imx8qm/platform.mk @@ -26,7 +26,6 @@ BL31_SOURCES += plat/imx/common/lpuart_console.S \ lib/xlat_tables/xlat_tables_common.c \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a72.S \ - drivers/console/aarch64/console.S \ drivers/arm/cci/cci.c \ ${IMX_GIC_SOURCES} \ diff --git a/plat/imx/imx8qx/platform.mk b/plat/imx/imx8qx/platform.mk index 02559b46..a831bf2f 100644 --- a/plat/imx/imx8qx/platform.mk +++ b/plat/imx/imx8qx/platform.mk @@ -25,7 +25,6 @@ BL31_SOURCES += plat/imx/common/lpuart_console.S \ lib/xlat_tables/xlat_tables_common.c \ lib/xlat_tables/aarch64/xlat_tables.c \ lib/cpus/aarch64/cortex_a35.S \ - drivers/console/aarch64/console.S \ ${IMX_GIC_SOURCES} \ include plat/imx/common/sci/sci_api.mk diff --git a/plat/layerscape/board/ls1043/platform.mk b/plat/layerscape/board/ls1043/platform.mk index 678205cd..795d9248 100644 --- a/plat/layerscape/board/ls1043/platform.mk +++ b/plat/layerscape/board/ls1043/platform.mk @@ -28,8 +28,7 @@ PLAT_INCLUDES := -Iplat/layerscape/board/ls1043/include \ -Iinclude/drivers/io -PLAT_BL_COMMON_SOURCES := drivers/console/aarch64/console.S \ - plat/layerscape/common/aarch64/ls_console.S +PLAT_BL_COMMON_SOURCES := plat/layerscape/common/aarch64/ls_console.S LS1043_CPU_LIBS := lib/cpus/${ARCH}/aem_generic.S diff --git a/plat/marvell/a3700/common/a3700_common.mk b/plat/marvell/a3700/common/a3700_common.mk index 3983c707..e2ac97ff 100644 --- a/plat/marvell/a3700/common/a3700_common.mk +++ b/plat/marvell/a3700/common/a3700_common.mk @@ -96,7 +96,6 @@ PLAT_INCLUDES := -I$(PLAT_FAMILY_BASE)/$(PLAT) \ $(ATF_INCLUDES) PLAT_BL_COMMON_SOURCES := $(PLAT_COMMON_BASE)/aarch64/a3700_common.c \ - drivers/console/aarch64/console.S \ $(MARVELL_COMMON_BASE)/marvell_cci.c \ $(MARVELL_DRV_BASE)/uart/a3700_console.S diff --git a/plat/marvell/a8k/common/a8k_common.mk b/plat/marvell/a8k/common/a8k_common.mk index 6136a1f5..7f01e13b 100644 --- a/plat/marvell/a8k/common/a8k_common.mk +++ b/plat/marvell/a8k/common/a8k_common.mk @@ -52,7 +52,6 @@ PLAT_INCLUDES := -I$(PLAT_FAMILY_BASE)/$(PLAT) \ $(ATF_INCLUDES) PLAT_BL_COMMON_SOURCES := $(PLAT_COMMON_BASE)/aarch64/a8k_common.c \ - drivers/console/aarch64/console.S \ drivers/ti/uart/aarch64/16550_console.S BLE_PORTING_SOURCES := $(PLAT_FAMILY_BASE)/$(PLAT)/board/dram_port.c \ diff --git a/plat/meson/gxbb/platform.mk b/plat/meson/gxbb/platform.mk index e6f5ae48..68ff4007 100644 --- a/plat/meson/gxbb/platform.mk +++ b/plat/meson/gxbb/platform.mk @@ -14,8 +14,7 @@ GXBB_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ drivers/arm/gic/v2/gicv2_helpers.c \ plat/common/plat_gicv2.c -PLAT_BL_COMMON_SOURCES := drivers/console/aarch64/multi_console.S \ - drivers/meson/console/aarch64/meson_console.S \ +PLAT_BL_COMMON_SOURCES := drivers/meson/console/aarch64/meson_console.S \ plat/meson/gxbb/gxbb_common.c \ plat/meson/gxbb/gxbb_topology.c \ ${XLAT_TABLES_LIB_SRCS} diff --git a/plat/rockchip/rk3328/platform.mk b/plat/rockchip/rk3328/platform.mk index 785f6403..2b2ac51c 100644 --- a/plat/rockchip/rk3328/platform.mk +++ b/plat/rockchip/rk3328/platform.mk @@ -34,7 +34,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/aarch64/xlat_tables.c \ BL31_SOURCES += ${RK_GIC_SOURCES} \ drivers/arm/cci/cci.c \ - drivers/console/aarch64/console.S \ drivers/ti/uart/aarch64/16550_console.S \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk index a3e593e6..c0164c17 100644 --- a/plat/rockchip/rk3368/platform.mk +++ b/plat/rockchip/rk3368/platform.mk @@ -31,7 +31,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ BL31_SOURCES += ${RK_GIC_SOURCES} \ drivers/arm/cci/cci.c \ - drivers/console/aarch64/console.S \ drivers/ti/uart/aarch64/16550_console.S \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk index eccf1cc8..b624717d 100644 --- a/plat/rockchip/rk3399/platform.mk +++ b/plat/rockchip/rk3399/platform.mk @@ -37,7 +37,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ BL31_SOURCES += ${RK_GIC_SOURCES} \ drivers/arm/cci/cci.c \ - drivers/console/aarch64/console.S \ drivers/ti/uart/aarch64/16550_console.S \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ diff --git a/plat/rpi3/platform.mk b/plat/rpi3/platform.mk index db96de82..46c139ea 100644 --- a/plat/rpi3/platform.mk +++ b/plat/rpi3/platform.mk @@ -10,8 +10,7 @@ include lib/xlat_tables_v2/xlat_tables.mk PLAT_INCLUDES := -Iinclude/common/tbbr \ -Iplat/rpi3/include -PLAT_BL_COMMON_SOURCES := drivers/console/aarch64/console.S \ - drivers/ti/uart/aarch64/16550_console.S \ +PLAT_BL_COMMON_SOURCES := drivers/ti/uart/aarch64/16550_console.S \ plat/rpi3/rpi3_common.c \ ${XLAT_TABLES_LIB_SRCS} diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk index f4a0ca4a..545b140d 100644 --- a/plat/st/stm32mp1/platform.mk +++ b/plat/st/stm32mp1/platform.mk @@ -35,8 +35,7 @@ include lib/libfdt/libfdt.mk PLAT_BL_COMMON_SOURCES := plat/st/stm32mp1/stm32mp1_common.c -PLAT_BL_COMMON_SOURCES += drivers/console/aarch32/console.S \ - drivers/st/uart/aarch32/stm32_console.S +PLAT_BL_COMMON_SOURCES += drivers/st/uart/aarch32/stm32_console.S ifneq (${ENABLE_STACK_PROTECTOR},0) PLAT_BL_COMMON_SOURCES += plat/st/stm32mp1/stm32mp1_stack_protector.c diff --git a/plat/ti/k3/common/plat_common.mk b/plat/ti/k3/common/plat_common.mk index fbd79b4a..9b3e7d84 100644 --- a/plat/ti/k3/common/plat_common.mk +++ b/plat/ti/k3/common/plat_common.mk @@ -39,7 +39,6 @@ PLAT_INCLUDES += \ -I${PLAT_PATH}/common/drivers/ti_sci \ K3_CONSOLE_SOURCES += \ - drivers/console/aarch64/console.S \ drivers/ti/uart/aarch64/16550_console.S \ ${PLAT_PATH}/common/k3_console.c \ |