Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Leftover early initialisation conversions #11615

Merged
merged 5 commits into from
Jan 19, 2021
Merged

Leftover early initialisation conversions #11615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0ce712
jm60
tzarc Jan 19, 2021
1c5230f
ergodox_stm32
tzarc Jan 19, 2021
4df8d06
F042 bootloader jumps.
tzarc Jan 19, 2021
485706a
xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072.
tzarc Jan 19, 2021
ec946c6
matrix/m20add, matrix/noah
tzarc Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion keyboards/chavdai40/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include "config_common.h"

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE

/* USB Device descriptor parameter */
#define VENDOR_ID 0x16D0
#define PRODUCT_ID 0x0F95
Expand All @@ -33,7 +35,7 @@
#define MATRIX_ROWS 4
#define MATRIX_COLS 13


#define MATRIX_ROW_PINS { A0, A15, B5, B6 }
#define MATRIX_COL_PINS { B8, B4, B3, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
#define UNUSED_PINS
Expand Down
4 changes: 3 additions & 1 deletion keyboards/chavdai40/rev2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include "config_common.h"

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE

/* USB Device descriptor parameter */
#define VENDOR_ID 0x16D0
#define PRODUCT_ID 0x0F95
Expand All @@ -33,7 +35,7 @@
#define MATRIX_ROWS 4
#define MATRIX_COLS 13


#define MATRIX_ROW_PINS { A0, A15, B5, B6 }
#define MATRIX_COL_PINS { B7, B4, B3, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
#define UNUSED_PINS
Expand Down
2 changes: 0 additions & 2 deletions keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,4 @@ void __early_init(void) {
* Board-specific initialization code.
*/
void boardInit(void) {
AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;

}
4 changes: 4 additions & 0 deletions keyboards/ergodox_stm32/ergodox_stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ extern inline void ergodox_led_all_off(void);
volatile int mcp23017_status = 0x20;
uint8_t i2c_initializied = 0;

void board_init(void) {
AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
}

void matrix_init_kb(void)
{
// Init LED Ports
Expand Down
2 changes: 0 additions & 2 deletions keyboards/jm60/boards/JM60_BOARD/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,4 @@ void __early_init(void) {
* Board-specific initialization code.
*/
void boardInit(void) {
AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;

}
4 changes: 4 additions & 0 deletions keyboards/jm60/jm60.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "jm60.h"

void board_init(void) {
AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
}
2 changes: 0 additions & 2 deletions keyboards/matrix/m20add/boards/m20add_bd/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ static void stm32_gpio_init(void) {
* else.
*/
void __early_init(void) {
extern void enter_bootloader_mode_if_requested(void);
enter_bootloader_mode_if_requested();

stm32_gpio_init();
stm32_clock_init();
Expand Down
4 changes: 2 additions & 2 deletions keyboards/matrix/m20add/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#pragma once

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

/* USB Device descriptor parameter */
#define VENDOR_ID 0x4D58 // MX
#define PRODUCT_ID 0x20AD // 8XV2.0 Additional
Expand Down Expand Up @@ -94,5 +96,3 @@
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_COUNT 1
#define DRIVER_LED_TOTAL RGBLED_NUM

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE // disable jump to system bootloader
2 changes: 0 additions & 2 deletions keyboards/matrix/noah/boards/noah_bd/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ static void stm32_gpio_init(void) {
* else.
*/
void __early_init(void) {
extern void enter_bootloader_mode_if_requested(void);
enter_bootloader_mode_if_requested();

stm32_gpio_init();
stm32_clock_init();
Expand Down
2 changes: 2 additions & 0 deletions keyboards/matrix/noah/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#pragma once

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

/* USB Device descriptor parameter */
#define VENDOR_ID 0x4D58 // MX
#define PRODUCT_ID 0x0065 // noah 65
Expand Down
2 changes: 2 additions & 0 deletions keyboards/polilla/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "config_common.h"

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

/* USB Device descriptor parameter */
#define VENDOR_ID 0x6166 // af
#define PRODUCT_ID 0x0010
Expand Down
2 changes: 2 additions & 0 deletions keyboards/xiaomi/mk02/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0B91
Expand Down
4 changes: 0 additions & 4 deletions platforms/chibios/GENERIC_STM32_F042X6/board/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,12 @@ static void stm32_gpio_init(void) {
/* Driver exported functions. */
/*===========================================================================*/

__attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}

/**
* @brief Early initialization code.
* @details GPIO ports and system clocks are initialized before everything
* else.
*/
void __early_init(void) {
enter_bootloader_mode_if_requested();

stm32_gpio_init();
stm32_clock_init();
}
Expand Down