Skip to content

GitLab

Unverified Commit 85456a92 authored by Soby Mathew's avatar Soby Mathew Committed by GitHub
Browse files

Merge pull request #1700 from jwerner-chromium/JW_crashfix 

MULTI_CONSOLE_API fixes and cleanups
parents f7ed4ab0 65d8582b
Hide whitespace changes
Inline Side-by-side
plat/rockchip/rk3328/platform.mk
View file @ 85456a92
...@@ -34,7 +34,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/aarch64/xlat_tables.c \ ...@@ -34,7 +34,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/aarch64/xlat_tables.c \
BL31_SOURCES += ${RK_GIC_SOURCES} \ BL31_SOURCES += ${RK_GIC_SOURCES} \
drivers/arm/cci/cci.c \ drivers/arm/cci/cci.c \
drivers/console/aarch64/console.S \
drivers/ti/uart/aarch64/16550_console.S \ drivers/ti/uart/aarch64/16550_console.S \
drivers/delay_timer/delay_timer.c \ drivers/delay_timer/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \
......
plat/rockchip/rk3368/platform.mk
View file @ 85456a92
...@@ -31,7 +31,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ ...@@ -31,7 +31,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \
BL31_SOURCES += ${RK_GIC_SOURCES} \ BL31_SOURCES += ${RK_GIC_SOURCES} \
drivers/arm/cci/cci.c \ drivers/arm/cci/cci.c \
drivers/console/aarch64/console.S \
drivers/ti/uart/aarch64/16550_console.S \ drivers/ti/uart/aarch64/16550_console.S \
drivers/delay_timer/delay_timer.c \ drivers/delay_timer/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \
......
plat/rockchip/rk3399/platform.mk
View file @ 85456a92
...@@ -37,7 +37,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ ...@@ -37,7 +37,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \
BL31_SOURCES += ${RK_GIC_SOURCES} \ BL31_SOURCES += ${RK_GIC_SOURCES} \
drivers/arm/cci/cci.c \ drivers/arm/cci/cci.c \
drivers/console/aarch64/console.S \
drivers/ti/uart/aarch64/16550_console.S \ drivers/ti/uart/aarch64/16550_console.S \
drivers/delay_timer/delay_timer.c \ drivers/delay_timer/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \
......
plat/rpi3/platform.mk
View file @ 85456a92
...@@ -10,8 +10,7 @@ include lib/xlat_tables_v2/xlat_tables.mk ...@@ -10,8 +10,7 @@ include lib/xlat_tables_v2/xlat_tables.mk
PLAT_INCLUDES := -Iinclude/common/tbbr \ PLAT_INCLUDES := -Iinclude/common/tbbr \
-Iplat/rpi3/include -Iplat/rpi3/include
PLAT_BL_COMMON_SOURCES := drivers/console/aarch64/console.S \ PLAT_BL_COMMON_SOURCES := drivers/ti/uart/aarch64/16550_console.S \
drivers/ti/uart/aarch64/16550_console.S \
plat/rpi3/rpi3_common.c \ plat/rpi3/rpi3_common.c \
${XLAT_TABLES_LIB_SRCS} ${XLAT_TABLES_LIB_SRCS}
......
plat/st/stm32mp1/platform.mk
View file @ 85456a92
...@@ -35,8 +35,7 @@ include lib/libfdt/libfdt.mk ...@@ -35,8 +35,7 @@ include lib/libfdt/libfdt.mk
PLAT_BL_COMMON_SOURCES := plat/st/stm32mp1/stm32mp1_common.c PLAT_BL_COMMON_SOURCES := plat/st/stm32mp1/stm32mp1_common.c
PLAT_BL_COMMON_SOURCES += drivers/console/aarch32/console.S \ PLAT_BL_COMMON_SOURCES += drivers/st/uart/aarch32/stm32_console.S
drivers/st/uart/aarch32/stm32_console.S
ifneq (${ENABLE_STACK_PROTECTOR},0) ifneq (${ENABLE_STACK_PROTECTOR},0)
PLAT_BL_COMMON_SOURCES += plat/st/stm32mp1/stm32mp1_stack_protector.c PLAT_BL_COMMON_SOURCES += plat/st/stm32mp1/stm32mp1_stack_protector.c
......
plat/ti/k3/common/plat_common.mk
View file @ 85456a92
...@@ -39,7 +39,6 @@ PLAT_INCLUDES += \ ...@@ -39,7 +39,6 @@ PLAT_INCLUDES += \
-I${PLAT_PATH}/common/drivers/ti_sci \ -I${PLAT_PATH}/common/drivers/ti_sci \
K3_CONSOLE_SOURCES += \ K3_CONSOLE_SOURCES += \
drivers/console/aarch64/console.S \
drivers/ti/uart/aarch64/16550_console.S \ drivers/ti/uart/aarch64/16550_console.S \
${PLAT_PATH}/common/k3_console.c \ ${PLAT_PATH}/common/k3_console.c \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment