diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-01-30 10:56:19 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-01-30 10:56:19 -0600 |
| commit | 60c1b95aabbfac17b0ea9422828784e163348c5c (patch) | |
| tree | 62f0ac7e1d93db435643c21609ec4bfe02e4111c /include | |
| parent | 98b742489c09780be6a832eeaa4e5eff824792bb (diff) | |
| parent | 4f93f8b1a4d35b6d302842132edba920ef8f62aa (diff) | |
| download | u-boot-imx-60c1b95aabbfac17b0ea9422828784e163348c5c.zip u-boot-imx-60c1b95aabbfac17b0ea9422828784e163348c5c.tar.gz u-boot-imx-60c1b95aabbfac17b0ea9422828784e163348c5c.tar.bz2 | |
Merge branch 'mpc86xx'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/fsl_law.h | 1 | ||||
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8641HPCN.h | 2 | ||||
| -rw-r--r-- | include/configs/sbc8641d.h | 2 |
4 files changed, 7 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/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 |