Remove 512k support, fix flash waitstates

512k chip support isn't complete anyway and the incorrect clock would've
ended up destroying Flash anyway. The 256k waitstates were set to 0,
which is outside the spec. Set them to 1, which is allowed.

diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 53e6924d017d6b32aced8ea9a6f40f59c2b5622d..05f8c8e50742f8e56944d69d2e001dd0ab4c9cc9 100644 (file)
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -256,19 +256,9 @@ void BootROM(void)
     LED_B_OFF();
     LED_A_OFF();
 
     LED_B_OFF();
     LED_A_OFF();
 

-    // if 512K FLASH part - TODO make some defines :)
-    if ((AT91C_BASE_DBGU->DBGU_CIDR & 0xf00) == 0xa00) {
-           AT91C_BASE_EFC0->EFC_FMR =
-               MC_FLASH_MODE_FLASH_WAIT_STATES(1) |
-                       MC_FLASH_MODE_MASTER_CLK_IN_MHZ(0x48);
-           AT91C_BASE_EFC1->EFC_FMR =
-               MC_FLASH_MODE_FLASH_WAIT_STATES(1) |
-                       MC_FLASH_MODE_MASTER_CLK_IN_MHZ(0x48);
-    } else {
-           AT91C_BASE_EFC0->EFC_FMR =
-               MC_FLASH_MODE_FLASH_WAIT_STATES(0) |
-                       MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
-    }
+       AT91C_BASE_EFC0->EFC_FMR =
+               MC_FLASH_MODE_FLASH_WAIT_STATES(1) |
+               MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);

 
     // Initialize all system clocks
     ConfigClocks();
 
     // Initialize all system clocks
     ConfigClocks();