From 4933b91f8a49e436681f163df3173beb91cac44a Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 23 Jan 2008 16:31:01 -0600 Subject: 86xx: Support new law setup method and convert mpc8641 Adds the support code in cpu/mpc86xx for the new law setup code recently created fsl_law.c, and changes the MPC8641HPCN config to use this code. Signed-off-by: Becky Bruce --- include/configs/MPC8641HPCN.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 985182fdec..55ed9a6a2b 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 -- cgit From 031976f6364b93833e989f57e9f1e023e0be8c4c Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 23 Jan 2008 16:31:02 -0600 Subject: 86xx: Convert mpc8610hpcd to new law setup method. Signed-off-by: Becky Bruce --- include/configs/MPC8610HPCD.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index a53953c29c..92b4e7b6a9 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 -- cgit From 713d8186649dae874613d495b0cecaa039a98b30 Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 23 Jan 2008 16:31:03 -0600 Subject: 86xx: Convert sbc8641d to use new law setup code. Signed-off-by: Becky Bruce --- include/configs/sbc8641d.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 54eac38b86..1c1e82672c 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 -- cgit From ddcebcb638715a6278da93b553d5016f99823816 Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 23 Jan 2008 16:31:05 -0600 Subject: 86xx: Add print_laws function to fsl_law.c This can be used for debug, and will be used by board code to help implement reginfo. Signed-off-by: Becky Bruce --- include/asm-ppc/fsl_law.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/asm-ppc/fsl_law.h b/include/asm-ppc/fsl_law.h index 7cb8840dde..23bd5057a7 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[]; -- cgit From 4f93f8b1a4d35b6d302842132edba920ef8f62aa Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 23 Jan 2008 16:31:06 -0600 Subject: 86xx: Add reginfo command Signed-off-by: Becky Bruce --- include/configs/MPC8610HPCD.h | 1 + include/configs/MPC8641HPCN.h | 1 + include/configs/sbc8641d.h | 1 + 3 files changed, 3 insertions(+) (limited to 'include') diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 92b4e7b6a9..39201474e9 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -315,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 55ed9a6a2b..a8d0077ca3 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -537,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 1c1e82672c..1991a8cc87 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -480,6 +480,7 @@ #include #define CONFIG_CMD_PING #define CONFIG_CMD_I2C + #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI -- cgit From ccd6e1464e5396bc1a9aebf7077ddf4342eafe03 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Tue, 12 Feb 2008 14:53:28 -0600 Subject: Add CFG_MPC86xx_DDR_ADDR and CFG_MPC86xx_DDR2_ADDR symbols These replace direct structure references for IMMR sections. Signed-off-by: Jon Loeliger --- include/asm-ppc/immap_86xx.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/asm-ppc/immap_86xx.h b/include/asm-ppc/immap_86xx.h index 169725b923..a15c6ec12a 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__*/ -- cgit