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

powerpc: E500: Move CONFIG_E500 and CONFIG_E500MC to Kconfig

Browse Source 
Use Kconfig option for E500 and E500MC macros.

Signed-off-by: York Sun <york.sun@nxp.com>
master
York Sun 8 years ago committed by Tom Rini
parent 87f5f5417f
commit f8dee36034
41 changed files with 30 additions and 115 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. 30
      arch/powerpc/cpu/mpc85xx/Kconfig
  2. 3
      include/configs/B4860QDS.h
  3. 2
      include/configs/BSC9131RDB.h
  4. 2
      include/configs/BSC9132QDS.h
  5. 2
      include/configs/C29XPCIE.h
  6. 4
      include/configs/MPC8536DS.h
  7. 4
      include/configs/MPC8540ADS.h
  8. 2
      include/configs/MPC8541CDS.h
  9. 4
      include/configs/MPC8544DS.h
  10. 4
      include/configs/MPC8548CDS.h
  11. 2
      include/configs/MPC8555CDS.h
  12. 2
      include/configs/MPC8560ADS.h
  13. 4
      include/configs/MPC8568MDS.h
  14. 4
      include/configs/MPC8569MDS.h
  15. 2
      include/configs/MPC8572DS.h
  16. 3
      include/configs/P1010RDB.h
  17. 2
      include/configs/P1022DS.h
  18. 2
      include/configs/P1023RDB.h
  19. 3
      include/configs/P2041RDB.h
  20. 3
      include/configs/T102xQDS.h
  21. 3
      include/configs/T102xRDB.h
  22. 3
      include/configs/T1040QDS.h
  23. 3
      include/configs/T104xRDB.h
  24. 3
      include/configs/T208xQDS.h
  25. 3
      include/configs/T208xRDB.h
  26. 3
      include/configs/T4240RDB.h
  27. 5
      include/configs/UCP1020.h
  28. 2
      include/configs/controlcenterd.h
  29. 3
      include/configs/corenet_ds.h
  30. 3
      include/configs/cyrus.h
  31. 3
      include/configs/km/kmp204x-common.h
  32. 4
      include/configs/p1_p2_rdb_pc.h
  33. 4
      include/configs/p1_twr.h
  34. 4
      include/configs/qemu-ppce500.h
  35. 2
      include/configs/sbc8548.h
  36. 2
      include/configs/socrates.h
  37. 3
      include/configs/t4qds.h
  38. 2
      include/configs/xpedite520x.h
  39. 2
      include/configs/xpedite537x.h
  40. 2
      include/configs/xpedite550x.h
  41. 2
      scripts/config_whitelist.txt

30
arch/powerpc/cpu/mpc85xx/Kconfig
Unescape View File

@ -323,10 +323,12 @@ endchoice
config ARCH_B4420
bool
select E500MC
select FSL_LAW
config ARCH_B4860
bool
select E500MC
select FSL_LAW
config ARCH_BSC9131
@ -419,22 +421,27 @@ config ARCH_P2020
config ARCH_P2041
bool
select E500MC
select FSL_LAW
config ARCH_P3041
bool
select E500MC
select FSL_LAW
config ARCH_P4080
bool
select E500MC
select FSL_LAW
config ARCH_P5020
bool
select E500MC
select FSL_LAW
config ARCH_P5040
bool
select E500MC
select FSL_LAW
config ARCH_QEMU_E500
@ -442,36 +449,59 @@ config ARCH_QEMU_E500
config ARCH_T1023
bool
select E500MC
select FSL_LAW
config ARCH_T1024
bool
select E500MC
select FSL_LAW
config ARCH_T1040
bool
select E500MC
select FSL_LAW
config ARCH_T1042
bool
select E500MC
select FSL_LAW
config ARCH_T2080
bool
select E500MC
select FSL_LAW
config ARCH_T2081
bool
select E500MC
select FSL_LAW
config ARCH_T4160
bool
select E500MC
select FSL_LAW
config ARCH_T4240
bool
select E500MC
select FSL_LAW
config BOOKE
bool
default y
config E500
bool
default y
help
Enable PowerPC E500 cores, including e500v1, e500v2, e500mc
config E500MC
bool
help
Enble PowerPC E500MC core
config FSL_LAW
bool
help

