Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: MPC8641: Remove macro CONFIG_MPC8641

Browse Source 
Replace CONFIG_MPC8641 with ARCH_MPC8641 in Kconfig and clean up
existing macros.

Signed-off-by: York Sun <york.sun@nxp.com>
master
York Sun 9 years ago
parent 51f05ff914
commit 4f5554c6e5
9 changed files with 11 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      arch/powerpc/cpu/mpc86xx/Kconfig
  2. 2
      arch/powerpc/cpu/mpc86xx/Makefile
  3. 2
      arch/powerpc/cpu/mpc86xx/cpu.c
  4. 2
      arch/powerpc/include/asm/config_mpc86xx.h
  5. 4
      arch/powerpc/include/asm/fsl_law.h
  6. 1
      include/configs/MPC8641HPCN.h
  7. 1
      include/configs/sbc8641d.h
  8. 1
      include/configs/xpedite517x.h
  9. 1
      scripts/config_whitelist.txt

6
arch/powerpc/cpu/mpc86xx/Kconfig
Unescape View File

@ -10,6 +10,7 @@ choice
config TARGET_SBC8641D config TARGET_SBC8641D
bool "Support sbc8641d" bool "Support sbc8641d"
select ARCH_MPC8641
config TARGET_MPC8610HPCD config TARGET_MPC8610HPCD
bool "Support MPC8610HPCD" bool "Support MPC8610HPCD"
@ -17,15 +18,20 @@ config TARGET_MPC8610HPCD
config TARGET_MPC8641HPCN config TARGET_MPC8641HPCN
bool "Support MPC8641HPCN" bool "Support MPC8641HPCN"
select ARCH_MPC8641
config TARGET_XPEDITE517X config TARGET_XPEDITE517X
bool "Support xpedite517x" bool "Support xpedite517x"
select ARCH_MPC8641
endchoice endchoice
config ARCH_MPC8610 config ARCH_MPC8610
bool bool
config ARCH_MPC8641
bool
source "board/freescale/mpc8610hpcd/Kconfig" source "board/freescale/mpc8610hpcd/Kconfig"
source "board/freescale/mpc8641hpcn/Kconfig" source "board/freescale/mpc8641hpcn/Kconfig"
source "board/sbc8641d/Kconfig" source "board/sbc8641d/Kconfig"

2
arch/powerpc/cpu/mpc86xx/Makefile
Unescape View File

@ -20,5 +20,5 @@ obj-$(CONFIG_OF_LIBFDT) += fdt.o
obj-y += interrupts.o obj-y += interrupts.o
obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_MP) += mp.o
obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o
obj-$(CONFIG_MPC8641) += mpc8641_serdes.o obj-$(CONFIG_ARCH_MPC8641) += mpc8641_serdes.o
obj-y += speed.o obj-y += speed.o

2
arch/powerpc/cpu/mpc86xx/cpu.c
Unescape View File

@ -92,7 +92,7 @@ checkcpu(void)
if (get_l2cr() & 0x80000000) { if (get_l2cr() & 0x80000000) {
#if defined(CONFIG_ARCH_MPC8610) #if defined(CONFIG_ARCH_MPC8610)
puts("256"); puts("256");
#elif defined(CONFIG_MPC8641) #elif defined(CONFIG_ARCH_MPC8641)
puts("512"); puts("512");
#endif #endif
puts(" KiB enabled\n"); puts(" KiB enabled\n");

2
arch/powerpc/include/asm/config_mpc86xx.h
Unescape View File

@ -15,7 +15,7 @@
#define CONFIG_MAX_CPUS 1 #define CONFIG_MAX_CPUS 1
#define CONFIG_SYS_FSL_NUM_LAWS 10 #define CONFIG_SYS_FSL_NUM_LAWS 10
#elif defined(CONFIG_MPC8641) #elif defined(CONFIG_ARCH_MPC8641)
#define CONFIG_MAX_CPUS 2 #define CONFIG_MAX_CPUS 2
#define CONFIG_SYS_FSL_NUM_LAWS 10 #define CONFIG_SYS_FSL_NUM_LAWS 10

4
arch/powerpc/include/asm/fsl_law.h
Unescape View File

@ -79,7 +79,7 @@ enum law_trgt_if {
enum law_trgt_if { enum law_trgt_if {
LAW_TRGT_IF_PCI = 0x00, LAW_TRGT_IF_PCI = 0x00,
LAW_TRGT_IF_PCI_2 = 0x01, LAW_TRGT_IF_PCI_2 = 0x01,
#ifndef CONFIG_MPC8641 #ifndef CONFIG_ARCH_MPC8641
LAW_TRGT_IF_PCIE_1 = 0x02, LAW_TRGT_IF_PCIE_1 = 0x02,
#endif #endif
#if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132) #if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132)
@ -117,7 +117,7 @@ enum law_trgt_if {
#define LAW_TRGT_IF_RIO_1 LAW_TRGT_IF_RIO #define LAW_TRGT_IF_RIO_1 LAW_TRGT_IF_RIO
#define LAW_TRGT_IF_IFC LAW_TRGT_IF_LBC #define LAW_TRGT_IF_IFC LAW_TRGT_IF_LBC
#ifdef CONFIG_MPC8641 #ifdef CONFIG_ARCH_MPC8641
#define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI #define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI
#endif #endif

1
include/configs/MPC8641HPCN.h
Unescape View File

@ -17,7 +17,6 @@
#define __CONFIG_H #define __CONFIG_H
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_MPC8641 1 /* MPC8641 specific */
#define CONFIG_MPC8641HPCN 1 /* MPC8641HPCN board specific */ #define CONFIG_MPC8641HPCN 1 /* MPC8641HPCN board specific */
#define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_MP 1 /* support multiple processors */
#define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */

1
include/configs/sbc8641d.h
Unescape View File

@ -21,7 +21,6 @@
#define __CONFIG_H #define __CONFIG_H
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_MPC8641 1 /* MPC8641 specific */
#define CONFIG_SBC8641D 1 /* SBC8641D board specific */ #define CONFIG_SBC8641D 1 /* SBC8641D board specific */
#define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_MP 1 /* support multiple processors */
#define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */

1
include/configs/xpedite517x.h
Unescape View File

@ -14,7 +14,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_MPC8641 1 /* MPC8641 specific */
#define CONFIG_XPEDITE5140 1 /* MPC8641HPCN board specific */ #define CONFIG_XPEDITE5140 1 /* MPC8641HPCN board specific */
#define CONFIG_SYS_BOARD_NAME "XPedite5170" #define CONFIG_SYS_BOARD_NAME "XPedite5170"
#define CONFIG_SYS_FORM_3U_VPX 1 #define CONFIG_SYS_FORM_3U_VPX 1

1
scripts/config_whitelist.txt
Unescape View File

@ -3147,7 +3147,6 @@ CONFIG_MPC85XX_PCI2
CONFIG_MPC860 CONFIG_MPC860
CONFIG_MPC860T CONFIG_MPC860T
CONFIG_MPC862 CONFIG_MPC862
CONFIG_MPC8641
CONFIG_MPC8641HPCN CONFIG_MPC8641HPCN
CONFIG_MPC866 CONFIG_MPC866
CONFIG_MPC866_FAMILY CONFIG_MPC866_FAMILY

Write Preview
Loading…
Cancel
Save