tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc/cpm1: link to CONFIG_CPM1 instead of CONFIG_8xx
To remain consistent with what is done with CPM2, let's link
CPM1 related parts to CONFIG_CPM1 instead of CONFIG_8xx
When something depends on both CPM1 and CPM2 we associate it
with CONFIG_CPM
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
authored by
Christophe Leroy
and committed by
Michael Ellerman
ea16e83a
fbbcc3bb
+4
-3
+2
-1
arch/powerpc/sysdev/Makefile
+2
-1
arch/powerpc/sysdev/Makefile
···
41
41
obj-$(CONFIG_OF_RTC) += of_rtc.o
42
42
43
43
obj-$(CONFIG_CPM) += cpm_common.o
44
+
obj-$(CONFIG_CPM1) += cpm1.o
44
45
obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
45
46
obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o
46
47
obj-$(CONFIG_PPC_DCR) += dcr.o
47
-
obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o
48
+
obj-$(CONFIG_PPC_8xx) += mpc8xx_pic.o
48
49
obj-$(CONFIG_UCODE_PATCH) += micropatch.o
49
50
50
51
obj-$(CONFIG_PPC_MPC512x) += mpc5xxx_clocks.o
+1
-1
arch/powerpc/sysdev/fsl_soc.c
+1
-1
arch/powerpc/sysdev/fsl_soc.c
+1
-1
arch/powerpc/sysdev/fsl_soc.h
+1
-1
arch/powerpc/sysdev/fsl_soc.h
···
7
7
struct spi_device;
8
8
9
9
extern phys_addr_t get_immrbase(void);
10
-
#if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
10
+
#if defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE)
11
11
extern u32 get_brgfreq(void);
12
12
extern u32 get_baudrate(void);
13
13
#else