From 24b182d01b2ede6d4689db9d947d21fdf8e5dfd9 Mon Sep 17 00:00:00 2001 From: marcansoft Date: Wed, 3 Mar 2010 13:33:24 +0000 Subject: [PATCH] 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. --- bootrom/bootrom.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c index 53e6924d..05f8c8e5 100644 --- a/bootrom/bootrom.c +++ b/bootrom/bootrom.c @@ -256,19 +256,9 @@ void BootROM(void) 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(); -- 2.39.5