This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit 6c88a1ad7677cd20e5f1aecae53730ef27a3ef90 Author: dongjiuzhu1 <[email protected]> AuthorDate: Sat Nov 18 21:31:52 2023 +0800 examples/elf/sotest: enable and run them simultaneously Signed-off-by: dongjiuzhu1 <[email protected]> --- examples/elf/elf_main.c | 6 +++--- examples/sotest/sotest_main.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c index 0cc1e47a0..91a2f971c 100644 --- a/examples/elf/elf_main.c +++ b/examples/elf/elf_main.c @@ -71,17 +71,17 @@ # define SECTORSIZE 512 # define NSECTORS(b) (((b) + SECTORSIZE - 1) / SECTORSIZE) -# define MOUNTPT "/mnt/romfs" +# define MOUNTPT "/mnt/elf/romfs" #elif defined(CONFIG_EXAMPLES_ELF_CROMFS) /* Describe the CROMFS file system */ -# define MOUNTPT "/mnt/cromfs" +# define MOUNTPT "/mnt/elf/cromfs" #elif defined(CONFIG_EXAMPLES_ELF_EXTERN) && defined(CONFIG_EXAMPLES_ELF_FSMOUNT) /* Describe the external file system */ -# define MOUNTPT "/mnt/" CONFIG_EXAMPLES_ELF_FSTYPE +# define MOUNTPT "/mnt/elf/" CONFIG_EXAMPLES_ELF_FSTYPE #else # undef MOUNTPT diff --git a/examples/sotest/sotest_main.c b/examples/sotest/sotest_main.c index 1b63ee81e..1446e222e 100644 --- a/examples/sotest/sotest_main.c +++ b/examples/sotest/sotest_main.c @@ -69,7 +69,7 @@ # define SECTORSIZE 64 # define NSECTORS(b) (((b)+SECTORSIZE-1)/SECTORSIZE) -# define BINDIR "/mnt/romfs" +# define BINDIR "/mnt/sotest/romfs" # ifndef CONFIG_EXAMPLES_SOTEST_DEVMINOR_MAX # define CONFIG_EXAMPLES_SOTEST_DEVMINOR_MAX 5 @@ -127,7 +127,7 @@ int main(int argc, FAR char *argv[]) #ifdef CONFIG_EXAMPLES_SOTEST_BUILTINFS /* Create a ROM disk for the ROMFS filesystem */ - desc.minor = CONFIG_EXAMPLES_SOTEST_DEVMINOR; /* Minor device number of the ROM disk. */ + desc.minor = 0; /* Minor device number of the ROM disk. */ desc.nsectors = NSECTORS(sotest_romfs_img_len); /* The number of sectors in the ROM disk */ desc.sectsize = SECTORSIZE; /* The size of one sector in bytes */ desc.image = (FAR uint8_t *)sotest_romfs_img; /* File system image */
