summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorJ. German Rivera <German.Rivera@freescale.com>2015-01-06 13:19:02 -0800
committerYork Sun <yorksun@freescale.com>2015-02-24 13:10:20 -0800
commit7b3bd9a7988a8b4c8ba22a52b4927e8e59819b12 (patch)
tree665c5303c5e8d4357d0bd4b2cc7b5f97e56b8291 /board
parent4f2532c4a4a34f0241ef9bc921044772f19f928d (diff)
downloadtalos-obmc-uboot-7b3bd9a7988a8b4c8ba22a52b4927e8e59819b12.tar.gz
talos-obmc-uboot-7b3bd9a7988a8b4c8ba22a52b4927e8e59819b12.zip
drivers/mc: Migrated MC Flibs to 0.5.2
Upgrade Manage Complex (MC) flib API to 0.5.2. Rename directory fsl_mc to fsl-mc. Change the fsl-mc node in Linux device tree from "fsl,dprcr" to "fsl-mc". Print MC version info when appropriate. Signed-off-by: J. German Rivera <German.Rivera@freescale.com> Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/ls2085a/ls2085a.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/board/freescale/ls2085a/ls2085a.c b/board/freescale/ls2085a/ls2085a.c
index ee75d1b7ed..519d61cb1e 100644
--- a/board/freescale/ls2085a/ls2085a.c
+++ b/board/freescale/ls2085a/ls2085a.c
@@ -12,7 +12,7 @@
#include <asm/io.h>
#include <fdt_support.h>
#include <libfdt.h>
-#include <fsl_mc.h>
+#include <fsl-mc/fsl_mc.h>
#include <environment.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -98,7 +98,21 @@ void fdt_fixup_board_enet(void *fdt)
{
int offset;
- offset = fdt_path_offset(fdt, "/fsl,dprc@0");
+ offset = fdt_path_offset(fdt, "/fsl-mc");
+
+ /*
+ * TODO: Remove this when backward compatibility
+ * with old DT node (fsl,dprc@0) is no longer needed.
+ */
+ if (offset < 0)
+ offset = fdt_path_offset(fdt, "/fsl,dprc@0");
+
+ if (offset < 0) {
+ printf("%s: ERROR: fsl-mc node not found in device tree (error %d)\n",
+ __func__, offset);
+ return;
+ }
+
if (get_mc_boot_status() == 0)
fdt_status_okay(fdt, offset);
else
OpenPOWER on IntegriCloud