From: Prabhu Kuttiyam <pkuttiyam@ti.com>
Date: Mon, 28 Nov 2011 14:42:40 +0000 (-0500)
Subject: Merge branch 'linux-c6x-2.0.x' into boot-rel-exp
X-Git-Tag: DEV.MAD_UTILS.IBL.01.00.00.12~3
X-Git-Url: https://git.ti.com/gitweb?p=keystone-rtos%2Fibl.git;a=commitdiff_plain;h=d39ea3b26f79c0b4a4b735f70329cc3761148323

Merge branch 'linux-c6x-2.0.x' into boot-rel-exp

Conflicts:
	src/device/c66x/c66x.c
	src/main/iblmain.c
---

d39ea3b26f79c0b4a4b735f70329cc3761148323
diff --cc src/device/c66x/c66x.c
index ef7d5fe,e7a2cf7..7fe8c3e
--- a/src/device/c66x/c66x.c
+++ b/src/device/c66x/c66x.c
@@@ -66,8 -66,7 +66,8 @@@
  #include "spi_api.h"
  #include <string.h>
  #include <stdint.h>
- #include "c66x_uart.h"
 +#include "target.h"
+ #include "uart.h"
  
  #define PLL_DDR_INIT_LOOPMAX 10
  #define IBL_RESULT_CODE_STR_LEN 20