X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Flpc2900.c;h=7bb9f141b28a9310b327b180ae13ca5b0a72753a;hp=99d6d1dc1b6bff614355aaf5a56351e3c0fedc59;hb=a17907d1067be45bd2aa4cc9bd108eccaf2e4df2;hpb=1bd87f5dbab730a5fe048bb18a952e4ffe01d7ec diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index 99d6d1dc1b..7bb9f141b2 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -184,7 +184,7 @@ static uint32_t lpc2900_run_bist128(struct flash_bank *bank, uint32_t addr_from, uint32_t addr_to, uint32_t (*signature)[4] ); static uint32_t lpc2900_address2sector(struct flash_bank *bank, uint32_t offset); -static uint32_t lpc2900_calc_tr( uint32_t clock, uint32_t time ); +static uint32_t lpc2900_calc_tr(uint32_t clock_var, uint32_t time_var); /*********************** Helper functions **************************/ @@ -1638,7 +1638,11 @@ static int lpc2900_probe(struct flash_bank *bank) else if ( package_code == 4 ) { /* 144-pin package */ - if ( (bank->size == 512*KiB) && (feat3 == 0xFFFFFCF0) ) + if ( (bank->size == 256*KiB) && (feat3 == 0xFFFFFFE9) ) + { + lpc2900_info->target_name = "LPC2926"; + } + else if ( (bank->size == 512*KiB) && (feat3 == 0xFFFFFCF0) ) { lpc2900_info->target_name = "LPC2917/01"; } @@ -1672,7 +1676,11 @@ static int lpc2900_probe(struct flash_bank *bank) if ( !found ) { - LOG_WARNING("Unknown LPC29xx derivative"); + LOG_WARNING("Unknown LPC29xx derivative" + " (FEATx=" + "%08" PRIx32 ":%08" PRIx32 ":%08" PRIx32 ":%08" PRIx32 ")", + feat0, feat1, feat2, feat3 + ); return ERROR_FLASH_OPERATION_FAILED; }