Minor cleanups.

Author: dgarske

config/examples/stm32wb-tpm.config

@@ -0,0 +1,10 @@
+TARGET=stm32wb
+SIGN=ECC256
+WOLFBOOT_SECTOR_SIZE?=0x20000
+WOLFBOOT_PARTITION_SIZE?=0x60000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x00000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x60000
+NVM_FLASH_WRITEONCE=1
+PKA=0
+WOLFTPM=1

config/examples/stm32wb.config

@@ -1,10 +1,9 @@
 TARGET=stm32wb
 SIGN=ECC256
-WOLFBOOT_SECTOR_SIZE?=0x1000
-WOLFBOOT_PARTITION_SIZE?=0x20000
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x28000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x48000
+WOLFBOOT_SECTOR_SIZE?=0x20000
+WOLFBOOT_PARTITION_SIZE?=0x60000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x00000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x60000
 NVM_FLASH_WRITEONCE=1
-PKA=0
-WOLFTPM=1
+PKA=1

hal/spi/spi_drv_stm32.c

@@ -1,4 +1,4 @@
-/* spi_drv.h
+/* spi_drv_stm32.c
  *
  * Driver for the SPI back-end of the SPI_FLASH module.
  *

hal/spi/spi_drv_stm32.h

@@ -1,3 +1,20 @@
+/* spi_drv_stm32.h
+ *
+ * wolfBoot is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfBoot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
 #ifndef SPI_DRV_STM32_H_INCLUDED
 #define SPI_DRV_STM32_H_INCLUDED
 #include <stdint.h>
@@ -13,16 +30,15 @@
 #define CEN_GPIOE (1 << 4)
 
 #ifdef PLATFORM_stm32f4
-#define APB2_CLOCK_ER           (*(volatile uint32_t *)(0x40023844))
-#define APB2_CLOCK_RST          (*(volatile uint32_t *)(0x40023824))
-#define CLOCK_SPEED (168000000)
+#define APB2_CLOCK_ER     (*(volatile uint32_t *)(0x40023844))
+#define APB2_CLOCK_RST    (*(volatile uint32_t *)(0x40023824))
 #define RCC_GPIO_CLOCK_ER (*(volatile uint32_t *)(0x40023830))
 #define GPIOA_BASE (0x40020000)
 #define GPIOB_BASE (0x40020400)
 #define GPIOC_BASE (0x40020800)
 #define GPIOD_BASE (0x40020C00)
 #define GPIOE_BASE (0x40021000)
-#define SPI_GPIO GPIOB_BASE
+#define SPI_GPIO    GPIOB_BASE
 #define SPI_CS_GPIO GPIOE_BASE
 #define SPI_CS_FLASH 1 /* Flash CS connected to GPIOE1 */
 #define SPI_CS_TPM   0 /* TPM CS connected to GPIOE0 */
@@ -33,16 +49,16 @@
 #endif
 
 #ifdef PLATFORM_stm32wb
-#define APB2_CLOCK_ER           (*(volatile uint32_t *)(0x58000060))
-#define APB2_CLOCK_RST          (*(volatile uint32_t *)(0x58000040))
-#define SPI_GPIO GPIOA_BASE
+#define APB2_CLOCK_ER     (*(volatile uint32_t *)(0x58000060))
+#define APB2_CLOCK_RST    (*(volatile uint32_t *)(0x58000040))
 #define RCC_GPIO_CLOCK_ER (*(volatile uint32_t *)(0x5800004C))
 #define GPIOA_BASE (0x48000000)
 #define GPIOB_BASE (0x48000400)
 #define GPIOC_BASE (0x48000800)
 #define GPIOD_BASE (0x48000C00)
 
 /* STM32WB55 NUCLEO: CN9: D13=SCK, D12=MISO, D11=MOSI, FLASHCS=D10, TPMCS=D9 */
+#define SPI_GPIO    GPIOA_BASE
 #define SPI_CS_GPIO GPIOA_BASE
 #define SPI_CS_FLASH 4 /* Flash CS connected to GPIOA4 */
 #define SPI_CS_TPM   9 /* TPM CS connected to GPIOA9 */
@@ -52,7 +68,7 @@
 #define SPI1_MOSI_PIN  7 /* SPI_MOSI PA7  */
 #endif
 
-#define SPI_PIO_BASE SPI_GPIO
+#define SPI_PIO_BASE    SPI_GPIO
 #define SPI_CS_PIO_BASE SPI_CS_GPIO
 
 #if (SPI_GPIO == GPIOA_BASE)

hal/spi/spi_drv_stm32f4.c

@@ -211,7 +211,7 @@ static int image_hash(struct wolfBoot_image *img, uint8_t *hash)
     if (stored_sha_len != SHA256_DIGEST_SIZE)
         return -1;
     wc_InitSha256(&sha256_ctx);
-    end_sha = stored_sha - 4;
+    end_sha = stored_sha - (2 * sizeof(uint16_t)); /* Subtract 2 Type + 2 Len */
     while (p < end_sha) {
         blksz = SHA256_BLOCK_SIZE;
         if (end_sha - p < blksz)
@@ -364,7 +364,7 @@ static int image_hash(struct wolfBoot_image *img, uint8_t *hashBuf)
         (const byte*)gUsageAuth, sizeof(gUsageAuth)-1);
     if (rc != 0)
         return -1;
-    end_sha = stored_sha - 4;
+    end_sha = stored_sha - (2 * sizeof(uint16_t)); /* Subtract 2 Type + 2 Len */
     while (p < end_sha) {
         blksz = SHA256_BLOCK_SIZE;
         if (end_sha - p < blksz)