From 4593637b135b6f8f46a086f73b6ee10849de11bf Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 11:08:43 -0800 Subject: powerpc: P2020: Remove macro CONFIG_P2020 Replace CONFIG_P2020 with ARCH_P2020 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- board/xes/common/Makefile | 2 +- board/xes/common/fsl_8xxx_clk.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'board') diff --git a/board/xes/common/Makefile b/board/xes/common/Makefile index 1b2ec5c..db1f029f 100644 --- a/board/xes/common/Makefile +++ b/board/xes/common/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_FSL_PCI_INIT) += fsl_8xxx_pci.o obj-$(CONFIG_ARCH_MPC8572) += fsl_8xxx_clk.o obj-$(CONFIG_MPC86xx) += fsl_8xxx_clk.o -obj-$(CONFIG_P2020) += fsl_8xxx_clk.o +obj-$(CONFIG_ARCH_P2020) += fsl_8xxx_clk.o obj-$(CONFIG_MPC85xx) += fsl_8xxx_misc.o board.o obj-$(CONFIG_MPC86xx) += fsl_8xxx_misc.o board.o obj-$(CONFIG_NAND_ACTL) += actl_nand.o diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c index 2a604d4..e102b0c 100644 --- a/board/xes/common/fsl_8xxx_clk.c +++ b/board/xes/common/fsl_8xxx_clk.c @@ -22,7 +22,7 @@ unsigned long get_board_sys_clk(ulong dummy) if (in_be32(&gur->gpporcr) & 0x10000) return 66666666; else -#ifdef CONFIG_P2020 +#ifdef CONFIG_ARCH_P2020 return 100000000; #else return 50000000; @@ -42,7 +42,7 @@ unsigned long get_board_ddr_clk(ulong dummy) if (ddr_ratio == 0x7) return get_board_sys_clk(dummy); -#ifdef CONFIG_P2020 +#ifdef CONFIG_ARCH_P2020 if (in_be32(&gur->gpporcr) & 0x20000) return 66666666; else -- cgit v1.1