diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:27:11 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:27:11 +0100 |
| commit | ae91a8055c933f4528d88cf92314dabdc8b6acf2 (patch) | |
| tree | 3a9ae556ce4cca03cdf8b5c8d2c17794e4a33be6 /include | |
| parent | a4d60bb917ed3d9b47ec8e55348e9bce004fa9b4 (diff) | |
| parent | 9e04a8138892d64848dc6e8e74213086d9190d9a (diff) | |
| download | u-boot-imx-ae91a8055c933f4528d88cf92314dabdc8b6acf2.zip u-boot-imx-ae91a8055c933f4528d88cf92314dabdc8b6acf2.tar.gz u-boot-imx-ae91a8055c933f4528d88cf92314dabdc8b6acf2.tar.bz2 | |
Merge ../custodians
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/fsl_law.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc/immap_86xx.h | 5 | ||||
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8641HPCN.h | 2 | ||||
| -rw-r--r-- | include/configs/sbc8641d.h | 2 |
5 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-ppc/fsl_law.h b/include/asm-ppc/fsl_law.h index 7cb8840..23bd505 100644 --- a/include/asm-ppc/fsl_law.h +++ b/include/asm-ppc/fsl_law.h @@ -73,6 +73,7 @@ struct law_entry { extern void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id); extern void disable_law(u8 idx); extern void init_laws(void); +extern void print_laws(void); /* define in board code */ extern struct law_entry law_table[]; diff --git a/include/asm-ppc/immap_86xx.h b/include/asm-ppc/immap_86xx.h index 169725b..a15c6ec 100644 --- a/include/asm-ppc/immap_86xx.h +++ b/include/asm-ppc/immap_86xx.h @@ -1330,4 +1330,9 @@ typedef struct immap { extern immap_t *immr; +#define CFG_MPC86xx_DDR_OFFSET (0x2000) +#define CFG_MPC86xx_DDR_ADDR (CFG_IMMR + CFG_MPC86xx_DDR_OFFSET) +#define CFG_MPC86xx_DDR2_OFFSET (0x6000) +#define CFG_MPC86xx_DDR2_ADDR (CFG_IMMR + CFG_MPC86xx_DDR2_OFFSET) + #endif /*__IMMAP_86xx__*/ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index a53953c..3920147 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -42,6 +42,7 @@ #define CONFIG_PCIE1 1 /* PCIe 1 connected to ULI bridge */ #define CONFIG_PCIE2 1 /* PCIe 2 connected to slot */ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ +#define CONFIG_FSL_LAW 1 /* Use common FSL init code */ #define CONFIG_ENV_OVERWRITE @@ -314,6 +315,7 @@ #define CONFIG_NET_MULTI #define CONFIG_CMD_NET #define CONFIG_PCI_PNP /* do pci plug-and-play */ +#define CONFIG_CMD_REGINFO #define CONFIG_ULI526X #ifdef CONFIG_ULI526X diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 985182f..a8d0077 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -49,6 +49,7 @@ #define CONFIG_PCI1 1 /* PCIE controler 1 (ULI bridge) */ #define CONFIG_PCI2 1 /* PCIE controler 2 (slot) */ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ +#define CONFIG_FSL_LAW 1 /* Use common FSL law init code */ #define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE @@ -536,6 +537,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_PING #define CONFIG_CMD_I2C +#define CONFIG_CMD_REGINFO #if defined(CFG_RAMBOOT) #undef CONFIG_CMD_ENV diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 54eac38..1991a8c 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -53,6 +53,7 @@ #define CONFIG_PCI1 1 /* PCIE controler 1 (slot 1) */ #define CONFIG_PCI2 1 /* PCIE controler 2 (slot 2) */ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ +#define CONFIG_FSL_LAW 1 /* Use common FSL init code */ #define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE @@ -479,6 +480,7 @@ #include <config_cmd_default.h> #define CONFIG_CMD_PING #define CONFIG_CMD_I2C + #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI |