Skip to content

Commit 7183c37

Browse files
hcodinagregkh
authored andcommitted
serial: cpm_uart: Fix a COMPILE_TEST dependency
In a COMPILE_TEST configuration, the cpm_uart driver uses symbols from the cpm_uart_cpm2.c file. This file is compiled only when CONFIG_CPM2 is set. Without this dependency, the linker fails with some missing symbols for COMPILE_TEST configuration that needs SERIAL_CPM without enabling CPM2. This lead to: depends on CPM2 || CPM1 || (PPC32 && CPM2 && COMPILE_TEST) This dependency does not make sense anymore and can be simplified removing all the COMPILE_TEST part. Signed-off-by: Herve Codina <[email protected]> Reported-by: kernel test robot <[email protected]> Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Fixes: e3e7b13 ("serial: allow COMPILE_TEST for some drivers") Cc: stable <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 192d43e commit 7183c37

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/tty/serial/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ config SERIAL_PMACZILOG_CONSOLE
762762

763763
config SERIAL_CPM
764764
tristate "CPM SCC/SMC serial port support"
765-
depends on CPM2 || CPM1 || (PPC32 && COMPILE_TEST)
765+
depends on CPM2 || CPM1
766766
select SERIAL_CORE
767767
help
768768
This driver supports the SCC and SMC serial ports on Motorola

drivers/tty/serial/cpm_uart/cpm_uart.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ struct gpio_desc;
1919
#include "cpm_uart_cpm2.h"
2020
#elif defined(CONFIG_CPM1)
2121
#include "cpm_uart_cpm1.h"
22-
#elif defined(CONFIG_COMPILE_TEST)
23-
#include "cpm_uart_cpm2.h"
2422
#endif
2523

2624
#define SERIAL_CPM_MAJOR 204

0 commit comments

Comments
 (0)