From 41067c6a742ed9466c05ed1d90b42cecbdd66ae6 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 14 Dec 2022 21:02:33 -0500 Subject: [PATCH] armcm_reset: Rename CONFIG_BOOTLOADER_START to CONFIG_FLASH_BOOT_ADDRESS Rename the symbol for better consistency with the upstream Klipper code. Signed-off-by: Kevin O'Connor --- src/generic/armcm_reset.c | 4 ++-- src/lpc176x/Kconfig | 2 +- src/rp2040/Kconfig | 2 +- src/stm32/Kconfig | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generic/armcm_reset.c b/src/generic/armcm_reset.c index e1fa553..3afbac9 100644 --- a/src/generic/armcm_reset.c +++ b/src/generic/armcm_reset.c @@ -4,7 +4,7 @@ // // This file may be distributed under the terms of the GNU GPLv3 license. -#include "autoconf.h" // CONFIG_FLASH_START +#include "autoconf.h" // CONFIG_FLASH_BOOT_ADDRESS #include "board/internal.h" // NVIC_SystemReset #include "board/irq.h" // irq_disable #include "board/misc.h" // try_request_canboot @@ -12,7 +12,7 @@ void try_request_canboot(void) { - uint32_t *bl_vectors = (uint32_t *)(CONFIG_BOOTLOADER_START); + uint32_t *bl_vectors = (uint32_t *)(CONFIG_FLASH_BOOT_ADDRESS); uint64_t *req_sig = (uint64_t *)bl_vectors[0]; irq_disable(); *req_sig = REQUEST_CANBOOT; diff --git a/src/lpc176x/Kconfig b/src/lpc176x/Kconfig index 627d30c..85d20e5 100644 --- a/src/lpc176x/Kconfig +++ b/src/lpc176x/Kconfig @@ -57,7 +57,7 @@ config FLASH_START hex default 0x0000 -config BOOTLOADER_START +config FLASH_BOOT_ADDRESS hex default 0x0000 diff --git a/src/rp2040/Kconfig b/src/rp2040/Kconfig index 08e6790..c2baee7 100644 --- a/src/rp2040/Kconfig +++ b/src/rp2040/Kconfig @@ -44,7 +44,7 @@ config LAUNCH_APP_ADDRESS default 0x10004000 hex -config BOOTLOADER_START +config FLASH_BOOT_ADDRESS hex default 0x10000100 diff --git a/src/stm32/Kconfig b/src/stm32/Kconfig index d38ed90..7f2c683 100644 --- a/src/stm32/Kconfig +++ b/src/stm32/Kconfig @@ -142,7 +142,7 @@ config FLASH_START hex default 0x8000000 -config BOOTLOADER_START +config FLASH_BOOT_ADDRESS hex default 0x8000000