Skip to content

Commit 2590a04

Browse files
kojo1danielinux
kojo1
authored and
danielinux
committed
move printPartitions to application
1 parent 83dac8e commit 2590a04

3 files changed

Lines changed: 55 additions & 62 deletions

File tree

‎IDE/Renesas/e2studio_CCRX/app_RenesasRX01/src/app_RenesasRX01.c‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,56 @@
2828
#include "hal.h"
2929
#include "wolfboot/wolfboot.h"
3030

31+
static void printPart(uint8_t *part)
32+
{
33+
#ifdef WOLFBOOT_PARTION_VERBOS
34+
uint32_t *v;
35+
int i;
36+
#endif
37+
uint8_t *magic;
38+
uint8_t state;
39+
uint32_t ver;
40+
41+
magic = part;
42+
printf("Magic: %c%c%c%c\n", magic[0], magic[1], magic[2], magic[3]);
43+
ver = wolfBoot_get_blob_version(part);
44+
printf("Version: %02x\n", ver);
45+
state = *(part + WOLFBOOT_PARTITION_SIZE - sizeof(uint32_t) - 1);
46+
printf("Status: %02x\n", state);
47+
magic = part + WOLFBOOT_PARTITION_SIZE - sizeof(uint32_t);
48+
printf("Tail Mgc: %c%c%c%c\n", magic[0], magic[1], magic[2], magic[3]);
49+
50+
#ifdef PARTIION_VERBOS
51+
v = (uint32_t *)part;
52+
for(i = 0; i < 0x100/4; i++) {
53+
if(i % 4 == 0)
54+
print("\n%08x: ", (uint32_t)v+i*4);
55+
print("%08x ", v[i]);
56+
}
57+
58+
print("\n\nImage:");
59+
60+
for( ; i < 0x100/4 + 16; i++) {
61+
if(i % 4 == 0)
62+
print("\n%08x: ", (uint32_t)v+i*4);
63+
print("%08x ", v[i]);
64+
}
65+
66+
print("\n\n");
67+
#endif
68+
69+
}
70+
71+
72+
static void printPartitions(void)
73+
{
74+
printf("\n=== Boot Partition[%08x] ===\n", WOLFBOOT_PARTITION_BOOT_ADDRESS);
75+
printPart((uint8_t*)WOLFBOOT_PARTITION_BOOT_ADDRESS);
76+
printf("\n=== Update Partition[%08x] ===\n", WOLFBOOT_PARTITION_UPDATE_ADDRESS);
77+
printPart((uint8_t*)WOLFBOOT_PARTITION_UPDATE_ADDRESS);
78+
}
79+
80+
3181
void main(void)
3282
{
3383
uint8_t firmware_version = 0;
@@ -38,6 +88,8 @@ void main(void)
3888
printf("| Renesas RX User Application in BOOT partition started by wolfBoot |\n");
3989
printf("| ------------------------------------------------------------------- |\n\n");
4090

91+
printPartitions();
92+
4193
/* The same as: wolfBoot_get_image_version(PART_BOOT); */
4294
firmware_version = wolfBoot_current_firmware_version();
4395

@@ -54,7 +106,7 @@ void main(void)
54106
getchar();
55107

56108
wolfBoot_update_trigger();
57-
printf("Update Triggered\n");
109+
printf("Firmware Update is triggered\n");
58110

59111
/* busy wait */
60112
busy_idle:

‎IDE/Renesas/e2studio_CCRX/wolfBoot/.cproject‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<option id="board.device" value="R5F572NNHxFB"/>
2424
</storageModule>
2525
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
26-
<configuration artifactExtension="abs" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="Debug on hardware" id="com.renesas.cdt.managedbuild.renesas.ccrx.hardwaredebug.configuration.2071075745" name="HardwareDebug" parent="com.renesas.cdt.managedbuild.renesas.ccrx.hardwaredebug.configuration">
26+
<configuration artifactExtension="abs" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="Debug on hardware" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;com.renesas.cdt.managedbuild.renesas.core.RenesasCompilerAssemblerErrorParser;com.renesas.cdt.managedbuild.core.buildRunnerErrorParser" id="com.renesas.cdt.managedbuild.renesas.ccrx.hardwaredebug.configuration.2071075745" name="HardwareDebug" parent="com.renesas.cdt.managedbuild.renesas.ccrx.hardwaredebug.configuration">
2727
<folderInfo id="com.renesas.cdt.managedbuild.renesas.ccrx.hardwaredebug.configuration.2071075745." name="/" resourcePath="">
2828
<toolChain id="com.renesas.cdt.managedbuild.renesas.ccrx.hardwaredebug.toolChain.617269131" name="Renesas CCRX Toolchain" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.hardwaredebug.toolChain">
2929
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE" id="com.renesas.cdt.managedbuild.renesas.ccrx.base.targetPlatform.1518036169" osList="win32" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.base.targetPlatform"/>
@@ -78,11 +78,9 @@
7878
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.define.2058710491" name="プリプロセッサ・マクロの定義 (-define)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.define" useByScannerDiscovery="false" valueType="definedSymbols">
7979
<listOptionValue builtIn="false" value="__WOLFBOOT"/>
8080
<listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
81-
<listOptionValue builtIn="false" value="WOLFBOOT_PARTIION_INFO"/>
82-
<listOptionValue builtIn="false" value="PRINTF_ENABLED"/>
8381
</option>
8482
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.preInclude.303954707" name="コンパイル単位の先頭にインクルードするファイル (-preinclude)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.preInclude" useByScannerDiscovery="false" valueType="stringList">
85-
<listOptionValue builtIn="false" value="../../../../../include/user_settings.h"/>
83+
<listOptionValue builtIn="false" value="../../include/user_settings.h"/>
8684
</option>
8785
<option id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.402664598" name="最適化レベル (-optimize)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.level0" valueType="enumerated"/>
8886
<inputType id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.gcc.inputType.1343195127" name="Compiler Input C" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.gcc.inputType"/>

‎src/loader.c‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -32,60 +32,6 @@ static volatile const uint32_t __attribute__((used)) wolfboot_version = WOLFBOOT
3232
extern void (** const IV_RAM)(void);
3333
#endif
3434

35-
#if defined(WOLFBOOT_PARTION_INFO) && defined(PRINTF_ENABLED)
36-
37-
#include <printf.h>
38-
39-
static void printPart(uint8_t *part)
40-
{
41-
#ifdef WOLFBOOT_PARTION_VERBOS
42-
uint32_t *v;
43-
int i;
44-
#endif
45-
uint8_t *magic;
46-
uint8_t state;
47-
uint32_t ver;
48-
49-
magic = part;
50-
wolfBoot_printf("Magic: %c%c%c%c\n", magic[0], magic[1], magic[2], magic[3]);
51-
ver = wolfBoot_get_blob_version(part);
52-
wolfBoot_printf("Version: %02x\n", ver);
53-
state = *(part + WOLFBOOT_PARTITION_SIZE - sizeof(uint32_t) - 1);
54-
wolfBoot_printf("Status: %02x\n", state);
55-
magic = part + WOLFBOOT_PARTITION_SIZE - sizeof(uint32_t);
56-
wolfBoot_printf("Tail Mgc: %c%c%c%c\n", magic[0], magic[1], magic[2], magic[3]);
57-
58-
#ifdef WOLFBOOT_PARTIION_VERBOS
59-
v = (uint32_t *)part;
60-
for(i = 0; i < 0x100/4; i++) {
61-
if(i % 4 == 0)
62-
wolfBoot_printf("\n%08x: ", (uint32_t)v+i*4);
63-
wolfBoot_printf("%08x ", v[i]);
64-
}
65-
66-
wolfBoot_printf("\n\nImage:");
67-
68-
for( ; i < 0x100/4 + 16; i++) {
69-
if(i % 4 == 0)
70-
wolfBoot_printf("\n%08x: ", (uint32_t)v+i*4);
71-
wolfBoot_printf("%08x ", v[i]);
72-
}
73-
74-
wolfBoot_printf("\n\n");
75-
#endif
76-
77-
}
78-
79-
80-
static void printPartitions(void)
81-
{
82-
wolfBoot_printf("\n=== Boot Partition[%08x] ===\n", WOLFBOOT_PARTITION_BOOT_ADDRESS);
83-
printPart((uint8_t*)WOLFBOOT_PARTITION_BOOT_ADDRESS);
84-
wolfBoot_printf("\n=== Update Partition[%08x] ===\n", WOLFBOOT_PARTITION_UPDATE_ADDRESS);
85-
printPart((uint8_t*)WOLFBOOT_PARTITION_UPDATE_ADDRESS);
86-
}
87-
#endif
88-
8935
#ifdef PLATFORM_sim
9036
extern char **main_argv;
9137
extern int main_argc;
@@ -114,9 +60,6 @@ int main(void)
11460
wolfBoot_tpm2_init();
11561
#endif
11662

117-
#if defined(WOLFBOOT_PARTION_INFO) && defined(PRINTF_ENABLED)
118-
printPartitions();
119-
#endif
12063
wolfBoot_start();
12164

12265
/* wolfBoot_start should never return. */

0 commit comments

Comments
 (0)