mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-17 06:23:34 +08:00
More ELF loader changes
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5261 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
@@ -10,4 +10,20 @@ config EXAMPLES_ELF
|
||||
Enable the ELF loader example
|
||||
|
||||
if EXAMPLES_ELF
|
||||
config EXAMPLES_ELF_DEVMINOR
|
||||
int "ROMFS Minor Device Number"
|
||||
default 0
|
||||
---help---
|
||||
The minor device number of the ROMFS block. For example, the N in /dev/ramN.
|
||||
Used for registering the RAM block driver that will hold the ROMFS file system
|
||||
containing the ELF executables to be tested. Default: 0
|
||||
|
||||
config EXAMPLES_ELF_DEVPATH
|
||||
string "ROMFS Devie Path"
|
||||
default "/dev/ram0"
|
||||
---help---
|
||||
The path to the ROMFS block driver device. This must match EXAMPLES_ELF_DEVMINOR.
|
||||
Used for registering the RAM block driver that will hold the ROMFS file system
|
||||
containing the ELF executables to be tested. Default: "/dev/ram0"
|
||||
|
||||
endif
|
||||
|
||||
@@ -61,7 +61,7 @@ ROOTDEPPATH = --dep-path .
|
||||
VPATH =
|
||||
|
||||
all: .built
|
||||
.PHONY: headers clean depend disclean
|
||||
.PHONY: headers clean_tests clean depend disclean
|
||||
|
||||
$(AOBJS): %$(OBJEXT): %.S
|
||||
$(call ASSEMBLE, $<, $@)
|
||||
@@ -72,7 +72,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
headers:
|
||||
@$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
|
||||
|
||||
.built: $(OBJS)
|
||||
.built: headers $(OBJS)
|
||||
@( for obj in $(OBJS) ; do \
|
||||
$(call ARCHIVE, $(BIN), $${obj}); \
|
||||
done ; )
|
||||
@@ -88,7 +88,10 @@ context:
|
||||
|
||||
depend: .depend
|
||||
|
||||
clean:
|
||||
clean_tests:
|
||||
@$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean
|
||||
|
||||
clean: clean_tests
|
||||
@rm -f *.o *~ .*.swp .built
|
||||
$(call CLEAN)
|
||||
|
||||
|
||||
@@ -89,9 +89,16 @@
|
||||
|
||||
#define SECTORSIZE 512
|
||||
#define NSECTORS(b) (((b)+SECTORSIZE-1)/SECTORSIZE)
|
||||
#define ROMFSDEV "/dev/ram0"
|
||||
#define MOUNTPT "/mnt/romfs"
|
||||
|
||||
#ifndef CONFIG_EXAMPLES_ELF_DEVMINOR
|
||||
# define CONFIG_EXAMPLES_ELF_DEVMINOR 0
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_EXAMPLES_ELF_DEVPATH
|
||||
# define CONFIG_EXAMPLES_ELF_DEVPATH "/dev/ram0"
|
||||
#endif
|
||||
|
||||
/* If CONFIG_DEBUG is enabled, use dbg instead of printf so that the
|
||||
* output will be synchronous with the debug output.
|
||||
*/
|
||||
@@ -166,8 +173,9 @@ int elf_main(int argc, char *argv[])
|
||||
|
||||
/* Create a ROM disk for the ROMFS filesystem */
|
||||
|
||||
message("Registering romdisk\n");
|
||||
ret = romdisk_register(0, romfs_img, NSECTORS(romfs_img_len), SECTORSIZE);
|
||||
message("Registering romdisk at /dev/ram%d\n", CONFIG_EXAMPLES_ELF_DEVMINOR);
|
||||
ret = romdisk_register(CONFIG_EXAMPLES_ELF_DEVMINOR, romfs_img,
|
||||
NSECTORS(romfs_img_len), SECTORSIZE);
|
||||
if (ret < 0)
|
||||
{
|
||||
err("ERROR: romdisk_register failed: %d\n", ret);
|
||||
@@ -178,13 +186,13 @@ int elf_main(int argc, char *argv[])
|
||||
/* Mount the file system */
|
||||
|
||||
message("Mounting ROMFS filesystem at target=%s with source=%s\n",
|
||||
MOUNTPT, ROMFSDEV);
|
||||
MOUNTPT, CONFIG_EXAMPLES_ELF_DEVPATH);
|
||||
|
||||
ret = mount(ROMFSDEV, MOUNTPT, "romfs", MS_RDONLY, NULL);
|
||||
ret = mount(CONFIG_EXAMPLES_ELF_DEVPATH, MOUNTPT, "romfs", MS_RDONLY, NULL);
|
||||
if (ret < 0)
|
||||
{
|
||||
err("ERROR: mount(%s,%s,romfs) failed: %s\n",
|
||||
ROMFSDEV, MOUNTPT, errno);
|
||||
CONFIG_EXAMPLES_ELF_DEVPATH, MOUNTPT, errno);
|
||||
elf_uninitialize();
|
||||
}
|
||||
|
||||
@@ -219,6 +227,6 @@ int elf_main(int argc, char *argv[])
|
||||
sleep(4);
|
||||
}
|
||||
|
||||
message("End-of-Test.. Exit-ing\n");
|
||||
message("End-of-Test.. Exiting\n");
|
||||
return 0;
|
||||
}
|
||||
@@ -39,7 +39,7 @@
|
||||
BIN = errno
|
||||
|
||||
SRCS = $(BIN).c
|
||||
OBJS = $(BIN:.c=.o)
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ all: $(BIN1) $(BIN2) $(BIN3) $(BIN4)
|
||||
|
||||
$(OBJS): %.o: %.cpp
|
||||
@echo "CC: $<"
|
||||
@$(CXX) -c $(CXXPICFLAGS) $< -o $@
|
||||
@$(CXX) -c $(CXXFLAGS) $< -o $@
|
||||
|
||||
# This contains libstdc++ stubs to that you can build C++ code
|
||||
# without actually having libstdc++
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
BIN = hello
|
||||
|
||||
SRCS = $(BIN).c
|
||||
OBJS = $(BIN:.c=.o)
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
BIN = longjmp
|
||||
|
||||
SRCS = $(BIN).c
|
||||
OBJS = $(BIN:.c=.o)
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
BIN = mutex
|
||||
|
||||
SRCS = $(BIN).c
|
||||
OBJS = $(BIN:.c=.o)
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
BIN = pthread
|
||||
|
||||
SRCS = $(BIN).c
|
||||
OBJS = $(BIN:.c=.o)
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
BIN = signal
|
||||
|
||||
SRCS = $(BIN).c
|
||||
OBJS = $(BIN:.c=.o)
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
CFLAGS += -I.
|
||||
|
||||
BIN = struct
|
||||
BIN = struct
|
||||
SRCS = struct_main.c struct_dummy.c
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
BIN = task
|
||||
|
||||
SRCS = $(BIN).c
|
||||
OBJS = $(BIN:.c=.o)
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user