Merge branch 'linux-c6x-2.0.x' into boot-rel-exp
authorPrabhu Kuttiyam <pkuttiyam@ti.com>
Mon, 28 Nov 2011 14:42:40 +0000 (09:42 -0500)
committerPrabhu Kuttiyam <pkuttiyam@ti.com>
Mon, 28 Nov 2011 14:42:40 +0000 (09:42 -0500)
Conflicts:
src/device/c66x/c66x.c
src/main/iblmain.c

1  2 
src/device/c66x/c66x.c
src/hw/c64x/make/makefile
src/hw/uart/c66x_uart/c66x_uart.h

index ef7d5feb3c3c8822232b9c755a585f5b95f12f59,e7a2cf7ec894cd4066d0632de80e3d0dd7513cbf..7fe8c3e50d9f0bff891fe2dcec5d631300d416e8
@@@ -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
Simple merge
Simple merge