Skip to content

Commit

Permalink
Merge pull request dlktdr#177 from aphor/master
Browse files Browse the repository at this point in the history
fix west build time multiple define linker error `log_const_flash`
  • Loading branch information
dlktdr authored Aug 19, 2024
2 parents 6abe38d + e41e825 commit 1711dbb
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions firmware/src/src/soc_flash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ spi_flash_mmap_handle_t handle;

#include "defines.h"

LOG_MODULE_REGISTER(flash);
LOG_MODULE_REGISTER(soc_flash);

#define FALSH_PARTITION storage_partition
#define FLASH_OFFSET FIXED_PARTITION_OFFSET(FALSH_PARTITION)
#define FLASH_SIZE FIXED_PARTITION_SIZE(FALSH_PARTITION)
#define FLASH_DEVICE FIXED_PARTITION_DEVICE(FALSH_PARTITION)
#define FLASH_PARTITION storage_partition
#define FLASH_OFFSET FIXED_PARTITION_OFFSET(FLASH_PARTITION)
#define FLASH_SIZE FIXED_PARTITION_SIZE(FLASH_PARTITION)
#define FLASH_DEVICE FIXED_PARTITION_DEVICE(FLASH_PARTITION)

// Pause for flash write to complete
K_SEM_DEFINE(flashWriteSemaphore, 0, 1);
Expand Down

0 comments on commit 1711dbb

Please sign in to comment.