From 67287e89d0fc08efe034d1a50db675e378c39d13 Mon Sep 17 00:00:00 2001 From: Evgeniy Bobkov Date: Mon, 6 Aug 2018 06:22:19 -0600 Subject: [PATCH] This commit basically reverts my version of the change bbee0d70de46872b38105a8a872e15eb0f899719 in favor of Evgeniy Bobkov's version per request of Juha Niskanen. --- arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h | 3 ++- arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h | 3 ++- arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h b/arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h index ef7cc5b3467..a0f348b10bf 100644 --- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h +++ b/arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h @@ -75,7 +75,8 @@ #define STM32_INSTRAM_BASE 0x00000000 /* 0x00000000-0x00003fff: Instruction RAM (ITCM-RAM) */ #define STM32_SYSMEM_ICTM 0x00100000 /* 0x00100000-0x0010edbf: System memory (ITCM) */ #define STM32_FLASH_ITCM 0x00200000 /* 0x00200000-0x002fffff: FLASH memory (ITCM) */ -#define STM32_FLASH_BASE 0x08000000 /* 0x08000000-0x080fffff: FLASH memory (AXIM) */ +#define STM32_FLASH_AXIM 0x08000000 /* 0x08000000-0x080fffff: FLASH memory (AXIM) */ +#define STM32_FLASH_BASE STM32_FLASH_AXIM #define STM32_OPTIONS_BASE 0x1fff0000 /* 0x1ff00000-0x1fff001f: OTP (AXIM) */ /* Information Addresses ************************************************************/ diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h index bd612a97177..4f12e290502 100644 --- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h +++ b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h @@ -75,7 +75,8 @@ #define STM32_SYSMEM_ICTM 0x00100000 /* 0x00100000-0x0010edbf: System memory (ITCM) */ #define STM32_FLASH_ITCM 0x00200000 /* 0x00200000-0x002fffff: FLASH memory (ITCM) */ #define STM32_LOADER_BASE 0x01000000 /* 0x01000000- Bootloader */ -#define STM32_FLASH_BASE 0x08000000 /* 0x08000000-0x080fffff: FLASH memory (AXIM) */ +#define STM32_FLASH_AXIM 0x08000000 /* 0x08000000-0x080fffff: FLASH memory (AXIM) */ +#define STM32_FLASH_BASE STM32_FLASH_AXIM #define STM32_OPTIONS_BASE 0x1fff0000 /* 0x1ff00000-0x1fff001f: OTP (AXIM) */ /* Information Addresses ************************************************************/ diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h index c487e997744..ad0152c606b 100644 --- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h +++ b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h @@ -75,7 +75,8 @@ #define STM32_SYSMEM_ICTM 0x00100000 /* 0x00100000-0x0010edbf: System memory (ITCM) */ #define STM32_FLASH_ITCM 0x00200000 /* 0x00200000-0x003fffff: FLASH memory (ITCM) */ #define STM32_LOADER_BASE 0x01000000 /* 0x01000000- Bootloader */ -#define STM32_FLASH_BASE 0x08000000 /* 0x08000000-0x081fffff: FLASH memory (AXIM) */ +#define STM32_FLASH_AXIM 0x08000000 /* 0x08000000-0x081fffff: FLASH memory (AXIM) */ +#define STM32_FLASH_BASE STM32_FLASH_AXIM #define STM32_OPTIONS_BASE 0x1fff0000 /* 0x1ff00000-0x1fff001f: OTP (AXIM) */ /* Information Addresses ************************************************************/