Update to add verbose unsealing during wolfboot

wolfSSL · May 22, 2023 · b64ee37 · b64ee37
1 parent fc41632
commit b64ee37
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/config/examples/nxp-ls1028a.config b/config/examples/nxp-ls1028a.config
@@ -49,10 +49,6 @@ WOLFBOOT_PARTITION_SIZE?=0x20000
 
 # Location in Flash for Application Partition
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20040000
-<<<<<<< HEAD
-=======
-#WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x21000000
->>>>>>> 38cfa78 (Initial support for LS1028A. Booting into OCRAM app.)
 
 # Load Partition to RAM Address
 WOLFBOOT_LOAD_ADDRESS?=0x18020100