Corrected merge for 6657 ibl

diff --git a/src/interp/c64x/make/makefile b/src/interp/c64x/make/makefile
index 9934a701def842bef9122276abe281b755b85638..9200b7f99b9a3dddc3ecc40872623d730b6af7f2 100644 (file)
--- a/src/interp/c64x/make/makefile
+++ b/src/interp/c64x/make/makefile
@@ -74,6 +74,7 @@ C6X_C_DIR+= ;$(IBL_ROOT)/arch/$(ARCH)
 C6X_C_DIR+= ;$(ECODIR)
 C6X_C_DIR+= ;$(STDINC)
 C6X_C_DIR+= ;$(IBL_ROOT)/cfg/$(TARGET)
+C6X_C_DIR+= ;$(IBL_ROOT)/hw/uart
 export C6X_C_DIR
 
 

diff --git a/src/main/iblinit.c b/src/main/iblinit.c
index 18d23c2403f46ed5725ede85765b6c74367d1cd2..cfe60fa2d4d423bfea660bc5458253d7b97e1ffc 100644 (file)
--- a/src/main/iblinit.c
+++ b/src/main/iblinit.c
@@ -458,7 +458,10 @@ void main (void)
     iblStatus.iblVersion   = ibl_VERSION;
     iblStatus.activeDevice = ibl_ACTIVE_DEVICE_I2C;
 
-
+#ifdef C665x
+     /*Set GPIO as SPI,UART*/
+    configureGPIO();
+#endif
     /* Determine the boot device to read from */
     bootDevice = deviceReadBootDevice();
 

diff --git a/src/main/iblmain.c b/src/main/iblmain.c
index 61fe96dc5c49faf2fb97cca1de6b52c33b5ccabb..bd1ac4fdab5ecdf665e63d8c333887e58b48d2b9 100755 (executable)
--- a/src/main/iblmain.c
+++ b/src/main/iblmain.c
@@ -193,8 +193,11 @@ void iblPmemCfg (int32 interface, int32 port, bool enableNand)
                         iblStatus.iblFail = ibl_FAIL_CODE_NO_EMIF_CFG;
                         return;
                     }
-
+#ifdef C665x
+                                       ret = devicePowerPeriph (TARGET_PWR_EMIF_C6657);
+#else
                     ret = devicePowerPeriph (TARGET_PWR_EMIF);
+#endif
                     if (ret != 0)
                         break;
 

diff --git a/src/util/iblConfig/src/device.h b/src/util/iblConfig/src/device.h
index 5495906d15384d564491550040d9cf0c80cc2a37..047cbeaac3711e62a51e24f45de5dcc725084989 100644 (file)
--- a/src/util/iblConfig/src/device.h
+++ b/src/util/iblConfig/src/device.h
@@ -65,9 +65,9 @@
 
 /**
  * @brief
- *  The version number, 1.0.0.9
+ *  The version number, 1.0.0.11
  */
-#define ibl_VERSION  ibl_MAKE_VERSION(1,0,0,10)
+#define ibl_VERSION  ibl_MAKE_VERSION(1,0,0,11)
 
 #define SETIP(array,i0,i1,i2,i3)      array[0]=(i0);  \
                                       array[1]=(i1);  \

diff --git a/src/util/iblConfig/src/iblConfig.c b/src/util/iblConfig/src/iblConfig.c
index c02368e4436d6872095b00110b0eded72eefb3be..143ba4fd609870f0f564d431799c179860e060dc 100644 (file)
--- a/src/util/iblConfig/src/iblConfig.c
+++ b/src/util/iblConfig/src/iblConfig.c
@@ -41,6 +41,7 @@ int main (void)
            [5] = &c6472_ibl_config,
            [6] = &c6678_ibl_config,
            [7] = &c6670_ibl_config,
+           [8] = &c6657_ibl_config,
     };
     int ncfgs = ARRAY_SIZE(cfg);