sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Appliation.mk: Even on Cygwin, GNU make insists that targets use Unix style paths. System/progmem: Rename the install application to progmem. This generates a target install: which collides with the install:: target in Application.mk.

Browse Source
This commit is contained in:
Gregory Nutt 2018-09-04 09:38:26 -06:00
parent 7f5d8dfffe
commit 66948fe525
7 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Application.mk
View File

@ -176,9 +176,20 @@ endif
$(Q) touch $@ $(Q) touch $@
ifeq ($(BUILD_MODULE), y) ifeq ($(BUILD_MODULE), y)
PROGLIST := $(addprefix $(INSTALL_DIR)$(DELIM),$(PROGNAME))
ifeq ($(WINTOOL), y)
PROGPRFX = ${cygpath -u $(INSTALL_DIR)$(DELIM)}
else
PROGPRFX = $(INSTALL_DIR)$(DELIM)
endif
PROGLIST := $(addprefix $(PROGPRFX),$(PROGNAME))
PROGOBJ := $(MAINOBJ) PROGOBJ := $(MAINOBJ)
$(warning PROGLIST=$(PROGLIST))
$(warning MAINOBJ=$(MAINOBJ))
$(warning OBJS=$(OBJS))
$(PROGLIST): $(MAINOBJ) $(OBJS) $(PROGLIST): $(MAINOBJ) $(OBJS)
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(firstword $(PROGLIST)) $(ARCHCRT0OBJ) $(firstword $(PROGOBJ)) $(LDLIBS) $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(firstword $(PROGLIST)) $(ARCHCRT0OBJ) $(firstword $(PROGOBJ)) $(LDLIBS)
$(Q) $(NM) -u $(firstword $(PROGLIST)) $(Q) $(NM) -u $(firstword $(PROGLIST))
@ -186,9 +197,11 @@ $(PROGLIST): $(MAINOBJ) $(OBJS)
$(eval PROGOBJ=$(filter-out $(firstword $(PROGOBJ)),$(PROGOBJ))) $(eval PROGOBJ=$(filter-out $(firstword $(PROGOBJ)),$(PROGOBJ)))
install:: $(PROGLIST) install:: $(PROGLIST)
else else
install:: install::
endif
endif # BUILD_MODULE
preconfig:: preconfig::

0
system/install/.gitignore → system/progmem/.gitignore vendored
View File

0
system/install/Kconfig → system/progmem/Kconfig
View File

6
system/install/Make.defs → system/progmem/Make.defs
View File

@ -1,8 +1,8 @@
############################################################################ ############################################################################
# apps/system/install/Make.defs # apps/system/progmem/Make.defs
# Adds selected applications to apps/ build # Adds selected applications to apps/ build
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015, 2018 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
@ -35,6 +35,6 @@
############################################################################ ############################################################################
ifneq ($(CONFIG_SYSTEM_INSTALL),) ifneq ($(CONFIG_SYSTEM_INSTALL),)
CONFIGURED_APPS += system/install CONFIGURED_APPS += system/progmem
endif endif

13
system/install/Makefile → system/progmem/Makefile
View File

@ -1,8 +1,8 @@
############################################################################ ############################################################################
# apps/system/install/Makefile # apps/system/progmem/Makefile
# #
# Copyright (C) 2011 Uros Platise. All rights reserved. # Copyright (C) 2011 Uros Platise. All rights reserved.
# Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. # Copyright (C) 2012, 2016, 2018 Gregory Nutt. All rights reserved.
# Author: Uros Platise <uros.platise@isotel.eu> # Author: Uros Platise <uros.platise@isotel.eu>
# Gregory Nutt <gnutt@nuttx.org> # Gregory Nutt <gnutt@nuttx.org>
# #
@ -40,16 +40,15 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# Install Application # Install PROGMEM Application
# TODO: appname can be automatically extracted from the directory name
APPNAME = install APPNAME = progmem
PRIORITY = SCHED_PRIORITY_DEFAULT PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 1024 STACKSIZE = 1024
MAINSRC = install.c MAINSRC = progmem.c
CONFIG_XYZ_PROGNAME ?= install$(EXEEXT) CONFIG_XYZ_PROGNAME ?= progmem$(EXEEXT)
PROGNAME = $(CONFIG_XYZ_PROGNAME) PROGNAME = $(CONFIG_XYZ_PROGNAME)
MODULE = CONFIG_SYSTEM_INSTALL MODULE = CONFIG_SYSTEM_INSTALL

2
system/install/README.txt → system/progmem/README.txt
View File

