Skip to content

Commit 4ae1350

Browse files
pennampennam
authored
Merge pull request #46 from bcmi-labs/log_imp
Improve init log
2 parents 55f8a75 + 39c3e8d commit 4ae1350

File tree

1 file changed

+33
-37
lines changed

1 file changed

+33
-37
lines changed

‎envie/ota.cpp

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ static void loadOTAData(void) {
5252
block_info[SCRATCH_BLOCK_DEVICE].data_offset = RTCGetBKPRegister(RTC_BKP_DR5);
5353
block_info[SCRATCH_BLOCK_DEVICE].update_size = RTCGetBKPRegister(RTC_BKP_DR6);
5454
BOOT_LOG_INF("Custom OTA data");
55+
56+
/* Print loaded Data */
57+
BOOT_LOG_INF("Secondary [%d] [%d]", block_info[SECONDARY_BLOCK_DEVICE].storage_type, block_info[SECONDARY_BLOCK_DEVICE].raw_type);
58+
BOOT_LOG_INF("Scratch [%d] [%d]", block_info[SCRATCH_BLOCK_DEVICE].storage_type, block_info[SCRATCH_BLOCK_DEVICE].raw_type);
5559
} else {
5660
#if ALL_IN_SD
5761
block_info[SECONDARY_BLOCK_DEVICE].storage_type = SD_FATFS;
@@ -98,14 +102,6 @@ static void loadOTAData(void) {
98102
#endif
99103
BOOT_LOG_INF("Default OTA data");
100104
}
101-
102-
/* Print loaded Data */
103-
BOOT_LOG_INF("Secondary BlockDevice");
104-
BOOT_LOG_INF("Storage type: %d", block_info[SECONDARY_BLOCK_DEVICE].storage_type);
105-
BOOT_LOG_INF("Raw type: %d", block_info[SECONDARY_BLOCK_DEVICE].raw_type);
106-
BOOT_LOG_INF("Scratch BlockDevice");
107-
BOOT_LOG_INF("Storage type: %d", block_info[SCRATCH_BLOCK_DEVICE].storage_type);
108-
BOOT_LOG_INF("Raw type: %d", block_info[SCRATCH_BLOCK_DEVICE].raw_type);
109105
return;
110106
}
111107

@@ -120,52 +116,52 @@ static void initBlockTable(void) {
120116
if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & INTERNAL_FLASH_FLAG) {
121117
//block_info[SECONDARY_BLOCK_DEVICE].raw_bd = new FlashIAPBlockDevice flashIAP_bd(data_offset, update_size);
122118
//block_info[SCRATCH_BLOCK_DEVICE].raw_bd = block_info[SECONDARY_BLOCK_DEVICE].raw_bd;
123-
BOOT_LOG_ERR("Secondary block device on internal flash not supported");
119+
BOOT_LOG_ERR("U on IAP");
124120
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & SDCARD_FLAG) {
125121
#if MCUBOOT_ENVIE_SDCARD
126122
block_info[SECONDARY_BLOCK_DEVICE].raw_bd = new SDMMCBlockDevice();
127123
block_info[SCRATCH_BLOCK_DEVICE].raw_bd = block_info[SECONDARY_BLOCK_DEVICE].raw_bd;
128124
#else
129-
BOOT_LOG_ERR("SDMMCBlockDevice not supported");
125+
BOOT_LOG_ERR("SDMMC");
130126
#endif
131127
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & QSPI_FLASH_FLAG) {
132128
block_info[SECONDARY_BLOCK_DEVICE].raw_bd = new QSPIFBlockDevice(PD_11, PD_12, PF_7, PD_13, PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
133129
block_info[SCRATCH_BLOCK_DEVICE].raw_bd = block_info[SECONDARY_BLOCK_DEVICE].raw_bd;
134130
} else {
135-
BOOT_LOG_ERR("Cannot configure secondary/scratch raw block device");
131+
BOOT_LOG_ERR("Config");
136132
}
137133

138134
/* Setup sliced block devices */
139135
if(block_info[SECONDARY_BLOCK_DEVICE].raw_flag) {
140136
if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & INTERNAL_FLASH_FLAG) {
141137
//block_info[SECONDARY_BLOCK_DEVICE].raw_bd = new FlashIAPBlockDevice flashIAP_bd(data_offset, update_size);
142138
//block_info[SCRATCH_BLOCK_DEVICE].raw_bd = block_info[SECONDARY_BLOCK_DEVICE].raw_bd;
143-
BOOT_LOG_ERR("Secondary block device on internal flash not supported");
139+
BOOT_LOG_ERR("U on IAP");
144140
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & SDCARD_FLAG) {
145141
#if MCUBOOT_ENVIE_SDCARD
146142
block_info[SECONDARY_BLOCK_DEVICE].log_bd = new SlicingBlockDevice(block_info[SECONDARY_BLOCK_DEVICE].raw_bd, block_info[SECONDARY_BLOCK_DEVICE].data_offset, block_info[SECONDARY_BLOCK_DEVICE].update_size);
147143
block_info[SCRATCH_BLOCK_DEVICE].log_bd = block_info[SECONDARY_BLOCK_DEVICE].log_bd;
148144
#else
149-
BOOT_LOG_ERR("SDMMCBlockDevice not supported");
145+
BOOT_LOG_ERR("SDMMC");
150146
#endif
151147
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & QSPI_FLASH_FLAG) {
152148
block_info[SECONDARY_BLOCK_DEVICE].log_bd = new SlicingBlockDevice(block_info[SECONDARY_BLOCK_DEVICE].raw_bd, block_info[SECONDARY_BLOCK_DEVICE].data_offset, block_info[SECONDARY_BLOCK_DEVICE].update_size);
153149
block_info[SCRATCH_BLOCK_DEVICE].log_bd = block_info[SECONDARY_BLOCK_DEVICE].log_bd;
154150
} else {
155-
BOOT_LOG_ERR("Cannot configure secondary/scratch raw block device");
151+
BOOT_LOG_ERR("Config");
156152
}
157153
} else
158154

