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

powerpc: change CONFIG_6xx to CONFIG_PPC_BOOK3S_32 



Today we have:

config PPC_BOOK3S_32
	bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
	[depends on PPC32 within a choice]

config PPC_BOOK3S
	def_bool y
	depends on PPC_BOOK3S_32 || PPC_BOOK3S_64

config 6xx
	def_bool y
	depends on PPC32 && PPC_BOOK3S

6xx is therefore redundant with PPC_BOOK3S_32.

In order to make the code clearer, lets use preferably PPC_BOOK3S_32.
This will allow to remove CONFIG_6xx in a later patch.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f99e33f1

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm) 
# often slow when they are implemented at all

KBUILD_CFLAGS		+= $(call cc-option,-mno-string)



ifdef CONFIG_6xx

ifdef CONFIG_PPC_BOOK3S_32

KBUILD_CFLAGS		+= -mcpu=powerpc

endif

arch/powerpc/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ extern struct ppc64_caches ppc64_caches; 
#else

#define __read_mostly __attribute__((__section__(".data..read_mostly")))



#ifdef CONFIG_6xx

#ifdef CONFIG_PPC_BOOK3S_32

extern long _get_L2CR(void);

extern long _get_L3CR(void);

extern void _set_L2CR(unsigned long);

arch/powerpc/include/asm/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#define MMU_FTR_USE_HIGH_BATS		ASM_CONST(0x00010000)



/* Enable >32-bit physical addresses on 32-bit processor, only used

 * by CONFIG_6xx currently as BookE supports that from day 1

 * by CONFIG_PPC_BOOK3S_32 currently as BookE supports that from day 1

 */

#define MMU_FTR_BIG_PHYS		ASM_CONST(0x00020000)

arch/powerpc/include/asm/reg.h

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ 
#define HID0_POWER9_RADIX	__MASK(63 - 8)



#define SPRN_HID1	0x3F1		/* Hardware Implementation Register 1 */

#ifdef CONFIG_6xx

#ifdef CONFIG_PPC_BOOK3S_32

#define HID1_EMCP	(1<<31)		/* 7450 Machine Check Pin Enable */

#define HID1_DFS	(1<<22)		/* 7447A Dynamic Frequency Scaling */

#define HID1_PC0	(1<<16)		/* 7450 PLL_CFG[0] */

arch/powerpc/include/asm/time.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct div_result { 


/* Accessor functions for the timebase (RTC on 601) registers. */

/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */

#ifdef CONFIG_6xx

#ifdef CONFIG_PPC_BOOK3S_32

#define __USE_RTC()	(cpu_has_feature(CPU_FTR_USE_RTC))

#else

#define __USE_RTC()	0

CRA Git | Maintained and supported by SUSTech CRA and CCSE