Merge branch 'master' of git://www.denx.de/git/u-boot-avr32

[oweals/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 e9e9746b8127dea3bc22c1ea7f5215680ca4d770..ca5c177e3436be26ed4b94487afcf472affe5d32 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;
@@ -503,15 +492,15 @@ int do_pmm(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                /* map PCI address at 0xc0000000 in PLB space */
 
-                /* PMM1 Mask/Attribute - disabled b4 setting */
+               /* PMM1 Mask/Attribute - disabled b4 setting */
                out32r(PCIX0_PMM1MA, 0x00000000);
-                /* PMM1 Local Address */
+               /* PMM1 Local Address */
                out32r(PCIX0_PMM1LA, 0xc0000000);
-                /* PMM1 PCI Low Address */
+               /* PMM1 PCI Low Address */
                out32r(PCIX0_PMM1PCILA, pciaddr);
-                /* PMM1 PCI High Address */
+               /* PMM1 PCI High Address */
                out32r(PCIX0_PMM1PCIHA, 0x00000000);
-                /* 256MB + No prefetching, and enable region */
+               /* 256MB + No prefetching, and enable region */
                out32r(PCIX0_PMM1MA, 0xf0000001);
        } else {
                printf("Usage:\npmm %s\n", cmdtp->help);