Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea16e83a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent fbbcc3bb

arch/powerpc/sysdev/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -41,10 +41,11 @@ obj-$(CONFIG_XILINX_PCI) += xilinx_pci.o 
obj-$(CONFIG_OF_RTC)		+= of_rtc.o



obj-$(CONFIG_CPM)		+= cpm_common.o

obj-$(CONFIG_CPM1)		+= cpm1.o

obj-$(CONFIG_CPM2)		+= cpm2.o cpm2_pic.o

obj-$(CONFIG_QUICC_ENGINE)	+= cpm_common.o

obj-$(CONFIG_PPC_DCR)		+= dcr.o

obj-$(CONFIG_8xx)		+= mpc8xx_pic.o cpm1.o

obj-$(CONFIG_PPC_8xx)		+= mpc8xx_pic.o

obj-$(CONFIG_UCODE_PATCH)	+= micropatch.o



obj-$(CONFIG_PPC_MPC512x)	+= mpc5xxx_clocks.o

arch/powerpc/sysdev/fsl_soc.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ u32 fsl_get_sys_freq(void) 
}

EXPORT_SYMBOL(fsl_get_sys_freq);



#if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)

#if defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE)



u32 get_brgfreq(void)

{

arch/powerpc/sysdev/fsl_soc.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
struct spi_device;



extern phys_addr_t get_immrbase(void);

#if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)

#if defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE)

extern u32 get_brgfreq(void);

extern u32 get_baudrate(void);

#else