Skip to content

Commit d8234a9

Browse files
committed
portenta_h7: replace USERSPACE with disable_mpu_rasr_xn hack
1 parent 0272be5 commit d8234a9

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

loader/boards/arduino_portenta_h7_m7.conf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@ CONFIG_ICACHE=y
1616
CONFIG_DCACHE=y
1717
CONFIG_CACHE_MANAGEMENT=y
1818

19-
CONFIG_USERSPACE=y
19+
CONFIG_USERSPACE=n
2020
CONFIG_ARM_MPU=y
2121
CONFIG_MAX_THREAD_BYTES=4
2222

2323
CONFIG_SHELL_STACK_SIZE=32768
24+
CONFIG_MAIN_STACK_SIZE=32768
2425
CONFIG_LLEXT_HEAP_SIZE=128
2526

2627
#CONFIG_ADC=y
2728
#CONFIG_PWM=y
2829

30+
CONFIG_NET_CORE_LOG_LEVEL_DBG=y
31+
2932
CONFIG_NETWORKING=y
3033
CONFIG_NET_IPV6=n
3134
CONFIG_NET_IPV4=y
@@ -39,8 +42,12 @@ CONFIG_DNS_SERVER1="8.8.8.8"
3942

4043
CONFIG_INIT_STACKS=y
4144

45+
CONFIG_NET_SOCKETS=y
46+
CONFIG_NET_SOCKETS_NET_MGMT=y
4247
CONFIG_NET_MGMT=y
4348
CONFIG_NET_MGMT_EVENT=y
49+
CONFIG_NET_L2_ETHERNET=y
50+
CONFIG_NET_L2_ETHERNET_MGMT=y
4451

4552
CONFIG_TINYCRYPT=y
4653
CONFIG_TINYCRYPT_AES=y

loader/fixups.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#if CONFIG_BOARD_ARDUINO_NANO_33_BLE
2-
31
#include <cmsis_core.h>
2+
#include <zephyr/init.h>
43
void disable_mpu_rasr_xn(void)
54
{
65
uint32_t index;
@@ -21,6 +20,7 @@ void disable_mpu_rasr_xn(void)
2120
}
2221
}
2322

23+
#if defined(CONFIG_BOARD_ARDUINO_NANO_33_BLE)
2424
int disable_bootloader_mpu() {
2525
// MPU was previously enabled in the bootloader
2626
// https://github.com/bcmi-labs/zephyr/blob/31cb7dd00fd5bce4c69896b3b2ddf6259d0c0f2b/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_defconfig#L10C1-L10C15
@@ -32,5 +32,8 @@ int disable_bootloader_mpu() {
3232
return 0;
3333
}
3434
SYS_INIT(disable_bootloader_mpu, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
35+
#endif
3536

37+
#if defined (CONFIG_BOARD_ARDUINO_PORTENTA_H7)
38+
SYS_INIT(disable_mpu_rasr_xn, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
3639
#endif
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#include <zephyr/kernel.h>
2+
3+
void _on_1200_bps() {
4+
uint32_t tmp = (uint32_t) & (RTC->BKP0R);
5+
tmp += (RTC_BKP_DR0 * 4U);
6+
*(__IO uint32_t *)tmp = (uint32_t)0xDF59;
7+
NVIC_SystemReset();
8+
}

0 commit comments

Comments
 (0)