From 83d297038a575b21eb2dc3d4601c52fb3ccf5e3c Mon Sep 17 00:00:00 2001 From: Mateusz Szafoni Date: Fri, 30 Nov 2018 12:09:00 +0000 Subject: [PATCH] Merged in raiden00/nuttx_pe (pull request #768) configs/nucleo-f334r8, configs/stm32f334-disco: cosmetics Approved-by: GregoryN --- configs/nucleo-f334r8/README.txt | 2 +- configs/nucleo-f334r8/include/board.h | 4 ++-- configs/nucleo-f334r8/scripts/ld.script | 6 +++--- configs/nucleo-f334r8/src/Makefile | 2 +- configs/stm32f334-disco/scripts/ld.script | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/nucleo-f334r8/README.txt b/configs/nucleo-f334r8/README.txt index b8f1c239d7..1d3c327960 100644 --- a/configs/nucleo-f334r8/README.txt +++ b/configs/nucleo-f334r8/README.txt @@ -1,7 +1,7 @@ Nucleo-64 Boards ================ -The Nucleo-F303RE is a member of the Nucleo-64 board family. The Nucleo-64 +The Nucleo-F334R8 is a member of the Nucleo-64 board family. The Nucleo-64 is a standard board for use with several STM32 parts in the LQFP64 package. Variants include diff --git a/configs/nucleo-f334r8/include/board.h b/configs/nucleo-f334r8/include/board.h index fe843b3040..57e6baa4b4 100644 --- a/configs/nucleo-f334r8/include/board.h +++ b/configs/nucleo-f334r8/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_STM32F3DISCOVERY_INCLUDE_BOARD_H -#define __CONFIG_STM32F3DISCOVERY_INCLUDE_BOARD_H +#ifndef __CONFIG_NUCLEO_F334R8_INCLUDE_BOARD_H +#define __CONFIG_NUCLEO_F334R8_INCLUDE_BOARD_H /**************************************************************************** * Included Files diff --git a/configs/nucleo-f334r8/scripts/ld.script b/configs/nucleo-f334r8/scripts/ld.script index 5c218ae94a..0cc2f4d717 100644 --- a/configs/nucleo-f334r8/scripts/ld.script +++ b/configs/nucleo-f334r8/scripts/ld.script @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f334re/scripts/ld.script + * configs/nucleo-f334r8/scripts/ld.script * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -/* The STM32F334R8 has 64Kb of FLASH beginning at address 0x0800:0000 and - * 12Kb of SRAM. +/* The STM32F334R8 has 64Kb of FLASH beginning at address 0x0800:0000, + * 12Kb of SRAM and 4Kb of CCM SRAM. * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/configs/nucleo-f334r8/src/Makefile b/configs/nucleo-f334r8/src/Makefile index 4175d83663..55f3fc2a05 100644 --- a/configs/nucleo-f334r8/src/Makefile +++ b/configs/nucleo-f334r8/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# configs/nucleo-f303re/src/Makefile +# configs/nucleo-f334r8/src/Makefile # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Mateusz Szafoni diff --git a/configs/stm32f334-disco/scripts/ld.script b/configs/stm32f334-disco/scripts/ld.script index b617acf71b..72b8731eaa 100644 --- a/configs/stm32f334-disco/scripts/ld.script +++ b/configs/stm32f334-disco/scripts/ld.script @@ -33,8 +33,8 @@ * ****************************************************************************/ -/* The STM32F334R8 has 64Kb of FLASH beginning at address 0x0800:0000 and - * 12Kb of SRAM. +/* The STM32F334C8 has 64Kb of FLASH beginning at address 0x0800:0000, + * 12Kb of SRAM and 4Kb of CCM SRAM. * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in