3
include/configs/B4860QDS.h
Unescape View File

@ -50,9 +50,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

2
include/configs/BSC9131RDB.h
Unescape View File

@ -46,8 +46,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE /* BOOKE */
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_FSL_IFC /* Enable IFC Support */
#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */

2
include/configs/BSC9132QDS.h
Unescape View File

@ -69,8 +69,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE /* BOOKE */
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_FSL_IFC /* Enable IFC Support */
#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
#define CONFIG_SYS_HAS_SERDES /* common SERDES init code */

2
include/configs/C29XPCIE.h
Unescape View File

@ -68,8 +68,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE /* BOOKE */
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_FSL_IFC /* Enable IFC Support */
#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
#define CONFIG_SYS_HAS_SERDES /* common SERDES init code */

4
include/configs/MPC8536DS.h
Unescape View File

@ -37,10 +37,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */
#define CONFIG_PCI1 1 /* Enable PCI controller 1 */
#define CONFIG_PCIE1 1 /* PCIE controller 1 (slot 1) */

4
include/configs/MPC8540ADS.h
Unescape View File

@ -18,10 +18,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
/*
* default CCARBAR is at 0xff700000
* assume U-Boot is less than 0.5MB

2
include/configs/MPC8541CDS.h
Unescape View File

@ -14,8 +14,6 @@
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_CPM2 1 /* has CPM2 */
#define CONFIG_SYS_TEXT_BASE 0xfff80000

4
include/configs/MPC8544DS.h
Unescape View File

@ -11,10 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xfff80000
#endif

4
include/configs/MPC8548CDS.h
Unescape View File

@ -13,10 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xfff80000
#endif

2
include/configs/MPC8555CDS.h
Unescape View File

@ -14,8 +14,6 @@
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_CPM2 1 /* has CPM2 */
#define CONFIG_SYS_TEXT_BASE 0xfff80000

2
include/configs/MPC8560ADS.h
Unescape View File

@ -19,8 +19,6 @@
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_CPM2 1 /* has CPM2 */
/*

4
include/configs/MPC8568MDS.h
Unescape View File

@ -10,10 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_SYS_TEXT_BASE 0xfff80000
#define CONFIG_SYS_SRIO

4
include/configs/MPC8569MDS.h
Unescape View File

@ -10,10 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_FSL_ELBC 1 /* Has Enhance localbus controller */
#define CONFIG_SYS_SRIO

2
include/configs/MPC8572DS.h
Unescape View File

@ -26,8 +26,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_MP 1 /* support multiple processors */
#define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */

3
include/configs/P1010RDB.h
Unescape View File

@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define CONFIG_E500 /* BOOKE e500 family */
#include <asm/config_mpc85xx.h>
#define CONFIG_NAND_FSL_IFC
@ -131,8 +130,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE /* BOOKE */
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_FSL_IFC /* Enable IFC Support */
#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
#define CONFIG_SYS_HAS_SERDES /* common SERDES init code */

2
include/configs/P1022DS.h
Unescape View File

@ -86,8 +86,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE /* BOOKE */
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_MP /* support multiple processors */
#ifndef CONFIG_SYS_TEXT_BASE

2
include/configs/P1023RDB.h
Unescape View File

@ -23,8 +23,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE /* BOOKE */
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_MP /* support multiple processors */
#define CONFIG_FSL_ELBC /* Has Enhanced localbus controller */

3
include/configs/P2041RDB.h
Unescape View File

@ -28,9 +28,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

3
include/configs/T102xQDS.h
Unescape View File

@ -12,9 +12,6 @@
#define __T1024QDS_H
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */
#define CONFIG_ENABLE_36BIT_PHYS

3
include/configs/T102xRDB.h
Unescape View File

@ -12,9 +12,6 @@
#define __T1024RDB_H
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */
#define CONFIG_ENABLE_36BIT_PHYS

3
include/configs/T1040QDS.h
Unescape View File

@ -36,9 +36,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

3
include/configs/T104xRDB.h
Unescape View File

