diff options
author | Tom Rini <trini@ti.com> | 2014-02-25 12:44:13 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-02-25 13:55:49 -0500 |
commit | a7e8c15f71456d55ccb27f843862af03a00e0957 (patch) | |
tree | 67028131161fdded15fd8625aabf3de03cc98b00 /arch/powerpc/cpu/mpc85xx/t2080_ids.c | |
parent | 4c48cfb58b66924c52cd5c5d960e04cf6d7064ca (diff) | |
parent | 91d7746df89f858548fe535137b4b185a6a76d59 (diff) | |
download | u-boot-imx-a7e8c15f71456d55ccb27f843862af03a00e0957.zip u-boot-imx-a7e8c15f71456d55ccb27f843862af03a00e0957.tar.gz u-boot-imx-a7e8c15f71456d55ccb27f843862af03a00e0957.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
With this, fixup a trivial build error of get_effective_memsize needing
to be updated in the new board/freescale/p1010rdb/spl.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/t2080_ids.c')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/t2080_ids.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_ids.c b/arch/powerpc/cpu/mpc85xx/t2080_ids.c index 068e1f2..0bfd447 100644 --- a/arch/powerpc/cpu/mpc85xx/t2080_ids.c +++ b/arch/powerpc/cpu/mpc85xx/t2080_ids.c @@ -53,8 +53,10 @@ struct liodn_id_table liodn_tbl[] = { SET_USB_LIODN(1, "fsl-usb2-mph", 553), SET_USB_LIODN(2, "fsl-usb2-dr", 554), +#ifdef CONFIG_FSL_SATA_V2 SET_SATA_LIODN(1, 555), SET_SATA_LIODN(2, 556), +#endif SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 1, 148), SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 228), |