rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/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 90d9309..74cf4c3 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;
@@ -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;