[PATCH] Update AMCC Yucca 440SPe eval board support

[u-boot] / include / configs / cmc_pu2.h

diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index 752aeb29400b2641b56736c216d9926a8a73d374..572a70f12003727d7953a1f1e5f9ff8f93922eb8 100644 (file)
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -26,14 +26,13 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define AT91C_MAIN_CLOCK       207360000       /* from 18.432 MHz crystal (18432000 / 4 * 45) */
+#define AT91C_MAIN_CLOCK       179712000       /* from 18.432 MHz crystal (18432000 / 4 * 39) */
 #define AT91C_MASTER_CLOCK     (AT91C_MAIN_CLOCK/3)    /* peripheral clock */
 
 #define AT91_SLOW_CLOCK                32768   /* slow clock */
 
 #define CONFIG_ARM920T         1       /* This is an ARM920T Core      */
 #define CONFIG_AT91RM9200      1       /* It's an Atmel AT91RM9200 SoC */
-#define CONFIG_AT91RM9200DK    1       /* on an AT91RM9200DK Board     */
 #define CONFIG_CMC_PU2         1       /* on an CMC_PU2 Board          */
 #undef  CONFIG_USE_IRQ                 /* we don't need IRQ/FIQ stuff  */
 #define USE_920T_MMU           1
@@ -54,7 +53,7 @@
 #define SMC2_CSR_VAL   0x100032ad /* 16bit, 2 TDF, 4 WS */
 
 /* clocks */
-#define PLLAR_VAL      0x202CBE04 /* 207.360 MHz for PCK */
+#define PLLAR_VAL      0x2026BE04 /* 179,712 MHz for PCK */
 #define PLLBR_VAL      0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */
 #define MCKR_VAL       0x00000202 /* PCK/3 = MCK Master Clock = 69.120MHz from PLLA */
 
@@ -82,8 +81,6 @@
 
 #define CONFIG_BAUDRATE                9600
 
-#define CFG_AT91C_BRGR_DIVISOR 450     /* hardcode so no __divsi3 : AT91C_MASTER_CLOCK /(baudrate * 16) */
-
 /*
  * Hardware drivers
  */
@@ -111,7 +108,7 @@
 /* still about 20 kB free with this defined */
 #define CFG_LONGHELP
 
-#define CONFIG_BOOTDELAY      3
+#define CONFIG_BOOTDELAY      1
 
 #ifdef CONFIG_HARD_I2C
 #define CONFIG_COMMANDS                \
@@ -209,40 +206,31 @@ struct bd_info_ext {
 #error CONFIG_USE_IRQ not supported
 #endif
 
-#define CFG_DEVICE_NULLDEV      1      /* enble null device            */
-#define CONFIG_SILENT_CONSOLE   1      /* enable silent startup        */
-
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n"
-#define CONFIG_AUTOBOOT_STOP_STR "R"   /* default password */
-
-#define CONFIG_VERSION_VARIABLE        1       /* include version env variable */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
-       "net_nfs=tftp $(loadaddr) $(bootfile);run nfsargs addip addcons " \
+       "net_nfs=tftp ${loadaddr} ${bootfile};run nfsargs addip addcons " \
                "addmtd;bootm\0" \
        "nfsargs=setenv bootargs root=/dev/nfs rw " \
-               "nfsroot=$(serverip):$(rootpath)\0" \
-       "net_cramfs=tftp $(loadaddr) $(bootfile); run flashargs addip " \
+               "nfsroot=${serverip}:${rootpath}\0" \
+       "net_cramfs=tftp ${loadaddr} ${bootfile}; run flashargs addip " \
                "addcons addmtd; bootm\0" \
        "flash_cramfs=run flashargs addip addcons addmtd; bootm 10030000\0" \
        "flashargs=setenv bootargs root=/dev/mtdblock3 ro\0" \
-       "addip=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):" \
-               "$(hostname)::off\0" \
-       "addcons=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0" \
-       "addmtd=setenv bootargs $(bootargs) mtdparts=cmc_pu2:128k(uboot)ro," \
+       "addip=setenv bootargs ${bootargs} ethaddr=${ethaddr} " \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
+               "${hostname}::off\0" \
+       "addcons=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \
+       "addmtd=setenv bootargs ${bootargs} mtdparts=cmc_pu2:128k(uboot)ro," \
                "64k(environment),768k(linux),4096k(root),-\0" \
-       "load=tftp $(loadaddr) $(loadfile)\0" \
+       "load=tftp ${loadaddr} ${loadfile}\0" \
        "update=protect off 10000000 1001ffff;erase 10000000 1001ffff; " \
-               "cp.b $(loadaddr) 10000000 $(filesize);" \
+               "cp.b ${loadaddr} 10000000 ${filesize};" \
                "protect on 10000000 1001ffff\0" \
-       "updatel=era 10030000 100effff;tftp $(loadaddr) $(bootfile); " \
-               "cp.b $(loadaddr) 10030000 $(filesize)\0" \
-       "updatec=era 100f0000 104effff;tftp $(loadaddr) $(cramfsimage); " \
-               "cp.b $(loadaddr) 100f0000 $(filesize)\0" \
-       "updatej=era 104f0000 107fffff;tftp $(loadaddr) $(jffsimage); " \
-               "cp.b $(loadaddr) 104f0000 $(filesize)\0" \
+       "updatel=era 10030000 100effff;tftp ${loadaddr} ${bootfile}; " \
+               "cp.b ${loadaddr} 10030000 ${filesize}\0" \
+       "updatec=era 100f0000 104effff;tftp ${loadaddr} ${cramfsimage}; " \
+               "cp.b ${loadaddr} 100f0000 ${filesize}\0" \
+       "updatej=era 104f0000 107fffff;tftp ${loadaddr} ${jffsimage}; " \
+               "cp.b ${loadaddr} 104f0000 ${filesize}\0" \
        "cramfsimage=cramfs_cmc-pu2.img\0" \
        "jffsimage=jffs2_cmc-pu2.img\0" \
        "loadfile=u-boot_cmc-pu2.bin\0" \