From 7d0ca766680c55fd24cf777c03e0bd49caea46d1 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Fri, 3 Jun 2022 10:30:14 +0200 Subject: [PATCH 1/3] chore: reorder some entries Signed-off-by: Frederic Pillon --- boards.txt | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/boards.txt b/boards.txt index f4a1cdb96b..466688f681 100644 --- a/boards.txt +++ b/boards.txt @@ -3399,30 +3399,6 @@ GenG0.menu.pnum.GENERIC_G031Y8YX.build.board=GENERIC_G031Y8YX GenG0.menu.pnum.GENERIC_G031Y8YX.build.product_line=STM32G031xx GenG0.menu.pnum.GENERIC_G031Y8YX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y -# Generic G041F6Px -GenG0.menu.pnum.GENERIC_G041F6PX=Generic G041F6Px -GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_size=32768 -GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_data_size=8192 -GenG0.menu.pnum.GENERIC_G041F6PX.build.board=GENERIC_G041F6PX -GenG0.menu.pnum.GENERIC_G041F6PX.build.product_line=STM32G041xx -GenG0.menu.pnum.GENERIC_G041F6PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y - -# Generic G041F8Px -GenG0.menu.pnum.GENERIC_G041F8PX=Generic G041F8Px -GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_size=65536 -GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_data_size=8192 -GenG0.menu.pnum.GENERIC_G041F8PX.build.board=GENERIC_G041F8PX -GenG0.menu.pnum.GENERIC_G041F8PX.build.product_line=STM32G041xx -GenG0.menu.pnum.GENERIC_G041F8PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y - -# Generic G041Y8Yx -GenG0.menu.pnum.GENERIC_G041Y8YX=Generic G041Y8Yx -GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_size=65536 -GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_data_size=8192 -GenG0.menu.pnum.GENERIC_G041Y8YX.build.board=GENERIC_G041Y8YX -GenG0.menu.pnum.GENERIC_G041Y8YX.build.product_line=STM32G041xx -GenG0.menu.pnum.GENERIC_G041Y8YX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y - # Generic G031K4Tx GenG0.menu.pnum.GENERIC_G031K4TX=Generic G031K4Tx GenG0.menu.pnum.GENERIC_G031K4TX.upload.maximum_size=16384 @@ -3471,6 +3447,22 @@ GenG0.menu.pnum.GENERIC_G031K8UX.build.board=GENERIC_G031K8UX GenG0.menu.pnum.GENERIC_G031K8UX.build.product_line=STM32G031xx GenG0.menu.pnum.GENERIC_G031K8UX.build.variant=STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U) +# Generic G041F6Px +GenG0.menu.pnum.GENERIC_G041F6PX=Generic G041F6Px +GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_size=32768 +GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_data_size=8192 +GenG0.menu.pnum.GENERIC_G041F6PX.build.board=GENERIC_G041F6PX +GenG0.menu.pnum.GENERIC_G041F6PX.build.product_line=STM32G041xx +GenG0.menu.pnum.GENERIC_G041F6PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y + +# Generic G041F8Px +GenG0.menu.pnum.GENERIC_G041F8PX=Generic G041F8Px +GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_size=65536 +GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_data_size=8192 +GenG0.menu.pnum.GENERIC_G041F8PX.build.board=GENERIC_G041F8PX +GenG0.menu.pnum.GENERIC_G041F8PX.build.product_line=STM32G041xx +GenG0.menu.pnum.GENERIC_G041F8PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y + # Generic G041J6Mx GenG0.menu.pnum.GENERIC_G041J6MX=Generic G041J6Mx GenG0.menu.pnum.GENERIC_G041J6MX.upload.maximum_size=32768 @@ -3511,6 +3503,14 @@ GenG0.menu.pnum.GENERIC_G041K8UX.build.board=GENERIC_G041K8UX GenG0.menu.pnum.GENERIC_G041K8UX.build.product_line=STM32G041xx GenG0.menu.pnum.GENERIC_G041K8UX.build.variant=STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U) +# Generic G041Y8Yx +GenG0.menu.pnum.GENERIC_G041Y8YX=Generic G041Y8Yx +GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_size=65536 +GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_data_size=8192 +GenG0.menu.pnum.GENERIC_G041Y8YX.build.board=GENERIC_G041Y8YX +GenG0.menu.pnum.GENERIC_G041Y8YX.build.product_line=STM32G041xx +GenG0.menu.pnum.GENERIC_G041Y8YX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y + # Generic G070CBTx GenG0.menu.pnum.GENERIC_G070CBTX=Generic G070CBTx GenG0.menu.pnum.GENERIC_G070CBTX.upload.maximum_size=131072 From f466df830550505fa85b5f84fdc27fab21dd908e Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Fri, 3 Jun 2022 11:00:59 +0200 Subject: [PATCH 2/3] variant: add generic G071C(6-8-B)(T-U) and G081CB(T-U) Since #1690, generic should be added Signed-off-by: Frederic Pillon --- README.md | 3 + boards.txt | 64 +++++++++++++++++++ .../generic_clock.c | 32 +++++++++- 3 files changed, 97 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8358257ba1..acb3266614 100644 --- a/README.md +++ b/README.md @@ -314,9 +314,12 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d | :yellow_heart: | STM32G070CB | Generic Board | **2.3.0** | | | :yellow_heart: | STM32G070KB | Generic Board | **2.3.0** | | | :yellow_heart: | STM32G070RB | Generic Board | **2.3.0** | | +| :yellow_heart: | STM32G071C6T
STM32G071C8T
STM32G071CBT | Generic Board | **2.3.0** | | +| :yellow_heart: | STM32G071C6U
STM32G071C8U
STM32G071CBU | Generic Board | **2.3.0** | | | :yellow_heart: | STM32G071G8UxN | Generic Board | **2.3.0** | | | :yellow_heart: | STM32G071GBUxN | Generic Board | **2.3.0** | | | :green_heart: | STM32G071R6
STM32G071R8
STM32G071RB | Generic Board | *2.0.0* | | +| :yellow_heart: | STM32G081CBT
STM32G081CBU | Generic Board | **2.3.0** | | | :yellow_heart: | STM32G081GBUxN | Generic Board | **2.3.0** | | | :green_heart: | STM32G081RB | Generic Board | *2.0.0* | | | :green_heart: | STM32G0B1RB
STM32G0B1RC
STM32G0B1RE | Generic Board | *2.1.0* | | diff --git a/boards.txt b/boards.txt index 466688f681..6fa26ebe41 100644 --- a/boards.txt +++ b/boards.txt @@ -3535,6 +3535,54 @@ GenG0.menu.pnum.GENERIC_G070RBTX.build.board=GENERIC_G070RBTX GenG0.menu.pnum.GENERIC_G070RBTX.build.product_line=STM32G070xx GenG0.menu.pnum.GENERIC_G070RBTX.build.variant=STM32G0xx/G070RBT +# Generic G071C6Tx +GenG0.menu.pnum.GENERIC_G071C6TX=Generic G071C6Tx +GenG0.menu.pnum.GENERIC_G071C6TX.upload.maximum_size=32768 +GenG0.menu.pnum.GENERIC_G071C6TX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G071C6TX.build.board=GENERIC_G071C6TX +GenG0.menu.pnum.GENERIC_G071C6TX.build.product_line=STM32G071xx +GenG0.menu.pnum.GENERIC_G071C6TX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + +# Generic G071C8Tx +GenG0.menu.pnum.GENERIC_G071C8TX=Generic G071C8Tx +GenG0.menu.pnum.GENERIC_G071C8TX.upload.maximum_size=65536 +GenG0.menu.pnum.GENERIC_G071C8TX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G071C8TX.build.board=GENERIC_G071C8TX +GenG0.menu.pnum.GENERIC_G071C8TX.build.product_line=STM32G071xx +GenG0.menu.pnum.GENERIC_G071C8TX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + +# Generic G071CBTx +GenG0.menu.pnum.GENERIC_G071CBTX=Generic G071CBTx +GenG0.menu.pnum.GENERIC_G071CBTX.upload.maximum_size=131072 +GenG0.menu.pnum.GENERIC_G071CBTX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G071CBTX.build.board=GENERIC_G071CBTX +GenG0.menu.pnum.GENERIC_G071CBTX.build.product_line=STM32G071xx +GenG0.menu.pnum.GENERIC_G071CBTX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + +# Generic G071C6Ux +GenG0.menu.pnum.GENERIC_G071C6UX=Generic G071C6Ux +GenG0.menu.pnum.GENERIC_G071C6UX.upload.maximum_size=32768 +GenG0.menu.pnum.GENERIC_G071C6UX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G071C6UX.build.board=GENERIC_G071C6UX +GenG0.menu.pnum.GENERIC_G071C6UX.build.product_line=STM32G071xx +GenG0.menu.pnum.GENERIC_G071C6UX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + +# Generic G071C8Ux +GenG0.menu.pnum.GENERIC_G071C8UX=Generic G071C8Ux +GenG0.menu.pnum.GENERIC_G071C8UX.upload.maximum_size=65536 +GenG0.menu.pnum.GENERIC_G071C8UX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G071C8UX.build.board=GENERIC_G071C8UX +GenG0.menu.pnum.GENERIC_G071C8UX.build.product_line=STM32G071xx +GenG0.menu.pnum.GENERIC_G071C8UX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + +# Generic G071CBUx +GenG0.menu.pnum.GENERIC_G071CBUX=Generic G071CBUx +GenG0.menu.pnum.GENERIC_G071CBUX.upload.maximum_size=131072 +GenG0.menu.pnum.GENERIC_G071CBUX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G071CBUX.build.board=GENERIC_G071CBUX +GenG0.menu.pnum.GENERIC_G071CBUX.build.product_line=STM32G071xx +GenG0.menu.pnum.GENERIC_G071CBUX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + # Generic G071G8UxN GenG0.menu.pnum.GENERIC_G071G8UXN=Generic G071G8UxN GenG0.menu.pnum.GENERIC_G071G8UXN.upload.maximum_size=65536 @@ -3583,6 +3631,22 @@ GenG0.menu.pnum.GENERIC_G071RBIX.build.board=GENERIC_G071RBIX GenG0.menu.pnum.GENERIC_G071RBIX.build.product_line=STM32G071xx GenG0.menu.pnum.GENERIC_G071RBIX.build.variant=STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T) +# Generic G081CBTx +GenG0.menu.pnum.GENERIC_G081CBTX=Generic G081CBTx +GenG0.menu.pnum.GENERIC_G081CBTX.upload.maximum_size=131072 +GenG0.menu.pnum.GENERIC_G081CBTX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G081CBTX.build.board=GENERIC_G081CBTX +GenG0.menu.pnum.GENERIC_G081CBTX.build.product_line=STM32G081xx +GenG0.menu.pnum.GENERIC_G081CBTX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + +# Generic G081CBUx +GenG0.menu.pnum.GENERIC_G081CBUX=Generic G081CBUx +GenG0.menu.pnum.GENERIC_G081CBUX.upload.maximum_size=131072 +GenG0.menu.pnum.GENERIC_G081CBUX.upload.maximum_data_size=36864 +GenG0.menu.pnum.GENERIC_G081CBUX.build.board=GENERIC_G081CBUX +GenG0.menu.pnum.GENERIC_G081CBUX.build.product_line=STM32G081xx +GenG0.menu.pnum.GENERIC_G081CBUX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U) + # Generic G081GBUxN GenG0.menu.pnum.GENERIC_G081GBUXN=Generic G081GBUxN GenG0.menu.pnum.GENERIC_G081GBUXN.upload.maximum_size=131072 diff --git a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/generic_clock.c b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/generic_clock.c index 3d4abd0700..0feb972aee 100644 --- a/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/generic_clock.c +++ b/variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/generic_clock.c @@ -23,8 +23,36 @@ */ WEAK void SystemClock_Config(void) { - /* SystemClock_Config can be generated by STM32CubeMX */ -#warning "SystemClock_Config() is empty. Default clock at reset is used." + RCC_OscInitTypeDef RCC_OscInitStruct = {}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {}; + + /* Configure the main internal regulator output voltage */ + HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1); + /* Initializes the CPU, AHB and APB busses clocks */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.HSIDiv = RCC_HSI_DIV1; + RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI; + RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1; + RCC_OscInitStruct.PLL.PLLN = 8; + RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2; + RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { + Error_Handler(); + } + /* Initializes the CPU, AHB and APB busses clocks */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK + | RCC_CLOCKTYPE_PCLK1; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) { + Error_Handler(); + } } #endif /* ARDUINO_GENERIC_* */ From a1a22cbb864fe0415320f30ad65a715aae402552 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Fri, 3 Jun 2022 10:27:39 +0200 Subject: [PATCH 3/3] ci(config): update to build only one generic per folder Signed-off-by: Frederic Pillon --- CI/build/conf/cores_config.json | 10 ++++++++++ CI/build/conf/cores_config_ci.json | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/CI/build/conf/cores_config.json b/CI/build/conf/cores_config.json index 13134e3358..37cedfa605 100644 --- a/CI/build/conf/cores_config.json +++ b/CI/build/conf/cores_config.json @@ -87,6 +87,9 @@ "GENERIC_F439ZGTX", "GENERIC_F439ZGYX", "GENERIC_F439ZITX", "GENERIC_F439ZIYX", "GENERIC_F446RCTX", "GENERIC_F446VETX", + "GENERIC_F722RCTX", + "GENERIC_F730R8TX", + "GENERIC_F732RETX", "GENERIC_F745ZETX", "GENERIC_F745ZGTX", "GENERIC_F746BETX", "GENERIC_F746BGTX", "GENERIC_F746NEHX", "GENERIC_F746ZETX", "GENERIC_F746ZEYX", "GENERIC_F746ZGYX", @@ -103,8 +106,15 @@ "GENERIC_G030K6TX", "GENERIC_G031J4MX", "GENERIC_G031J6MX", "GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX", + "GENERIC_G031F4PX", "GENERIC_G031F6PX", "GENERIC_G031F8PX", "GENERIC_G031Y8YX", + "GENERIC_G041F6PX", "GENERIC_G041F8PX", "GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX", + "GENERIC_G070CBTX", "GENERIC_G070KBTX", + "GENERIC_G071C6TX", "GENERIC_G071C8TX", "GENERIC_G071CBTX", + "GENERIC_G071C6UX", "GENERIC_G071C8UX", "GENERIC_G071CBUX", + "GENERIC_G071G8UXN", "GENERIC_G071GBUXN", "GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX", + "GENERIC_G081CBTX", "GENERIC_G0B1RBTX", "GENERIC_G0B1RCTX", "GENERIC_G0C1RCTX", "GENERIC_G0C1RETX", "GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX", "GENERIC_G441KBTX", diff --git a/CI/build/conf/cores_config_ci.json b/CI/build/conf/cores_config_ci.json index 4558dbbf31..21263557d4 100644 --- a/CI/build/conf/cores_config_ci.json +++ b/CI/build/conf/cores_config_ci.json @@ -86,6 +86,9 @@ "GENERIC_F439ZGTX", "GENERIC_F439ZGYX", "GENERIC_F439ZITX", "GENERIC_F439ZIYX", "GENERIC_F446RCTX", "GENERIC_F446VETX", + "GENERIC_F722RCTX", + "GENERIC_F730R8TX", + "GENERIC_F732RETX", "GENERIC_F745ZETX", "GENERIC_F745ZGTX", "GENERIC_F746BETX", "GENERIC_F746BGTX", "GENERIC_F746NEHX", "GENERIC_F746ZETX", "GENERIC_F746ZEYX", "GENERIC_F746ZGYX", @@ -102,8 +105,15 @@ "GENERIC_G030K6TX", "GENERIC_G031J4MX", "GENERIC_G031J6MX", "GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX", + "GENERIC_G031F4PX", "GENERIC_G031F6PX", "GENERIC_G031F8PX", "GENERIC_G031Y8YX", + "GENERIC_G041F6PX", "GENERIC_G041F8PX", "GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX", + "GENERIC_G070CBTX", "GENERIC_G070KBTX", + "GENERIC_G071C6TX", "GENERIC_G071C8TX", "GENERIC_G071CBTX", + "GENERIC_G071C6UX", "GENERIC_G071C8UX", "GENERIC_G071CBUX", + "GENERIC_G071G8UXN", "GENERIC_G071GBUXN", "GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX", + "GENERIC_G081CBTX", "GENERIC_G0B1RBTX", "GENERIC_G0B1RCTX", "GENERIC_G0C1RCTX", "GENERIC_G0C1RETX", "GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX", "GENERIC_G441KBTX",