diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-02-02 15:04:37 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 15:04:37 +1100 |
| commit | e22efc037a7e4da17f1051d5053768e40683da68 (patch) | |
| tree | d58924ef9de401b4e97ba46113ee42874a1593be /platforms/arm_atsam | |
| parent | da5cb5fd6f91c2f7aebbcebbf211252c51d9b4a5 (diff) | |
Don't make EEPROM size assumptions with dynamic keymaps. (#16054)
* Don't make EEPROM size assumptions with dynamic keymaps.
* Add support for checking against emulated flash, error out if someone attempts to build a board without specifying EEPROM size.
* Reorder defines so that MCU is considered last.
* Refactor EEPROM definitions for simplicity.
* Fix max sizing of kabedon/kabedon980.
* Fix max sizing of mechlovin/olly/jf.
* Fix unit tests.
* Review comments, add messages with values during build failures.
Diffstat (limited to 'platforms/arm_atsam')
| -rw-r--r-- | platforms/arm_atsam/eeprom_samd.c (renamed from platforms/arm_atsam/eeprom.c) | 6 | ||||
| -rwxr-xr-x | platforms/arm_atsam/eeprom_samd.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/platforms/arm_atsam/eeprom.c b/platforms/arm_atsam/eeprom_samd.c index ff1a692623..beaffeec30 100644 --- a/platforms/arm_atsam/eeprom.c +++ b/platforms/arm_atsam/eeprom_samd.c @@ -18,11 +18,7 @@ #include "samd51j18a.h" #include "core_cm4.h" #include "component/nvmctrl.h" - -#ifndef EEPROM_SIZE -# include "eeconfig.h" -# define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO -#endif +#include "eeprom_samd.h" #ifndef MAX # define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) diff --git a/platforms/arm_atsam/eeprom_samd.h b/platforms/arm_atsam/eeprom_samd.h new file mode 100755 index 0000000000..7dbff9bfa1 --- /dev/null +++ b/platforms/arm_atsam/eeprom_samd.h @@ -0,0 +1,8 @@ +// Copyright 2022 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#ifndef EEPROM_SIZE +# include "eeconfig.h" +# define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO +#endif |