eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

Browse Source
This commit is contained in:
Wolfgang Denk
2008-08-23 00:10:43 +02:00
parent 0bb86d823b 5d4b3d2b31
commit afe3848b79
6 changed files with 119 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/asm-ppc/ppc4xx-sdram.h
View File

@@ -259,23 +259,39 @@
/*
* Memory queue defines
*/
#define SDRAMQ_DCR_BASE 0x040
#define SDRAMQ_DCR_BASE 0x040
#define SDRAM_R0BAS (SDRAMQ_DCR_BASE+0x0) /* rank 0 base address & size */
#define SDRAM_R1BAS (SDRAMQ_DCR_BASE+0x1) /* rank 1 base address & size */
#define SDRAM_R2BAS (SDRAMQ_DCR_BASE+0x2) /* rank 2 base address & size */
#define SDRAM_R3BAS (SDRAMQ_DCR_BASE+0x3) /* rank 3 base address & size */
#define SDRAM_CONF1HB (SDRAMQ_DCR_BASE+0x5) /* configuration 1 HB */
#define SDRAM_ERRSTATHB (SDRAMQ_DCR_BASE+0x7) /* error status HB */
#define SDRAM_ERRADDUHB (SDRAMQ_DCR_BASE+0x8) /* error address upper 32 HB */
#define SDRAM_ERRADDLHB (SDRAMQ_DCR_BASE+0x9) /* error address lower 32 HB */
#define SDRAM_PLBADDULL (SDRAMQ_DCR_BASE+0xA) /* PLB base address upper 32 LL */
#define SDRAM_CONF1LL (SDRAMQ_DCR_BASE+0xB) /* configuration 1 LL */
#define SDRAM_ERRSTATLL (SDRAMQ_DCR_BASE+0xC) /* error status LL */
#define SDRAM_ERRADDULL (SDRAMQ_DCR_BASE+0xD) /* error address upper 32 LL */
#define SDRAM_ERRADDLLL (SDRAMQ_DCR_BASE+0xE) /* error address lower 32 LL */
#define SDRAM_CONFPATHB (SDRAMQ_DCR_BASE+0xF) /* configuration between paths */
#define SDRAM_PLBADDUHB (SDRAMQ_DCR_BASE+0x10) /* PLB base address upper 32 LL */
#define SDRAM_R0BAS (SDRAMQ_DCR_BASE+0x0) /* rank 0 base address & size */
#define SDRAM_R1BAS (SDRAMQ_DCR_BASE+0x1) /* rank 1 base address & size */
#define SDRAM_R2BAS (SDRAMQ_DCR_BASE+0x2) /* rank 2 base address & size */
#define SDRAM_R3BAS (SDRAMQ_DCR_BASE+0x3) /* rank 3 base address & size */
#define SDRAM_CONF1HB (SDRAMQ_DCR_BASE+0x5) /* configuration 1 HB */
#define SDRAM_CONF1HB_AAFR 0x80000000 /* Address Ack on First Request - Bit 0 */
#define SDRAM_CONF1HB_PRPD 0x00080000 /* PLB Read pipeline Disable - Bit 12 */
#define SDRAM_CONF1HB_PWPD 0x00040000 /* PLB Write pipeline Disable - Bit 13 */
#define SDRAM_CONF1HB_PRW 0x00020000 /* PLB Read Wait - Bit 14 */
#define SDRAM_CONF1HB_RPEN 0x00000800 /* Read Passing Enable - Bit 20 */
#define SDRAM_CONF1HB_RFTE 0x00000400 /* Read Flow Through Enable - Bit 21 */
#define SDRAM_ERRSTATHB (SDRAMQ_DCR_BASE+0x7) /* error status HB */
#define SDRAM_ERRADDUHB (SDRAMQ_DCR_BASE+0x8) /* error address upper 32 HB */
#define SDRAM_ERRADDLHB (SDRAMQ_DCR_BASE+0x9) /* error address lower 32 HB */
#define SDRAM_PLBADDULL (SDRAMQ_DCR_BASE+0xA) /* PLB base address upper 32 LL */
#define SDRAM_CONF1LL (SDRAMQ_DCR_BASE+0xB) /* configuration 1 LL */
#define SDRAM_CONF1LL_AAFR 0x80000000 /* Address Ack on First Request - Bit 0 */
#define SDRAM_CONF1LL_PRPD 0x00080000 /* PLB Read pipeline Disable - Bit 12 */
#define SDRAM_CONF1LL_PWPD 0x00040000 /* PLB Write pipeline Disable - Bit 13 */
#define SDRAM_CONF1LL_PRW 0x00020000 /* PLB Read Wait - Bit 14 */
#define SDRAM_CONF1LL_RPEN 0x00000800 /* Read Passing Enable - Bit 20 */
#define SDRAM_CONF1LL_RFTE 0x00000400 /* Read Flow Through Enable - Bit 21 */
#define SDRAM_ERRSTATLL (SDRAMQ_DCR_BASE+0xC) /* error status LL */
#define SDRAM_ERRADDULL (SDRAMQ_DCR_BASE+0xD) /* error address upper 32 LL */
#define SDRAM_ERRADDLLL (SDRAMQ_DCR_BASE+0xE) /* error address lower 32 LL */
#define SDRAM_CONFPATHB (SDRAMQ_DCR_BASE+0xF) /* configuration between paths */
#define SDRAM_CONFPATHB_TPEN 0x08000000 /* Transaction Passing Enable - Bit 4 */
#define SDRAM_PLBADDUHB (SDRAMQ_DCR_BASE+0x10) /* PLB base address upper 32 LL */
#if !defined(CONFIG_405EX)
/*

47
include/ppc440.h
View File

@@ -341,53 +341,6 @@
#define PLB4_ACR_WRP (0x80000000 >> 7)
/* Nebula PLB4 Arbiter - PowerPC440EP */
#define PLB_ARBITER_BASE 0x80
#define plb0_revid (PLB_ARBITER_BASE+ 0x00)
#define plb0_acr (PLB_ARBITER_BASE+ 0x01)
#define plb0_acr_ppm_mask 0xF0000000
#define plb0_acr_ppm_fixed 0x00000000
#define plb0_acr_ppm_fair 0xD0000000
#define plb0_acr_hbu_mask 0x08000000
#define plb0_acr_hbu_disabled 0x00000000
#define plb0_acr_hbu_enabled 0x08000000
#define plb0_acr_rdp_mask 0x06000000
#define plb0_acr_rdp_disabled 0x00000000
#define plb0_acr_rdp_2deep 0x02000000
#define plb0_acr_rdp_3deep 0x04000000
#define plb0_acr_rdp_4deep 0x06000000
#define plb0_acr_wrp_mask 0x01000000
#define plb0_acr_wrp_disabled 0x00000000
#define plb0_acr_wrp_2deep 0x01000000
#define plb0_besrl (PLB_ARBITER_BASE+ 0x02)
#define plb0_besrh (PLB_ARBITER_BASE+ 0x03)
#define plb0_bearl (PLB_ARBITER_BASE+ 0x04)
#define plb0_bearh (PLB_ARBITER_BASE+ 0x05)
#define plb0_ccr (PLB_ARBITER_BASE+ 0x08)
#define plb1_acr (PLB_ARBITER_BASE+ 0x09)
#define plb1_acr_ppm_mask 0xF0000000
#define plb1_acr_ppm_fixed 0x00000000
#define plb1_acr_ppm_fair 0xD0000000
#define plb1_acr_hbu_mask 0x08000000
#define plb1_acr_hbu_disabled 0x00000000
#define plb1_acr_hbu_enabled 0x08000000
#define plb1_acr_rdp_mask 0x06000000
#define plb1_acr_rdp_disabled 0x00000000
#define plb1_acr_rdp_2deep 0x02000000
#define plb1_acr_rdp_3deep 0x04000000
#define plb1_acr_rdp_4deep 0x06000000
#define plb1_acr_wrp_mask 0x01000000
#define plb1_acr_wrp_disabled 0x00000000
#define plb1_acr_wrp_2deep 0x01000000
#define plb1_besrl (PLB_ARBITER_BASE+ 0x0A)
#define plb1_besrh (PLB_ARBITER_BASE+ 0x0B)
#define plb1_bearl (PLB_ARBITER_BASE+ 0x0C)
#define plb1_bearh (PLB_ARBITER_BASE+ 0x0D)
/* Pin Function Control Register 1 */
#define SDR0_PFC1 0x4101
#define SDR0_PFC1_U1ME_MASK 0x02000000 /* UART1 Mode Enable */

