diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
| commit | 9e04a8138892d64848dc6e8e74213086d9190d9a (patch) | |
| tree | 1740a361891d2390631ec053f1bc42e524913b78 /include/configs/MPC8610HPCD.h | |
| parent | 32c70d3420739930165271d9a1b04572adf799fd (diff) | |
| parent | 746c4b9490495dc4381dbcc49f40078d423e0a48 (diff) | |
| download | u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.zip u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.gz u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Conflicts:
common/cmd_reginfo.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/MPC8610HPCD.h')
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 |