Remove IMAGE_HDR_SIZE from configuration files

wolfSSL · Mar 23, 2022 · fd2d2b0 · fd2d2b0
1 parent a56abdc
commit fd2d2b0
Show file tree

Hide file tree

Showing 24 changed files with 4 additions and 26 deletions.
diff --git a/config/examples/cypsoc6.config b/config/examples/cypsoc6.config
@@ -20,7 +20,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=0
 WOLFTPM?=0
 WOLFBOOT_PARTITION_SIZE?=0x80000

diff --git a/config/examples/hifive1.config b/config/examples/hifive1.config
@@ -14,7 +14,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=1
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x80000
 WOLFBOOT_SECTOR_SIZE?=0x1000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20020000

diff --git a/config/examples/imx-rt1060.config b/config/examples/imx-rt1060.config
@@ -20,7 +20,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=0
 WOLFBOOT_PARTITION_SIZE?=0x20000
 WOLFBOOT_SECTOR_SIZE?=0x1000

diff --git a/config/examples/kinetis-k82f.config b/config/examples/kinetis-k82f.config
@@ -19,7 +19,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=1
 WOLFBOOT_PARTITION_SIZE?=0x7A000
 WOLFBOOT_SECTOR_SIZE?=0x1000

diff --git a/config/examples/lpc54606j512.config b/config/examples/lpc54606j512.config
@@ -19,7 +19,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=1
 WOLFBOOT_PARTITION_SIZE?=0x38000
 WOLFBOOT_SECTOR_SIZE?=0x8000

diff --git a/config/examples/nrf52840.config b/config/examples/nrf52840.config
@@ -16,7 +16,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=0
 WOLFBOOT_PARTITION_SIZE?=0x40000
 WOLFBOOT_SECTOR_SIZE?=0x1000

diff --git a/config/examples/stm32f4-small-blocks-uart-update.config b/config/examples/stm32f4-small-blocks-uart-update.config
@@ -22,7 +22,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=1
 WOLFTPM?=0
 WOLFBOOT_PARTITION_SIZE?=0x4000

diff --git a/config/examples/stm32f7-dualbank.config b/config/examples/stm32f7-dualbank.config
@@ -15,7 +15,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=1
 DUALBANK_SWAP?=1
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x80000
 WOLFBOOT_SECTOR_SIZE?=0x20000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8020000

diff --git a/config/examples/stm32f7.config b/config/examples/stm32f7.config
@@ -14,7 +14,6 @@ WOLFBOOT_VERSION?=1
 V?=0
 SPMATH?=1
 RAM_CODE?=1
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x60000
 WOLFBOOT_SECTOR_SIZE?=0x20000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8020000

diff --git a/config/examples/stm32g0.config b/config/examples/stm32g0.config
@@ -15,7 +15,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=1
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0xB000
 WOLFBOOT_SECTOR_SIZE?=0x800
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08008000

diff --git a/config/examples/stm32h7.config b/config/examples/stm32h7.config
@@ -15,7 +15,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0xD0000
 WOLFBOOT_SECTOR_SIZE?=0x20000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8020000

diff --git a/config/examples/stm32l0.config b/config/examples/stm32l0.config
@@ -16,7 +16,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x10000
 WOLFBOOT_SECTOR_SIZE?=0x1000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8000

diff --git a/config/examples/stm32l5-nonsecure-dualbank.config b/config/examples/stm32l5-nonsecure-dualbank.config
@@ -18,7 +18,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=1
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x38000
 WOLFBOOT_SECTOR_SIZE?=0x800
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08008000

diff --git a/config/examples/stm32l5.config b/config/examples/stm32l5.config
@@ -18,7 +18,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x1F800
 WOLFBOOT_SECTOR_SIZE?=0x800
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08040000

diff --git a/config/examples/stm32u5-nonsecure-dualbank.config b/config/examples/stm32u5-nonsecure-dualbank.config
@@ -18,9 +18,8 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=1
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x38000
 WOLFBOOT_SECTOR_SIZE?=0x2000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08008000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x08108000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xFFFFFFFF
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xFFFFFFFF
diff --git a/config/examples/stm32u5.config b/config/examples/stm32u5.config
@@ -18,7 +18,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x20000
 WOLFBOOT_SECTOR_SIZE?=0x2000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08100000

diff --git a/config/examples/stm32wb-pka-1mb.config b/config/examples/stm32wb-pka-1mb.config
@@ -7,4 +7,4 @@ WOLFBOOT_PARTITION_BOOT_ADDRESS=0x08008000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x08083800
 WOLFBOOT_PARTITION_SWAP_ADDRESS=0x080FF000
 NVM_FLASH_WRITEONCE=1
-PKA=1
+PKA=1
diff --git a/config/examples/stm32wb-uart-flash-encryption-aes128.config b/config/examples/stm32wb-uart-flash-encryption-aes128.config
@@ -18,7 +18,6 @@ NO_MPU?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=0
 ENCRYPT=1
 ENCRYPT_WITH_AES128=1

diff --git a/config/examples/stm32wb-uart-flash-encryption-aes256.config b/config/examples/stm32wb-uart-flash-encryption-aes256.config
@@ -18,7 +18,6 @@ NO_MPU?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=0
 ENCRYPT=1
 ENCRYPT_WITH_AES256=1

diff --git a/config/examples/stm32wb-uart-flash-encryption.config b/config/examples/stm32wb-uart-flash-encryption.config
@@ -18,7 +18,6 @@ NO_MPU?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=0
 ENCRYPT=1
 ENCRYPT_WITH_CHACHA=1

diff --git a/config/examples/stm32wb.config b/config/examples/stm32wb.config
@@ -7,4 +7,4 @@ WOLFBOOT_PARTITION_BOOT_ADDRESS=0x08008000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x08028000
 WOLFBOOT_PARTITION_SWAP_ADDRESS=0x08048000
 NVM_FLASH_WRITEONCE=1
-PKA=0
+PKA=0
diff --git a/config/examples/t2080.config b/config/examples/t2080.config
@@ -18,7 +18,6 @@ NO_MPU?=0
 SPMATH?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=1
 WOLFTPM?=0
 WOLFBOOT_ORIGIN?=0xEFFF0000

diff --git a/config/examples/ti-tms570lc435.config b/config/examples/ti-tms570lc435.config
@@ -16,7 +16,6 @@ V?=0
 SPMATH?=1
 RAM_CODE?=1
 DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 PKA?=0
 # sector size setup to match the largest sector size of heterogeneous F021 sectors
 # wolfBoot 0x000000-0x040000
@@ -28,4 +27,4 @@ WOLFBOOT_SECTOR_SIZE?=0x040000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x040000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x200000
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x3c0000
-OPTIMIZATION_LEVEL?=2
+OPTIMIZATION_LEVEL?=2
diff --git a/config/examples/x86_64_efi.config b/config/examples/x86_64_efi.config
@@ -3,7 +3,6 @@ TARGET=x86_64_efi
 WOLFBOOT_SMALL_STACK=1
 SIGN?=ED25519
 HASH?=SHA256
-IMAGE_HEADER_SIZE?=0x100
 DEBUG=1
 SPMATH=0
 # required for keytools