56
include/ppc4xx.h
View File

@@ -46,6 +46,62 @@
#define CONFIG_SDRAM_PPC4xx_IBM_DDR2 /* IBM DDR(2) controller */
#endif
/* PLB4 CrossBar Arbiter Core supported across PPC4xx families */
#if defined(CONFIG_405EX) || \
defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \
defined(CONFIG_440GR) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_460SX)
#define PLB_ARBITER_BASE 0x80
#define plb0_revid (PLB_ARBITER_BASE + 0x00)
#define plb0_acr (PLB_ARBITER_BASE + 0x01)
#define plb0_acr_ppm_mask 0xF0000000
#define plb0_acr_ppm_fixed 0x00000000
#define plb0_acr_ppm_fair 0xD0000000
#define plb0_acr_hbu_mask 0x08000000
#define plb0_acr_hbu_disabled 0x00000000
#define plb0_acr_hbu_enabled 0x08000000
#define plb0_acr_rdp_mask 0x06000000
#define plb0_acr_rdp_disabled 0x00000000
#define plb0_acr_rdp_2deep 0x02000000
#define plb0_acr_rdp_3deep 0x04000000
#define plb0_acr_rdp_4deep 0x06000000
#define plb0_acr_wrp_mask 0x01000000
#define plb0_acr_wrp_disabled 0x00000000
#define plb0_acr_wrp_2deep 0x01000000
#define plb0_besrl (PLB_ARBITER_BASE + 0x02)
#define plb0_besrh (PLB_ARBITER_BASE + 0x03)
#define plb0_bearl (PLB_ARBITER_BASE + 0x04)
#define plb0_bearh (PLB_ARBITER_BASE + 0x05)
#define plb0_ccr (PLB_ARBITER_BASE + 0x08)
#define plb1_acr (PLB_ARBITER_BASE + 0x09)
#define plb1_acr_ppm_mask 0xF0000000
#define plb1_acr_ppm_fixed 0x00000000
#define plb1_acr_ppm_fair 0xD0000000
#define plb1_acr_hbu_mask 0x08000000
#define plb1_acr_hbu_disabled 0x00000000
#define plb1_acr_hbu_enabled 0x08000000
#define plb1_acr_rdp_mask 0x06000000
#define plb1_acr_rdp_disabled 0x00000000
#define plb1_acr_rdp_2deep 0x02000000
#define plb1_acr_rdp_3deep 0x04000000
#define plb1_acr_rdp_4deep 0x06000000
#define plb1_acr_wrp_mask 0x01000000
#define plb1_acr_wrp_disabled 0x00000000
#define plb1_acr_wrp_2deep 0x01000000
#define plb1_besrl (PLB_ARBITER_BASE + 0x0A)
#define plb1_besrh (PLB_ARBITER_BASE + 0x0B)
#define plb1_bearl (PLB_ARBITER_BASE + 0x0C)
#define plb1_bearh (PLB_ARBITER_BASE + 0x0D)
#endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/
#if defined(CONFIG_440)
/*
* Enable long long (%ll ...) printf format on 440 PPC's since most of