X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fefm32.c;h=fb4b09624b4a3aac188861972ab99cea6fb010d0;hp=c8ce90866e6c94c0c4cfd1153d936f4a5e8084a4;hb=1ad6ed38b6da09b1d5d9e56d1344fced2dce12bc;hpb=08ee7bb982b16742f52cfdc6c649d82ffa2eb177

diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c
index c8ce90866e..fb4b09624b 100644
--- a/src/flash/nor/efm32.c
+++ b/src/flash/nor/efm32.c
@@ -119,9 +119,9 @@ static const struct efm32_family_data efm32_families[] = {
 		{ 16, "EFR32MG1P Mighty", .series = 1 },
 		{ 17, "EFR32MG1B Mighty", .series = 1 },
 		{ 18, "EFR32MG1V Mighty", .series = 1 },
-		{ 19, "EFR32MG1P Blue", .series = 1 },
-		{ 20, "EFR32MG1B Blue", .series = 1 },
-		{ 21, "EFR32MG1V Blue", .series = 1 },
+		{ 19, "EFR32BG1P Blue", .series = 1 },
+		{ 20, "EFR32BG1B Blue", .series = 1 },
+		{ 21, "EFR32BG1V Blue", .series = 1 },
 		{ 25, "EFR32FG1P Flex", .series = 1 },
 		{ 26, "EFR32FG1B Flex", .series = 1 },
 		{ 27, "EFR32FG1V Flex", .series = 1 },
@@ -386,7 +386,7 @@ static int efm32x_wait_status(struct flash_bank *bank, int timeout,
 
 		LOG_DEBUG("status: 0x%" PRIx32 "", status);
 
-		if (((status & wait_mask) == 0) && (0 == wait_for_set))
+		if (((status & wait_mask) == 0) && (wait_for_set == 0))
 			break;
 		else if (((status & wait_mask) != 0) && wait_for_set)
 			break;
@@ -457,7 +457,7 @@ static int efm32x_erase(struct flash_bank *bank, unsigned int first,
 	struct target *target = bank->target;
 	int ret = 0;
 
-	if (TARGET_HALTED != target->state) {
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -958,7 +958,7 @@ static int efm32x_probe(struct flash_bank *bank)
 	LOG_INFO("flash size = %dkbytes", efm32_mcu_info.flash_sz_kib);
 	LOG_INFO("flash page size = %dbytes", efm32_mcu_info.page_size);
 
-	assert(0 != efm32_mcu_info.page_size);
+	assert(efm32_mcu_info.page_size != 0);
 
 	int num_pages = efm32_mcu_info.flash_sz_kib * 1024 /
 		efm32_mcu_info.page_size;