159155
/* Setup MBR device */
160156
if(block_info[SECONDARY_BLOCK_DEVICE].mbr_flag) {
161157
/* If using the same underlying block device configuration must be the same */
162158
if(block_info[SECONDARY_BLOCK_DEVICE].storage_type != block_info[SCRATCH_BLOCK_DEVICE].storage_type) {
163-
BOOT_LOG_ERR("Secondary and Scratch storage type must be the same");
159+
BOOT_LOG_ERR("BD U!S");
164160
}
165161

166162
/* If using the same underlying block device mbr partition must be the same */
167163
if(block_info[SECONDARY_BLOCK_DEVICE].data_offset != block_info[SCRATCH_BLOCK_DEVICE].data_offset) {
168-
BOOT_LOG_ERR("Secondary and Scratch mbr partition must be the same");
164+
BOOT_LOG_ERR("MBR U!S");
169165
}
170166

171167
block_info[SECONDARY_BLOCK_DEVICE].log_bd = new MBRBlockDevice(block_info[SECONDARY_BLOCK_DEVICE].raw_bd, block_info[SECONDARY_BLOCK_DEVICE].data_offset);
@@ -174,7 +170,7 @@ static void initBlockTable(void) {
174170
/* Initialize block device */
175171
err = block_info[SECONDARY_BLOCK_DEVICE].log_bd->init();
176172
if (err) {
177-
BOOT_LOG_ERR("Error initializing common mbr device");
173+
BOOT_LOG_ERR("Init");
178174
}
179175
} else {
180176
block_info[SECONDARY_BLOCK_DEVICE].log_bd = block_info[SECONDARY_BLOCK_DEVICE].raw_bd;
@@ -187,7 +183,7 @@ static void initBlockTable(void) {
187183
#if MCUBOOT_ENVIE_LITTLEFS
188184
block_info[SECONDARY_BLOCK_DEVICE].log_fs = new LittleFileSystem("fs");
189185
#else
190-
BOOT_LOG_ERR("LittleFileSystem not supported");
186+
BOOT_LOG_ERR("LFS");
191187
#endif
192188
} else {
193189
block_info[SECONDARY_BLOCK_DEVICE].log_fs = new FATFileSystem("fs");
@@ -197,7 +193,7 @@ static void initBlockTable(void) {
197193

198194
err = block_info[SECONDARY_BLOCK_DEVICE].log_fs->mount(block_info[SECONDARY_BLOCK_DEVICE].log_bd);
199195
if (err) {
200-
BOOT_LOG_ERR("Error mounting fs on common mbr device");
196+
BOOT_LOG_ERR("Mount");
201197
}
202198

203199
/* Setup FileBlockDevice */
@@ -209,47 +205,47 @@ static void initBlockTable(void) {
209205
/* Declare raw block devices */
210206
if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & INTERNAL_FLASH_FLAG) {
211207
//block_info[SECONDARY_BLOCK_DEVICE].raw_bd = new FlashIAPBlockDevice flashIAP_bd(data_offset, update_size);
212-
BOOT_LOG_ERR("Secondary block device on internal flash not supported");
208+
BOOT_LOG_ERR("U on IAP");
213209
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & SDCARD_FLAG) {
214210
#if MCUBOOT_ENVIE_SDCARD
215211
block_info[SECONDARY_BLOCK_DEVICE].raw_bd = new SDMMCBlockDevice();
216212
#else
217-
BOOT_LOG_ERR("SDMMCBlockDevice not supported");
213+
BOOT_LOG_ERR("SDMMC");
218214
#endif
219215
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & QSPI_FLASH_FLAG) {
220216
block_info[SECONDARY_BLOCK_DEVICE].raw_bd = new QSPIFBlockDevice(PD_11, PD_12, PF_7, PD_13, PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
221217
} else {
222-
BOOT_LOG_ERR("Cannot configure secodary raw block device");
218+
BOOT_LOG_ERR("U config");
223219
}
224220

225221
if (block_info[SCRATCH_BLOCK_DEVICE].raw_type & INTERNAL_FLASH_FLAG) {
226-
BOOT_LOG_ERR("Scratch block device on internal flash not supported");
222+
BOOT_LOG_ERR("S on IAP");
227223
} else if (block_info[SCRATCH_BLOCK_DEVICE].raw_type & SDCARD_FLAG) {
228224
#if MCUBOOT_ENVIE_SDCARD
229225
block_info[SCRATCH_BLOCK_DEVICE].raw_bd = new SDMMCBlockDevice();
230226
#else
231-
BOOT_LOG_ERR("SDMMCBlockDevice not supported");
227+
BOOT_LOG_ERR("SDMMC");
232228
#endif
233229
} else if (block_info[SCRATCH_BLOCK_DEVICE].raw_type & QSPI_FLASH_FLAG) {
234230
block_info[SCRATCH_BLOCK_DEVICE].raw_bd = new QSPIFBlockDevice(PD_11, PD_12, PF_7, PD_13, PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
235231
} else {
236-
BOOT_LOG_ERR("Cannot configure scratchraw block device");
232+
BOOT_LOG_ERR("S config");
237233
}
238234

239235
/* Setup Raw sliced devices */
240236
if(block_info[SECONDARY_BLOCK_DEVICE].raw_flag) {
241237
if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & INTERNAL_FLASH_FLAG) {
242-
BOOT_LOG_ERR("Secondary block device on internal flash not supported");
238+
BOOT_LOG_ERR("U on IAP");
243239
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & SDCARD_FLAG) {
244240
#if MCUBOOT_ENVIE_SDCARD
245241
block_info[SECONDARY_BLOCK_DEVICE].log_bd = new SlicingBlockDevice(block_info[SECONDARY_BLOCK_DEVICE].raw_bd, block_info[SECONDARY_BLOCK_DEVICE].data_offset, block_info[SECONDARY_BLOCK_DEVICE].update_size);
246242
#else
247-
BOOT_LOG_ERR("SDMMCBlockDevice not supported");
243+
BOOT_LOG_ERR("SDMMC");
248244
#endif
249245
} else if (block_info[SECONDARY_BLOCK_DEVICE].raw_type & QSPI_FLASH_FLAG) {
250246
block_info[SECONDARY_BLOCK_DEVICE].log_bd = new SlicingBlockDevice(block_info[SECONDARY_BLOCK_DEVICE].raw_bd, block_info[SECONDARY_BLOCK_DEVICE].data_offset, block_info[SECONDARY_BLOCK_DEVICE].update_size);
251247
} else {
252-
BOOT_LOG_ERR("Cannot configure secodary raw block device");
248+
BOOT_LOG_ERR("U config");
253249
}
254250
} else
255251

@@ -261,7 +257,7 @@ static void initBlockTable(void) {
261257
/* Initialize block device */
262258
int err = block_info[SECONDARY_BLOCK_DEVICE].log_bd->init();
263259
if (err) {
264-
BOOT_LOG_ERR("Error initializing secondary mbr device");
260+
BOOT_LOG_ERR("Init U MBR");
265261
}
266262
} else {
267263
block_info[SECONDARY_BLOCK_DEVICE].log_bd = block_info[SECONDARY_BLOCK_DEVICE].raw_bd;
@@ -270,17 +266,17 @@ static void initBlockTable(void) {
270266
/* Setup Raw sliced devices */
271267
if(block_info[SCRATCH_BLOCK_DEVICE].raw_flag) {
272268
if (block_info[SCRATCH_BLOCK_DEVICE].raw_type & INTERNAL_FLASH_FLAG) {
273-
BOOT_LOG_ERR("Scratch block device on internal flash not supported");
269+
BOOT_LOG_ERR("S on IAP");
274270
} else if (block_info[SCRATCH_BLOCK_DEVICE].raw_type & SDCARD_FLAG) {
275271
#if MCUBOOT_ENVIE_SDCARD
276272
block_info[SCRATCH_BLOCK_DEVICE].log_bd = new SlicingBlockDevice(block_info[SCRATCH_BLOCK_DEVICE].raw_bd, block_info[SCRATCH_BLOCK_DEVICE].data_offset, block_info[SCRATCH_BLOCK_DEVICE].update_size);
277273
#else
278-
BOOT_LOG_ERR("SDMMCBlockDevice not supported");
274+
BOOT_LOG_ERR("SDMMC");
279275
#endif
280276
} else if (block_info[SCRATCH_BLOCK_DEVICE].raw_type & QSPI_FLASH_FLAG) {
281277
block_info[SCRATCH_BLOCK_DEVICE].log_bd = new SlicingBlockDevice(block_info[SCRATCH_BLOCK_DEVICE].raw_bd, block_info[SCRATCH_BLOCK_DEVICE].data_offset, block_info[SCRATCH_BLOCK_DEVICE].update_size);
282278
} else {
283-
BOOT_LOG_ERR("Cannot configure scratch raw block device");
279+
BOOT_LOG_ERR("S config");
284280
}
285281
} else
286282

@@ -292,7 +288,7 @@ static void initBlockTable(void) {
292288
/* Initialize block device */
293289
err = block_info[SCRATCH_BLOCK_DEVICE].log_bd->init();
294290
if (err) {
295-
BOOT_LOG_ERR("Error initializing scratch mbr device");
291+
BOOT_LOG_ERR("Init S MBR");
296292
}
297293
} else {
298294
block_info[SCRATCH_BLOCK_DEVICE].log_bd = block_info[SCRATCH_BLOCK_DEVICE].raw_bd;
@@ -304,15 +300,15 @@ static void initBlockTable(void) {
304300
#if MCUBOOT_ENVIE_LITTLEFS
305301
block_info[SECONDARY_BLOCK_DEVICE].log_fs = new LittleFileSystem("sec");
306302
#else
307-
BOOT_LOG_ERR("LittleFileSystem not supported");
303+
BOOT_LOG_ERR("LFS");
308304
#endif
309305
} else {
310306
block_info[SECONDARY_BLOCK_DEVICE].log_fs = new FATFileSystem("sec");
311307
}
312308

313309
err = block_info[SECONDARY_BLOCK_DEVICE].log_fs->mount(block_info[SECONDARY_BLOCK_DEVICE].log_bd);
314310
if (err) {
315-
BOOT_LOG_ERR("Error mounting secondary fs on common log device");
311+
BOOT_LOG_ERR("Mount U on LOG");
316312
}
317313

318314
/* Setup FileBlockDevice */
@@ -325,15 +321,15 @@ static void initBlockTable(void) {
325321
#if MCUBOOT_ENVIE_LITTLEFS
326322
block_info[SCRATCH_BLOCK_DEVICE].log_fs = new LittleFileSystem("scr");
327323
#else
328-
BOOT_LOG_ERR("LittleFileSystem not supported");
324+
BOOT_LOG_ERR("LFS");
329325
#endif
330326
} else {
331327
block_info[SCRATCH_BLOCK_DEVICE].log_fs = new FATFileSystem("scr");
332328
}
333329

334330
err = block_info[SCRATCH_BLOCK_DEVICE].log_fs->mount(block_info[SCRATCH_BLOCK_DEVICE].log_bd);
335331
if (err) {
336-
BOOT_LOG_ERR("Error mounting scratch fs on common log device");
332+
BOOT_LOG_ERR("Mount S on LOG");
337333
}
338334

339335
/* Setup FileBlockDevice */

0 commit comments

Comments
 (0)