rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / board / cm5200 / cmd_cm5200.c

diff --git a/board/cm5200/cmd_cm5200.c b/board/cm5200/cmd_cm5200.c
index 5119a99ca2348bf5f564fc8826fd76bb19ad9b5a..00f0671d7851bd98a3111afa1fff490eb7c40fa8 100644 (file)
--- a/board/cm5200/cmd_cm5200.c
+++ b/board/cm5200/cmd_cm5200.c
@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2007 Markus Kappeler <markus.kappeler@objectxp.com>
  *
- * Adapted for U-Boot 1.2 by Piotr Kruszynski <ppk@semihalf.com> 
+ * Adapted for U-Boot 1.2 by Piotr Kruszynski <ppk@semihalf.com>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -27,7 +27,7 @@
 #include <i2c.h>
 #include <usb.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#ifdef CONFIG_CMD_BSP
 
 int do_i2c(char *argv[])
 {
@@ -39,18 +39,18 @@ int do_i2c(char *argv[])
        getc();
 
        temp = 0xf0; /* set io 0-4 as output */
-       i2c_write(CFG_I2C_IO, 3, 1, (uchar *)&temp, 1);
+       i2c_write(CONFIG_SYS_I2C_IO, 3, 1, (uchar *)&temp, 1);
 
        printf("Press I2C4-7. LED I2C0-3 should have the same state\n\n"
                "Press any key to stop\n\n");
 
        while (!tstc()) {
-               i2c_read(CFG_I2C_IO, 0, 1, (uchar *)&temp, 1);
+               i2c_read(CONFIG_SYS_I2C_IO, 0, 1, (uchar *)&temp, 1);
                temp1 = (temp >> 4) & 0x03;
                temp1 |= (temp >> 3) & 0x08; /* S302 -> LED303 */
                temp1 |= (temp >> 5) & 0x04; /* S303 -> LED302 */
                temp = temp1;
-               i2c_write(CFG_I2C_IO, 1, 1, (uchar *)&temp, 1);
+               i2c_write(CONFIG_SYS_I2C_IO, 1, 1, (uchar *)&temp, 1);
        }
        getc();
 
@@ -335,7 +335,7 @@ int do_rs232(char *argv[])
                if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x10000000) !=
                                0x10000000) {
                        error_status = 2;
-                       printf("%s: failure at rs232_4, rxd status is %d "
+                       printf("%s: failure at rs232_4, rxd status is %lu "
                                "(should be 1)\n", __FUNCTION__,
                                ((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
                                        0x10000000) >> 28);
@@ -350,7 +350,7 @@ int do_rs232(char *argv[])
                if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x10000000) !=
                                0x00000000) {
                        error_status = 2;
-                       printf("%s: failure at rs232_4, rxd status is %d "
+                       printf("%s: failure at rs232_4, rxd status is %lu "
                                "(should be 0)\n", __FUNCTION__,
                                ((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
                                        0x10000000) >> 28);
@@ -366,7 +366,7 @@ int do_rs232(char *argv[])
                if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x20000000) !=
                                0x20000000) {
                        error_status = 3;
-                       printf("%s: failure at rs232_4, cts status is %d "
+                       printf("%s: failure at rs232_4, cts status is %lu "
                                "(should be 1)\n", __FUNCTION__,
                                ((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
                                        0x20000000) >> 29);
@@ -381,7 +381,7 @@ int do_rs232(char *argv[])
                if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x20000000) !=
                                0x00000000) {
                        error_status = 3;
-                       printf("%s: failure at rs232_4, cts status is %d "
+                       printf("%s: failure at rs232_4, cts status is %lu "
                                "(should be 0)\n", __FUNCTION__,
                                ((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
                                        0x20000000) >> 29);
@@ -392,7 +392,7 @@ int do_rs232(char *argv[])
                error_status = 1;
                break;
        }
-       gpio->port_config |= (CFG_GPS_PORT_CONFIG & 0xFF0FF80F);
+       gpio->port_config |= (CONFIG_SYS_GPS_PORT_CONFIG & 0xFF0FF80F);
 
        return error_status;
 }
@@ -445,4 +445,4 @@ U_BOOT_CMD(
        "fkt usb\n"
        "     - Test USB communication\n"
 );
-#endif /* CFG_CMD_BSP */
+#endif /* CONFIG_CMD_BSP */