zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

mkconfig now calculates DRAM_END if not provided 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5030 7fd9a85b-ad96-42d3-883c-3090e2eb8679
sbg
patacongo 13 years ago
parent
5a8984c800
commit
3f9f7e6d3c
3 changed files with 13 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      nuttx/ChangeLog
  2. 8
      nuttx/Makefile
  3. 7
      nuttx/tools/mkconfig.c

2
nuttx/ChangeLog
Unescape View File

@ -3168,3 +3168,5 @@
serial.c. serial.c.
* arch/arm/src/stm32/stm32_spi.c: SPI driver can now survice re- * arch/arm/src/stm32/stm32_spi.c: SPI driver can now survice re-
initialization (Mike Smith). initialization (Mike Smith).
* tools/mkconfig.c: If CONFIG_DRAM_END is not specified, this tool
will provide default definition of (CONFIG_DRAM_START + CONFIG_DRAM_SIZE)

8
nuttx/Makefile
Unescape View File

@ -276,8 +276,8 @@ include/stdarg.h:
endif endif
# Targets used to build include/nuttx/version.h. Creation of version.h is # Targets used to build include/nuttx/version.h. Creation of version.h is
# part of the overall NuttX configuration sequency. Notice that the # part of the overall NuttX configuration sequence. Notice that the
# tools/mkversion tool is cuilt and used to create include/nuttx/version.h # tools/mkversion tool is built and used to create include/nuttx/version.h
tools/mkversion: tools/mkversion:
@$(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkversion @$(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkversion
@ -293,8 +293,8 @@ include/nuttx/version.h: $(TOPDIR)/.version tools/mkversion
@tools/mkversion $(TOPDIR) > include/nuttx/version.h @tools/mkversion $(TOPDIR) > include/nuttx/version.h
# Targets used to build include/nuttx/config.h. Creation of config.h is # Targets used to build include/nuttx/config.h. Creation of config.h is
# part of the overall NuttX configuration sequency. Notice that the # part of the overall NuttX configuration sequence. Notice that the
# tools/mkconfig tool is cuilt and used to create include/nuttx/config.h # tools/mkconfig tool is built and used to create include/nuttx/config.h
tools/mkconfig: tools/mkconfig:
@$(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkconfig @$(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkconfig

7
nuttx/tools/mkconfig.c
Unescape View File

@ -174,6 +174,12 @@ int main(int argc, char **argv, char **envp)
printf("#ifndef CONFIG_MM_REGIONS\n"); printf("#ifndef CONFIG_MM_REGIONS\n");
printf("# define CONFIG_MM_REGIONS 1\n"); printf("# define CONFIG_MM_REGIONS 1\n");
printf("#endif\n\n"); printf("#endif\n\n");
printf("/* If the end of RAM is not specified then it is assumed to be the beginning\n");
printf(" * of RAM plus the RAM size.\n");
printf(" */\n\n");
printf("#ifndef CONFIG_DRAM_END\n");
printf("# define CONFIG_DRAM_END (CONFIG_DRAM_START+CONFIG_DRAM_SIZE)\n");
printf("#endif\n\n");
printf("/* If no file streams are configured, then make certain that buffered I/O\n"); printf("/* If no file streams are configured, then make certain that buffered I/O\n");
printf(" * support is disabled\n"); printf(" * support is disabled\n");
printf(" */\n\n"); printf(" */\n\n");
@ -256,6 +262,7 @@ int main(int argc, char **argv, char **envp)
printf("# undef CONFIG_DEBUG_USB\n"); printf("# undef CONFIG_DEBUG_USB\n");
printf("# undef CONFIG_DEBUG_GRAPHICS\n"); printf("# undef CONFIG_DEBUG_GRAPHICS\n");
printf("# undef CONFIG_DEBUG_GPIO\n"); printf("# undef CONFIG_DEBUG_GPIO\n");
printf("# undef CONFIG_DEBUG_SPI\n");
printf("# undef CONFIG_DEBUG_STACK\n"); printf("# undef CONFIG_DEBUG_STACK\n");
printf("#endif\n\n"); printf("#endif\n\n");
printf("#endif /* __INCLUDE_NUTTX_CONFIG_H */\n"); printf("#endif /* __INCLUDE_NUTTX_CONFIG_H */\n");

Write Preview
Loading…
Cancel
Save