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

85xx: Handle eLBC difference w/36-bit physical

Browse Source 
The eLBC only handles 32-bit physical address in systems with 36-bit
physical.  The previos generation of LBC handled 34-bit physical
address in 36-bit systems.  Added a new CONFIG option to convey
the difference between the LBC and eLBC.

Also added defines for XAM bits used in LBC for the extended 34-bit
support.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
master
Kumar Gala 16 years ago committed by Andrew Fleming-AFLEMING
parent 72a9414a8e
commit c51fc5d53c
3 changed files with 9 additions and 1 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. 8
      include/asm-ppc/fsl_lbc.h
  2. 1
      include/configs/MPC8536DS.h
  3. 1
      include/configs/MPC8572DS.h

8
include/asm-ppc/fsl_lbc.h
Unescape View File

@ -28,6 +28,8 @@
#define BR_BA 0xFFFF8000 #define BR_BA 0xFFFF8000
#define BR_BA_SHIFT 15 #define BR_BA_SHIFT 15
#define BR_XBA 0x00006000
#define BR_XBA_SHIFT 13
#define BR_PS 0x00001800 #define BR_PS 0x00001800
#define BR_PS_SHIFT 11 #define BR_PS_SHIFT 11
#define BR_PS_8 0x00000800 /* Port Size 8 bit */ #define BR_PS_8 0x00000800 /* Port Size 8 bit */
@ -70,7 +72,7 @@
#endif #endif
/* Convert an address into the right format for the BR registers */ /* Convert an address into the right format for the BR registers */
#ifdef CONFIG_PHYS_64BIT #if defined(CONFIG_PHYS_64BIT) && !defined(CONFIG_FSL_ELBC)
#define BR_PHYS_ADDR(x) ((unsigned long)((x & 0x0ffff8000ULL) | \ #define BR_PHYS_ADDR(x) ((unsigned long)((x & 0x0ffff8000ULL) | \
((x & 0x300000000ULL) >> 19))) ((x & 0x300000000ULL) >> 19)))
#else #else
@ -90,6 +92,8 @@
#define OR_GPCM_AM 0xFFFF8000 #define OR_GPCM_AM 0xFFFF8000
#define OR_GPCM_AM_SHIFT 15 #define OR_GPCM_AM_SHIFT 15
#define OR_GPCM_XAM 0x00006000
#define OR_GPCM_XAM_SHIFT 13
#define OR_GPCM_BCTLD 0x00001000 #define OR_GPCM_BCTLD 0x00001000
#define OR_GPCM_BCTLD_SHIFT 12 #define OR_GPCM_BCTLD_SHIFT 12
#define OR_GPCM_CSNT 0x00000800 #define OR_GPCM_CSNT 0x00000800
@ -132,6 +136,8 @@
#define OR_FCM_AM 0xFFFF8000 #define OR_FCM_AM 0xFFFF8000
#define OR_FCM_AM_SHIFT 15 #define OR_FCM_AM_SHIFT 15
#define OR_FCM_XAM 0x00006000
#define OR_FCM_XAM_SHIFT 13
#define OR_FCM_BCTLD 0x00001000 #define OR_FCM_BCTLD 0x00001000
#define OR_FCM_BCTLD_SHIFT 12 #define OR_FCM_BCTLD_SHIFT 12
#define OR_FCM_PGS 0x00000400 #define OR_FCM_PGS 0x00000400

1
include/configs/MPC8536DS.h
Unescape View File

@ -34,6 +34,7 @@
#define CONFIG_MPC8536 1 #define CONFIG_MPC8536 1
#define CONFIG_MPC8536DS 1 #define CONFIG_MPC8536DS 1
#define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */
#define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */
#define CONFIG_PCI1 1 /* Enable PCI controller 1 */ #define CONFIG_PCI1 1 /* Enable PCI controller 1 */
#define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */

1
include/configs/MPC8572DS.h
Unescape View File

@ -36,6 +36,7 @@
#define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_MP 1 /* support multiple processors */
#define CONFIG_NUM_CPUS 2 /* Number of CPUs in the system */ #define CONFIG_NUM_CPUS 2 /* Number of CPUs in the system */
#define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */
#define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */
#define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */
#define CONFIG_PCIE2 1 /* PCIE controler 2 (slot 2) */ #define CONFIG_PCIE2 1 /* PCIE controler 2 (slot 2) */

Write Preview
Loading…
Cancel
Save