@ -11,7 +11,7 @@ the program memory (flash) area into free area and creates a start-up
script into selected directory (i.e. /usr/bin/progname). script into selected directory (i.e. /usr/bin/progname).
Usage: Usage:
install [--stack RequiredStackSpace] [--priority Priority] progmem [--stack RequiredStackSpace] [--priority Priority]
source-file destination-directory source-file destination-directory
If stackspace is not given default stack space of 4096 Bytes is used. If stackspace is not given default stack space of 4096 Bytes is used.

54
system/install/install.c → system/progmem/progmem.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/system/install/install.c * apps/system/progmem/progmem.c
* *
* Copyright (C) 2011 Uros Platise. All rights reserved. * Copyright (C) 2011 Uros Platise. All rights reserved.
* Author: Uros Platise <uros.platise@isotel.eu> * Author: Uros Platise <uros.platise@isotel.eu>
@ -62,7 +62,7 @@
* Private data * Private data
****************************************************************************/ ****************************************************************************/
static const char *install_help = static const char *progmem_help =
"Installs XIP program into flash and creates a start-up script in the\n" "Installs XIP program into flash and creates a start-up script in the\n"
"destination directory.\n\n" "destination directory.\n\n"
"Usage:\t%s [options] source-file.xip destination-directory\n\n" "Usage:\t%s [options] source-file.xip destination-directory\n\n"
@ -75,17 +75,18 @@ static const char *install_help =
"\t--start <page>\t\tInstalls application at or after <page>\n" "\t--start <page>\t\tInstalls application at or after <page>\n"
"\t--margin <pages>\tLeave some free space after the kernel (default 16)\n"; "\t--margin <pages>\tLeave some free space after the kernel (default 16)\n";
static const char *install_script_text = static const char *progmem_script_text =
"# XIP stacksize=%x priority=%x size=%x\n"; "# XIP stacksize=%x priority=%x size=%x\n";
static const char *install_script_exec = static const char *progmem_script_exec =
"exec 0x%x\n"; "exec 0x%x\n";
/**************************************************************************** /****************************************************************************
* Private functions * Private functions
****************************************************************************/ ****************************************************************************/
static int install_getstartpage(int startpage, int pagemargin, int desiredsize) static int progmem_getstartpage(int startpage, int pagemargin,
int desiredsize)
{ {
size_t page = 0, stpage = 0xffff; size_t page = 0, stpage = 0xffff;
size_t pagesize = 0; size_t pagesize = 0;
@ -146,7 +147,7 @@ static int install_getstartpage(int startpage, int pagemargin, int desiredsize)
return -1; return -1;
} }
static int install_programflash(int startaddr, const char *source) static int progmem_programflash(int startaddr, const char *source)
{ {
ssize_t status; ssize_t status;
size_t count; size_t count;
@ -187,7 +188,8 @@ static int install_programflash(int startaddr, const char *source)
return totalsize; return totalsize;
} }
static void install_getscriptname(char *scriptname, const char *progname, const char *destdir) static void progmem_getscriptname(char *scriptname, const char *progname,
const char *destdir)
{ {
const char * progonly; const char * progonly;
@ -201,7 +203,7 @@ static void install_getscriptname(char *scriptname, const char *progname, const
strcat(scriptname, progonly); strcat(scriptname, progonly);
} }
static int install_getprogsize(const char *progname) static int progmem_getprogsize(const char *progname)
{ {
struct stat fileinfo; struct stat fileinfo;
@ -213,7 +215,7 @@ static int install_getprogsize(const char *progname)
return fileinfo.st_size; return fileinfo.st_size;
} }
static int install_alreadyexists(const char *scriptname) static int progmem_alreadyexists(const char *scriptname)
{ {
FILE *fp; FILE *fp;
@ -226,7 +228,7 @@ static int install_alreadyexists(const char *scriptname)
return 1; return 1;
} }
static int install_createscript(int addr, int stacksize, int progsize, static int progmem_createscript(int addr, int stacksize, int progsize,
int priority, const char *scriptname) int priority, const char *scriptname)
{ {
FILE *fp; FILE *fp;
@ -236,8 +238,8 @@ static int install_createscript(int addr, int stacksize, int progsize,
return -errno; return -errno;
} }
fprintf(fp, install_script_text, stacksize, priority, progsize); fprintf(fp, progmem_script_text, stacksize, priority, progsize);
fprintf(fp, install_script_exec, addr); fprintf(fp, progmem_script_exec, addr);
fflush(fp); fflush(fp);
fclose(fp); fclose(fp);
@ -245,7 +247,7 @@ static int install_createscript(int addr, int stacksize, int progsize,
return 0; return 0;
} }
static int install_getlasthexvalue(FILE *fp, char delimiter) static int progmem_getlasthexvalue(FILE *fp, char delimiter)
{ {
char buf[128]; char buf[128];
char *p; char *p;
@ -261,7 +263,7 @@ static int install_getlasthexvalue(FILE *fp, char delimiter)
return -1; return -1;
} }
static int install_remove(const char *scriptname) static int progmem_remove(const char *scriptname)
{ {
FILE *fp; FILE *fp;
int progsize, addr, freedsize; int progsize, addr, freedsize;
@ -272,8 +274,8 @@ static int install_remove(const char *scriptname)
if ((fp = fopen(scriptname, "r"))) if ((fp = fopen(scriptname, "r")))
{ {
progsize = install_getlasthexvalue(fp,'='); progsize = progmem_getlasthexvalue(fp,'=');
addr = install_getlasthexvalue(fp,' '); addr = progmem_getlasthexvalue(fp,' ');
freedsize = progsize; freedsize = progsize;
} }
else else
@ -333,7 +335,7 @@ static int install_remove(const char *scriptname)
#ifdef BUILD_MODULE #ifdef BUILD_MODULE
int main(int argc, FAR char *argv[]) int main(int argc, FAR char *argv[])
#else #else
int install_main(int argc, char *argv[]) int progmem_main(int argc, char *argv[])
#endif #endif
{ {
int i; int i;
@ -351,7 +353,7 @@ int install_main(int argc, char *argv[])
if (!up_progmem_isuniform()) if (!up_progmem_isuniform())
{ {
fprintf(stderr, "Error: install supports uniform organization only.\n"); fprintf(stderr, "Error: progmem supports uniform organization only.\n");
return -1; return -1;
} }
@ -404,7 +406,7 @@ int install_main(int argc, char *argv[])
break; /* are there sufficient parameters */ break; /* are there sufficient parameters */
} }
if ((scrsta=install_remove(argv[i])) < 0) if ((scrsta=progmem_remove(argv[i])) < 0)
{ {
fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta)); fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta));
return -1; return -1;
@ -420,11 +422,11 @@ int install_main(int argc, char *argv[])
break; /* are there sufficient parameters */ break; /* are there sufficient parameters */
} }
install_getscriptname(scriptname, argv[i], argv[i+1]); progmem_getscriptname(scriptname, argv[i], argv[i+1]);
/* script-exists? */ /* script-exists? */
if (install_alreadyexists(scriptname) == 1) if (progmem_alreadyexists(scriptname) == 1)
{ {
if (action != ACTION_REINSTALL) if (action != ACTION_REINSTALL)
{ {
@ -432,7 +434,7 @@ int install_main(int argc, char *argv[])
return -EEXIST; return -EEXIST;
} }
if ((scrsta = install_remove(scriptname)) < 0) if ((scrsta = progmem_remove(scriptname)) < 0)
{ {
fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta)); fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta));
return -1; return -1;
@ -441,14 +443,14 @@ int install_main(int argc, char *argv[])
printf("Replacing %s\n", scriptname); printf("Replacing %s\n", scriptname);
} }
startaddr = install_getstartpage(startpage, pagemargin, install_getprogsize(argv[i])); startaddr = progmem_getstartpage(startpage, pagemargin, progmem_getprogsize(argv[i]));
if (startpage < 0) if (startpage < 0)
{ {
fprintf(stderr, "Not enough memory\n"); fprintf(stderr, "Not enough memory\n");
return -ENOMEM; return -ENOMEM;
} }
if ((progsize = install_programflash(startaddr, argv[i])) <= 0) if ((progsize = progmem_programflash(startaddr, argv[i])) <= 0)
{ {
fprintf(stderr, "Error writing program memory: %s\n" fprintf(stderr, "Error writing program memory: %s\n"
"Note: Flash pages are not released, so you may try again and program will be\n" "Note: Flash pages are not released, so you may try again and program will be\n"
@ -456,7 +458,7 @@ int install_main(int argc, char *argv[])
return -EIO; return -EIO;
} }
if ((scrsta = install_createscript(startaddr, stacksize, progsize, if ((scrsta = progmem_createscript(startaddr, stacksize, progsize,
priority, scriptname)) < 0) priority, scriptname)) < 0)
{ {
fprintf(stderr, "Error writing program script at %s: %s\n", fprintf(stderr, "Error writing program script at %s: %s\n",
@ -469,6 +471,6 @@ int install_main(int argc, char *argv[])
return 0; return 0;
} }
fprintf(stderr, install_help, argv[0], argv[0]); fprintf(stderr, progmem_help, argv[0], argv[0]);
return -1; return -1;
} }