diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | fragments/prj.conf.ashell (renamed from fragments/prj.conf.arduino_101_dev) | 10 | ||||
| -rw-r--r-- | fragments/prj.conf.qemu_x86 | 5 | ||||
| -rw-r--r-- | fragments/prj.mdef.ashell (renamed from fragments/prj.mdef.dev) | 0 | ||||
| -rw-r--r-- | fragments/prj.mdef.pool | 9 |
5 files changed, 5 insertions, 28 deletions
@@ -171,7 +171,7 @@ analyze: $(JS) echo "ccflags-y += -DZJS_SNAPSHOT_BUILD" >> src/Makefile; \ fi ifeq ($(DEV), ashell) - @cat fragments/prj.mdef.dev >> prj.mdef + @cat fragments/prj.mdef.ashell >> prj.mdef endif @echo "ccflags-y += $(shell ./scripts/analyze.sh $(BOARD) $(JS) $(CONFIG) $(DEV))" | tee -a src/Makefile arc/src/Makefile @@ -192,14 +192,15 @@ update: -.PHONY: setup setup: @echo "# This is a generated file" > prj.conf + @cat fragments/prj.conf.base >> prj.conf + ifeq ($(BOARD), qemu_x86) @cat fragments/prj.conf.qemu_x86 >> prj.conf else ifeq ($(DEV), ashell) - @cat fragments/prj.conf.arduino_101_dev >> prj.conf -else - @cat fragments/prj.conf.base >> prj.conf + @cat fragments/prj.conf.ashell >> prj.conf endif + ifeq ($(BOARD), arduino_101) @cat fragments/prj.conf.arduino_101 >> prj.conf @printf "CONFIG_PHYS_RAM_ADDR=0xA800%x\n" $$(((80 - $(RAM)) * 1024)) >> prj.conf diff --git a/fragments/prj.conf.arduino_101_dev b/fragments/prj.conf.ashell index 4a3ccde..f9026b6 100644 --- a/fragments/prj.conf.arduino_101_dev +++ b/fragments/prj.conf.ashell @@ -1,19 +1,9 @@ -# HEAP -CONFIG_HEAP_MEM_POOL_SIZE=4096 - # SHELL CONFIG_EARLY_CONSOLE=y CONFIG_STDOUT_CONSOLE=y -CONFIG_NEWLIB_LIBC=y -CONFIG_FLOAT=y CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_HANDLER_SHELL=y -CONFIG_ARC_INIT=y - CONFIG_IHEX_UPLOADER_DEBUG=n - -CONFIG_NANO_TIMERS=y -CONFIG_NANO_TIMEOUTS=y CONFIG_REBOOT=y # USB ACM GPIO diff --git a/fragments/prj.conf.qemu_x86 b/fragments/prj.conf.qemu_x86 index 3fcf08d..2833822 100644 --- a/fragments/prj.conf.qemu_x86 +++ b/fragments/prj.conf.qemu_x86 @@ -1,8 +1,3 @@ -CONFIG_STDOUT_CONSOLE=y CONFIG_XIP=y CONFIG_RAM_SIZE=80 CONFIG_ROM_SIZE=256 -CONFIG_FLOAT=y -CONFIG_NEWLIB_LIBC=y -CONFIG_NANO_TIMERS=y -CONFIG_RING_BUFFER=y diff --git a/fragments/prj.mdef.dev b/fragments/prj.mdef.ashell index 59732c4..59732c4 100644 --- a/fragments/prj.mdef.dev +++ b/fragments/prj.mdef.ashell diff --git a/fragments/prj.mdef.pool b/fragments/prj.mdef.pool deleted file mode 100644 index f99ee0c..0000000 --- a/fragments/prj.mdef.pool +++ /dev/null @@ -1,9 +0,0 @@ - -% POOL NAME SIZE_SMALL SIZE_LARGE BLOCK_NUMBER -% ==================================================== -POOL POOL_8 8 8 64 -POOL POOL_16 16 16 32 -POOL POOL_36 36 36 16 -POOL POOL_64 64 64 10 -POOL POOL_128 128 128 4 -POOL POOL_256 256 256 2 |