Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Costmetic changes from review of last PR

Browse Source
This commit is contained in:
Gregory Nutt
2017-03-10 13:11:53 -06:00
parent 03f2c05fb6
commit 644b2fabbc
12 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/README.txt
+5
View File
@@ -519,6 +519,11 @@ configs/p112
Dave Brooks was successfully funded through Kickstarter for and another Dave Brooks was successfully funded through Kickstarter for and another
run of P112 boards in November of 2012. run of P112 boards in November of 2012.
configs/photon
A configuration for the Photon Wifi board from Particle Devices
(https://www.particle.io). This board features the STM32F205RGY6 MCU from
STMicro.
configs/pic32mx-starterkit configs/pic32mx-starterkit
This directory contains the port of NuttX to the Microchip PIC32 Ethernet This directory contains the port of NuttX to the Microchip PIC32 Ethernet
Starter Kit (DM320004) with the Multimedia Expansion Board (MEB, DM320005). Starter Kit (DM320004) with the Multimedia Expansion Board (MEB, DM320005).
configs/photon/include/board.h
+5 -4
View File
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* configs/photon/include/board.h * configs/photon/include/board.h
* *
* Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -163,7 +163,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@@ -171,6 +172,7 @@ extern "C" {
/************************************************************************************ /************************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: stm32_boardinitialize * Name: stm32_boardinitialize
* *
@@ -181,7 +183,7 @@ extern "C" {
* *
************************************************************************************/ ************************************************************************************/
EXTERN void stm32_boardinitialize(void); void stm32_boardinitialize(void);
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -189,5 +191,4 @@ EXTERN void stm32_boardinitialize(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __CONFIG_PHOTON_INCLUDE_BOARD_H */ #endif /* __CONFIG_PHOTON_INCLUDE_BOARD_H */
configs/photon/nsh/Make.defs
+1 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/photon/nsh/Make.defs # configs/photon/nsh/Make.defs
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -114,4 +114,3 @@ HOSTCC = gcc
HOSTINCLUDES = -I. HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS = HOSTLDFLAGS =
configs/photon/nsh/defconfig
+1 -1
View File
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
# #
# Build Configuration # Build Configuration
# #
CONFIG_APPS_DIR="../apps" # CONFIG_APPS_DIR="../apps"
CONFIG_BUILD_FLAT=y CONFIG_BUILD_FLAT=y
# CONFIG_BUILD_2PASS is not set # CONFIG_BUILD_2PASS is not set
configs/photon/nsh/setenv.sh
+6 -2
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/photon/nsh/setenv.sh # configs/photon/nsh/setenv.sh
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@ fi
# This is the Cygwin path to the location where I installed the CodeSourcery # This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install # toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location # the CodeSourcery toolchain in any other location
export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" # export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" #export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors" # This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
@@ -70,6 +70,10 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin" #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin" #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
# This is the Cygwin path to the location where I build the buildroot # This is the Cygwin path to the location where I build the buildroot
# toolchain. # toolchain.
#export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin" #export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
configs/photon/scripts/ld.script
+3 -3
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/scripts/ld.script * configs/photon/scripts/ld.script
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -43,8 +43,8 @@
MEMORY MEMORY
{ {
flash (rx) : ORIGIN = 0x08000000, LENGTH = 1024K flash (rx) : ORIGIN = 0x08000000, LENGTH = 1024K
sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K
} }
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
configs/photon/scripts/photon_dfu.ld
+3 -3
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/scripts/photon_dfu.ld * configs/photon/scripts/photon_dfu.ld
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -40,8 +40,8 @@
MEMORY MEMORY
{ {
flash (rx) : ORIGIN = 0x08020000, LENGTH = 896K flash (rx) : ORIGIN = 0x08020000, LENGTH = 896K
sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K
} }
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
configs/photon/src/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/photon/src/Makefile # configs/photon/src/Makefile
# #
# Copyright (C) 2011-2013, 2015-2016 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
configs/photon/src/dfu_signature.c
+29 -19
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/src/dfu_signature.c * configs/photon/src/dfu_signature.c
* *
* Copyright (C) 2011-2012, 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -40,28 +40,38 @@
#include <stdint.h> #include <stdint.h>
/**************************************************************************** /****************************************************************************
* Private Data * Private Types
****************************************************************************/
__attribute__((packed)) struct dfu_signature
{
uint32_t linker_start_address;
uint32_t linker_end_address;
uint8_t reserved[4];
uint16_t board_id;
uint8_t firmware_type1;
uint8_t firmware_type2;
uint8_t reserved2[8];
};
/****************************************************************************
* Public Data
****************************************************************************/ ****************************************************************************/
extern uint32_t _firmware_start; extern uint32_t _firmware_start;
extern uint32_t _firmware_end; extern uint32_t _firmware_end;
__attribute__((packed)) struct dfu_signature { /****************************************************************************
uint32_t linker_start_address; * Private Data
uint32_t linker_end_address; ****************************************************************************/
uint8_t reserved[4];
uint16_t board_id;
uint8_t firmware_type1;
uint8_t firmware_type2;
uint8_t reserved2[8];
};
__attribute__((externally_visible, section(".dfu_signature"))) \ __attribute__((externally_visible, section(".dfu_signature")))
const struct dfu_signature dfu_sign = { const struct dfu_signature dfu_sign =
(uint32_t)&_firmware_start, /* Flash image start address */ {
(uint32_t)&_firmware_end, /* Flash image end address */ (uint32_t)&_firmware_start, /* Flash image start address */
{0, 0, 0, 0}, /* reserved */ (uint32_t)&_firmware_end, /* Flash image end address */
6, /* Current board is photon */ {0, 0, 0, 0}, /* reserved */
4, 1, /* Firmware is "system-part1" */ 6, /* Current board is photon */
{0, 0, 0, 0, 0, 0, 0, 0} /* reserved */ 4, 1, /* Firmware is "system-part1" */
{0, 0, 0, 0, 0, 0, 0, 0} /* reserved */
}; };
configs/photon/src/photon.h
+1 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/src/photon.h * configs/photon/src/photon.h
* *
* Copyright (C) 2011-2012, 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,6 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration *************************************************************/
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
configs/photon/src/stm32_appinit.c
+1 -1
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* config/photon/src/stm32_appinit.c * config/photon/src/stm32_appinit.c
* *
* Copyright (C) 2012, 2014, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
configs/photon/src/stm32_boot.c
+1 -1
View File
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* configs/photon/src/stm32_boot.c * configs/photon/src/stm32_boot.c
* *
* Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without