rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / board / esd / pmc440 / cmd_pmc440.c

diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index 90d93095558f7b201f2557cd2fe4d3840b6c465b..38ee74eb4bc57c6c5df0f82ce30e8aa9e92191ba 100644 (file)
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -293,20 +293,9 @@ int do_setup_bootstrap_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
                        sdsdp[2]=0x40082350;
                        sdsdp[3]=0x0d050000;
                } else if (!strcmp(argv[1], "667")) {
-                       /* PLB=133MHz, PLB/PCI=4 */
+                       /* PLB=133MHz, PLB/PCI=3 */
                        printf("Bootstrapping for 667MHz\n");
                        sdsdp[0]=0x8778a256;
-                       sdsdp[1]=0x0947a030;
-                       sdsdp[2]=0x40082350;
-                       sdsdp[3]=0x0d050000;
-               } else if (!strcmp(argv[1], "test")) {
-                       /*
-                        * TODO: this will replace the 667 MHz config above.
-                        * But it needs some more testing on a real 667 MHz CPU.
-                        */
-                       printf("Bootstrapping for test"
-                              " (667MHz PLB=133PLB PLB/PCI=3)\n");
-                       sdsdp[0]=0x8778a256;
                        sdsdp[1]=0x095fa030;
                        sdsdp[2]=0x40082350;
                        sdsdp[3]=0x0d050000;
@@ -334,7 +323,7 @@ int do_setup_bootstrap_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
        }
 
        printf("Writing boot EEPROM ...\n");
-       if (bootstrap_eeprom_write(CFG_I2C_BOOT_EEPROM_ADDR,
+       if (bootstrap_eeprom_write(CONFIG_SYS_I2C_BOOT_EEPROM_ADDR,
                                   0, (uchar*)sdsdp, count) != 0)
                printf("bootstrap_eeprom_write failed\n");
        else
@@ -374,11 +363,11 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        printf("PARAM: @%08x\n", param);
 
        memset((void*)param, 0, (pram << 10));
-       env_base = memsize - 4096 - ((CFG_ENV_SIZE + 4096) & ~(4096-1));
-       memcpy((void*)env_base, env_ptr, CFG_ENV_SIZE);
+       env_base = memsize - 4096 - ((CONFIG_ENV_SIZE + 4096) & ~(4096-1));
+       memcpy((void*)env_base, env_ptr, CONFIG_ENV_SIZE);
 
        lptr = (ulong*)memsize;
-       *(--lptr) = CFG_ENV_SIZE;
+       *(--lptr) = CONFIG_ENV_SIZE;
        *(--lptr) = memsize - env_base;
        *(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08);
        *(--lptr) = 0;
@@ -524,7 +513,7 @@ U_BOOT_CMD(
        "<pciaddr> (pciaddr will be aligned to 256MB)\n"
        );
 
-#if defined(CFG_EEPROM_WREN)
+#if defined(CONFIG_SYS_EEPROM_WREN)
 int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        int query = argc == 1;
@@ -532,21 +521,21 @@ int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if (query) {
                /* Query write access state. */
-               state = eeprom_write_enable(CFG_I2C_EEPROM_ADDR, -1);
+               state = eeprom_write_enable(CONFIG_SYS_I2C_EEPROM_ADDR, -1);
                if (state < 0) {
                        puts("Query of write access state failed.\n");
                } else {
                        printf("Write access for device 0x%0x is %sabled.\n",
-                              CFG_I2C_EEPROM_ADDR, state ? "en" : "dis");
+                              CONFIG_SYS_I2C_EEPROM_ADDR, state ? "en" : "dis");
                        state = 0;
                }
        } else {
                if ('0' == argv[1][0]) {
                        /* Disable write access. */
-                       state = eeprom_write_enable(CFG_I2C_EEPROM_ADDR, 0);
+                       state = eeprom_write_enable(CONFIG_SYS_I2C_EEPROM_ADDR, 0);
                } else {
                        /* Enable write access. */
-                       state = eeprom_write_enable(CFG_I2C_EEPROM_ADDR, 1);
+                       state = eeprom_write_enable(CONFIG_SYS_I2C_EEPROM_ADDR, 1);
                }
                if (state < 0) {
                        puts("Setup of write access state failed.\n");
@@ -558,6 +547,6 @@ int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
           "eepwren - Enable / disable / query EEPROM write access\n",
           NULL);
-#endif /* #if defined(CFG_EEPROM_WREN) */
+#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
 
 #endif /* CONFIG_CMD_BSP */