@ -10,7 +10,6 @@
/*
* T104x RDB board configuration file
*/
#define CONFIG_E500 /* BOOKE e500 family */
#include <asm/config_mpc85xx.h>
#ifdef CONFIG_RAMBOOT_PBL
@ -147,8 +146,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

3
include/configs/T208xQDS.h
Unescape View File

@ -24,9 +24,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */
#define CONFIG_ENABLE_36BIT_PHYS

3
include/configs/T208xRDB.h
Unescape View File

@ -17,9 +17,6 @@
#define CONFIG_FSL_SATA_V2
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */
#define CONFIG_ENABLE_36BIT_PHYS

3
include/configs/T4240RDB.h
Unescape View File

@ -60,9 +60,6 @@
#define CONFIG_CMD_REGINFO
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

5
include/configs/UCP1020.h
Unescape View File

@ -115,11 +115,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500
/* #define CONFIG_MPC85xx */
#define CONFIG_MP
#define CONFIG_ENV_OVERWRITE

2
include/configs/controlcenterd.h
Unescape View File

@ -35,8 +35,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE /* BOOKE */
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_CONTROLCENTERD
#define CONFIG_MP /* support multiple processors */

3
include/configs/corenet_ds.h
Unescape View File

@ -46,9 +46,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

3
include/configs/cyrus.h
Unescape View File

@ -38,9 +38,6 @@
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

3
include/configs/km/kmp204x-common.h
Unescape View File

@ -29,9 +29,6 @@
#define CONFIG_SYS_FSL_PBL_RCW board/keymile/kmp204x/rcw_kmp204x.cfg
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
#define CONFIG_MP /* support multiple processors */

4
include/configs/p1_p2_rdb_pc.h
Unescape View File

@ -258,10 +258,6 @@
#endif
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500
#define CONFIG_MP
#define CONFIG_FSL_ELBC

4
include/configs/p1_twr.h
Unescape View File

@ -38,10 +38,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
#endif
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500
#define CONFIG_MP
#define CONFIG_FSL_ELBC

4
include/configs/qemu-ppce500.h
Unescape View File

@ -12,10 +12,6 @@
#define CONFIG_CMD_REGINFO
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#undef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xf01000 /* 15 MB */

2
include/configs/sbc8548.h
Unescape View File

@ -36,8 +36,6 @@
/*
* High Level Configuration Options
*/
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_SBC8548 1 /* SBC8548 board specific */
/*

2
include/configs/socrates.h
Unescape View File

@ -18,8 +18,6 @@
#define __CONFIG_H
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_SOCRATES 1
#define CONFIG_SYS_TEXT_BASE 0xfff80000

3
include/configs/t4qds.h
Unescape View File

@ -13,9 +13,6 @@
#define CONFIG_CMD_REGINFO
/* High Level Configuration Options */
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */
#define CONFIG_MP /* support multiple processors */

2
include/configs/xpedite520x.h
Unescape View File

@ -14,8 +14,6 @@
/*
* High Level Configuration Options
*/
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_XPEDITE5200 1
#define CONFIG_SYS_BOARD_NAME "XPedite5200"
#define CONFIG_SYS_FORM_PMC_XMC 1

2
include/configs/xpedite537x.h
Unescape View File

@ -14,8 +14,6 @@
/*
* High Level Configuration Options
*/
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_SYS_BOARD_NAME "XPedite5370"
#define CONFIG_SYS_FORM_3U_VPX 1
#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */

2
include/configs/xpedite550x.h
Unescape View File

@ -14,8 +14,6 @@
/*
* High Level Configuration Options
*/
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_XPEDITE550X 1
#define CONFIG_SYS_BOARD_NAME "XPedite5500"
#define CONFIG_SYS_FORM_PMC_XMC 1

2
scripts/config_whitelist.txt
Unescape View File

@ -957,8 +957,6 @@ CONFIG_DW_WDT_CLOCK_KHZ
CONFIG_DYNAMIC_MMC_DEVNO
CONFIG_E1000_NO_NVM
CONFIG_E300
CONFIG_E500
CONFIG_E500MC
CONFIG_E5500
CONFIG_E6500
CONFIG_EBCAW_VAL

Write Preview
Loading…
Cancel
Save