diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-27 17:37:04 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-27 17:37:04 +0000 |
| commit | 99d6349978b2117ed7ca3e0e3d2d84616df323d6 (patch) | |
| tree | c75879012cba1026d3cee3ae7a793d0c525d6cc8 /platforms | |
| parent | 0c5be869ffb7de6ca1107a5804d6d4d536d80e91 (diff) | |
| parent | 1b7b72c0e96856d2b9f73f705787af3426662bcf (diff) | |
| download | qmk_firmware-99d6349978b2117ed7ca3e0e3d2d84616df323d6.tar.gz qmk_firmware-99d6349978b2117ed7ca3e0e3d2d84616df323d6.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h | 2 | ||||
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h b/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h index 6b218f7bd..25113425a 100644 --- a/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h +++ b/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | /* It is chip dependent, the correct number can be looked up here: | 2 | /* It is chip dependent, the correct number can be looked up here: |
| 3 | * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf | 3 | * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf |
| 4 | */ | 4 | */ |
| 5 | #define STM32_BOOTLOADER_ADDRESS 0x1FFFC400 \ No newline at end of file | 5 | #define STM32_BOOTLOADER_ADDRESS 0x1FFFC400 |
diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h b/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h index 4643e9f92..286e1230c 100644 --- a/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h +++ b/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h | |||
| @@ -165,4 +165,4 @@ | |||
| 165 | #define STM32_USB_LOW_POWER_ON_SUSPEND FALSE | 165 | #define STM32_USB_LOW_POWER_ON_SUSPEND FALSE |
| 166 | #define STM32_USB_USB1_LP_IRQ_PRIORITY 3 | 166 | #define STM32_USB_USB1_LP_IRQ_PRIORITY 3 |
| 167 | 167 | ||
| 168 | #endif /* _MCUCONF_H_ */ \ No newline at end of file | 168 | #endif /* _MCUCONF_H_ */ |