mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
powerpc: Introduce a new config symbol to control 16550 early debug code
The previous change by Kumar Gala in this area led to legacy_serial.c and udbg_16550.c being built as modules when CONFIG_SERIAL_8250=m. Fix this by introducing a new symbol, CONFIG_PPC_UDBG_16550, to control whether these files get built, and arrange for it to be selected for those platforms that need it. Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
0f17574a65
commit
13b8a27229
6 changed files with 14 additions and 8 deletions
|
@ -275,6 +275,7 @@ config PPC_PSERIES
|
||||||
select PPC_I8259
|
select PPC_I8259
|
||||||
select PPC_RTAS
|
select PPC_RTAS
|
||||||
select RTAS_ERROR_LOGGING
|
select RTAS_ERROR_LOGGING
|
||||||
|
select PPC_UDBG_16550
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config PPC_CHRP
|
config PPC_CHRP
|
||||||
|
@ -284,6 +285,7 @@ config PPC_CHRP
|
||||||
select PPC_INDIRECT_PCI
|
select PPC_INDIRECT_PCI
|
||||||
select PPC_RTAS
|
select PPC_RTAS
|
||||||
select PPC_MPC106
|
select PPC_MPC106
|
||||||
|
select PPC_UDBG_16550
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config PPC_PMAC
|
config PPC_PMAC
|
||||||
|
@ -306,6 +308,7 @@ config PPC_PREP
|
||||||
depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
|
depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
|
||||||
select PPC_I8259
|
select PPC_I8259
|
||||||
select PPC_INDIRECT_PCI
|
select PPC_INDIRECT_PCI
|
||||||
|
select PPC_UDBG_16550
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config PPC_MAPLE
|
config PPC_MAPLE
|
||||||
|
@ -314,6 +317,7 @@ config PPC_MAPLE
|
||||||
select U3_DART
|
select U3_DART
|
||||||
select MPIC_BROKEN_U3
|
select MPIC_BROKEN_U3
|
||||||
select GENERIC_TBSYNC
|
select GENERIC_TBSYNC
|
||||||
|
select PPC_UDBG_16550
|
||||||
default n
|
default n
|
||||||
help
|
help
|
||||||
This option enables support for the Maple 970FX Evaluation Board.
|
This option enables support for the Maple 970FX Evaluation Board.
|
||||||
|
@ -324,6 +328,7 @@ config PPC_CELL
|
||||||
depends on PPC_MULTIPLATFORM && PPC64
|
depends on PPC_MULTIPLATFORM && PPC64
|
||||||
select PPC_RTAS
|
select PPC_RTAS
|
||||||
select MMIO_NVRAM
|
select MMIO_NVRAM
|
||||||
|
select PPC_UDBG_16550
|
||||||
|
|
||||||
config PPC_OF
|
config PPC_OF
|
||||||
def_bool y
|
def_bool y
|
||||||
|
@ -370,6 +375,10 @@ config MPIC_BROKEN_U3
|
||||||
depends on PPC_MAPLE
|
depends on PPC_MAPLE
|
||||||
default y
|
default y
|
||||||
|
|
||||||
|
config PPC_UDBG_16550
|
||||||
|
bool
|
||||||
|
default n
|
||||||
|
|
||||||
config CELL_IIC
|
config CELL_IIC
|
||||||
depends on PPC_CELL
|
depends on PPC_CELL
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -55,7 +55,7 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o
|
||||||
obj-$(CONFIG_6xx) += idle_6xx.o
|
obj-$(CONFIG_6xx) += idle_6xx.o
|
||||||
obj-$(CONFIG_SMP) += smp.o
|
obj-$(CONFIG_SMP) += smp.o
|
||||||
obj-$(CONFIG_KPROBES) += kprobes.o
|
obj-$(CONFIG_KPROBES) += kprobes.o
|
||||||
obj-$(CONFIG_SERIAL_8250) += legacy_serial.o udbg_16550.o
|
obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o
|
||||||
module-$(CONFIG_PPC64) += module_64.o
|
module-$(CONFIG_PPC64) += module_64.o
|
||||||
obj-$(CONFIG_MODULES) += $(module-y)
|
obj-$(CONFIG_MODULES) += $(module-y)
|
||||||
|
|
||||||
|
|
|
@ -299,9 +299,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
if (ppc_md.init_early)
|
if (ppc_md.init_early)
|
||||||
ppc_md.init_early();
|
ppc_md.init_early();
|
||||||
|
|
||||||
#ifdef CONFIG_SERIAL_8250
|
|
||||||
find_legacy_serial_ports();
|
find_legacy_serial_ports();
|
||||||
#endif
|
|
||||||
finish_device_tree();
|
finish_device_tree();
|
||||||
|
|
||||||
smp_setup_cpu_maps();
|
smp_setup_cpu_maps();
|
||||||
|
|
|
@ -472,9 +472,7 @@ void __init setup_system(void)
|
||||||
* hash table management for us, thus ioremap works. We do that early
|
* hash table management for us, thus ioremap works. We do that early
|
||||||
* so that further code can be debugged
|
* so that further code can be debugged
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_SERIAL_8250
|
|
||||||
find_legacy_serial_ports();
|
find_legacy_serial_ports();
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* "Finish" the device-tree, that is do the actual parsing of
|
* "Finish" the device-tree, that is do the actual parsing of
|
||||||
|
|
|
@ -71,9 +71,6 @@
|
||||||
#define DBG(fmt...)
|
#define DBG(fmt...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void generic_find_legacy_serial_ports(u64 *physport,
|
|
||||||
unsigned int *default_speed);
|
|
||||||
|
|
||||||
static void maple_restart(char *cmd)
|
static void maple_restart(char *cmd)
|
||||||
{
|
{
|
||||||
unsigned int maple_nvram_base;
|
unsigned int maple_nvram_base;
|
||||||
|
|
|
@ -15,6 +15,10 @@
|
||||||
/* Default baud base if not found in device-tree */
|
/* Default baud base if not found in device-tree */
|
||||||
#define BASE_BAUD ( 1843200 / 16 )
|
#define BASE_BAUD ( 1843200 / 16 )
|
||||||
|
|
||||||
|
#ifdef CONFIG_PPC_UDBG_16550
|
||||||
extern void find_legacy_serial_ports(void);
|
extern void find_legacy_serial_ports(void);
|
||||||
|
#else
|
||||||
|
#define find_legacy_serial_ports() do { } while (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* _PPC64_SERIAL_H */
|
#endif /* _PPC64_SERIAL_H */
|
||||||
|
|
Loading…
Reference in a new issue