andreil/katapult
1
0
Fork 0
mirror of https://github.com/andreili/katapult.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

armcm_deployer: Rename DEPLOYER_START symbol to FLASH_APPLICATION_ADDRESS

Browse Source 
Rename the symbol to be more similar to the symbol used in the
upstream Klipper code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2022-12-15 15:26:58 -05:00 committed by Eric Callahan
parent 41067c6a74
commit f9cd240fb4
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kconfig
View File

@ -104,7 +104,7 @@ config STATUS_LED_PIN
config BUILD_DEPLOYER
bool
default y if DEPLOYER_START != 0
default y if FLASH_APPLICATION_ADDRESS != FLASH_BOOT_ADDRESS
default n
# The HAVE_x options allow boards to disable support for some commands

6
src/generic/armcm_deployer.lds.S
View File

@ -11,7 +11,7 @@ OUTPUT_ARCH(arm)
MEMORY
{
rom (rx) : ORIGIN = CONFIG_DEPLOYER_START , LENGTH = CONFIG_FLASH_SIZE
rom (rx) : ORIGIN = CONFIG_FLASH_APPLICATION_ADDRESS , LENGTH = CONFIG_FLASH_SIZE
ram (rwx) : ORIGIN = CONFIG_RAM_START , LENGTH = CONFIG_RAM_SIZE
}
@ -22,8 +22,8 @@ SECTIONS
_text_vectortable_start = .;
KEEP(*(.vector_table))
_text_vectortable_end = .;
#if CONFIG_LAUNCH_APP_ADDRESS > CONFIG_DEPLOYER_START
. = CONFIG_LAUNCH_APP_ADDRESS - CONFIG_DEPLOYER_START ;
#if CONFIG_LAUNCH_APP_ADDRESS > CONFIG_FLASH_APPLICATION_ADDRESS
. = CONFIG_LAUNCH_APP_ADDRESS - CONFIG_FLASH_APPLICATION_ADDRESS ;
#endif
*(.text .text.*)
*(.rodata .rodata*)

2
src/lpc176x/Kconfig
View File

@ -72,7 +72,7 @@ choice
config LPC176X_FLASH_START_4000
bool "16KiB bootloader"
endchoice
config DEPLOYER_START
config FLASH_APPLICATION_ADDRESS
hex
default 0x4000 if LPC176X_FLASH_START_4000
default 0

4
src/rp2040/Kconfig
View File

@ -94,10 +94,10 @@ choice
config RP2040_FLASH_START_4000
bool "16KiB bootloader"
endchoice
config DEPLOYER_START
config FLASH_APPLICATION_ADDRESS
hex
default 0x10004000 if RP2040_FLASH_START_4000
default 0
default 0x10000100
######################################################################
# Communication inteface

6
src/stm32/Kconfig
View File

@ -226,7 +226,7 @@ choice
config STM32_FLASH_START_20000
bool "128KiB bootloader (SKR SE BX v2.0)" if MACH_STM32H743
endchoice
config DEPLOYER_START
config FLASH_APPLICATION_ADDRESS
hex
default 0x8000800 if STM32_FLASH_START_800
default 0x8001000 if STM32_FLASH_START_1000
@ -240,11 +240,11 @@ config DEPLOYER_START
default 0x8010000 if STM32_FLASH_START_10000
default 0x8020000 if STM32_FLASH_START_20000
default 0x8020200 if STM32_FLASH_START_20200
default 0
default 0x8000000
config ARMCM_RAM_VECTORTABLE
bool
default y if MACH_STM32F0 && DEPLOYER_START != 0
default y if MACH_STM32F0 && FLASH_APPLICATION_ADDRESS != 0x8000000
default n