Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0d33737e1 |
@@ -41,10 +41,14 @@ APP_COMMON_DIR = $(CURDIR)/../common
|
|||||||
BASEDIR = ../../..
|
BASEDIR = ../../..
|
||||||
|
|
||||||
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
||||||
|
# Only apply for ZPU builds - these addresses are within the ZPU's unified BRAM address space.
|
||||||
|
# K64F uses the default heap/stack calculated by build.sh which fits within the Cortex-M4 SRAM regions.
|
||||||
|
ifeq ($(__ZPU__),1)
|
||||||
override HEAPADDR = 0x1FFF5000
|
override HEAPADDR = 0x1FFF5000
|
||||||
override HEAPSIZE = 0x00033000
|
override HEAPSIZE = 0x00033000
|
||||||
override STACKADDR = 0x20028000
|
override STACKADDR = 0x20028000
|
||||||
override STACKSIZE = 0x00000000
|
override STACKSIZE = 0x00000000
|
||||||
|
endif
|
||||||
|
|
||||||
# Modules making up Kilo.
|
# Modules making up Kilo.
|
||||||
APP_C_SRC = $(APP_COMMON_DIR)/sysutils.c $(APP_COMMON_DIR)/ctypelocal.c
|
APP_C_SRC = $(APP_COMMON_DIR)/sysutils.c $(APP_COMMON_DIR)/ctypelocal.c
|
||||||
|
|||||||
@@ -41,10 +41,14 @@ APP_COMMON_DIR = $(CURDIR)/../common
|
|||||||
BASEDIR = ../../..
|
BASEDIR = ../../..
|
||||||
|
|
||||||
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
||||||
|
# Only apply for ZPU builds - these addresses are within the ZPU's unified BRAM address space.
|
||||||
|
# K64F uses the default heap/stack calculated by build.sh which fits within the Cortex-M4 SRAM regions.
|
||||||
|
ifeq ($(__ZPU__),1)
|
||||||
override HEAPADDR = 0x1FFF5000
|
override HEAPADDR = 0x1FFF5000
|
||||||
override HEAPSIZE = 0x00033000
|
override HEAPSIZE = 0x00033000
|
||||||
override STACKADDR = 0x20028000
|
override STACKADDR = 0x20028000
|
||||||
override STACKSIZE = 0x00000000
|
override STACKSIZE = 0x00000000
|
||||||
|
endif
|
||||||
|
|
||||||
# Modules making up Kilo.
|
# Modules making up Kilo.
|
||||||
APP_C_SRC = $(APP_COMMON_DIR)/sysutils.c $(APP_COMMON_DIR)/ctypelocal.c
|
APP_C_SRC = $(APP_COMMON_DIR)/sysutils.c $(APP_COMMON_DIR)/ctypelocal.c
|
||||||
|
|||||||
@@ -43,6 +43,8 @@ COMMON_DIR = $(CURDIR)../../common
|
|||||||
BASEDIR = ../../..
|
BASEDIR = ../../..
|
||||||
|
|
||||||
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
||||||
|
# mbasic only builds on K64F (ZPU build disabled due to missing maths libraries).
|
||||||
|
# These overrides extend the CODE region to encompass the larger heap needed by the BASIC interpreter.
|
||||||
override HEAPADDR = 0x2000C000
|
override HEAPADDR = 0x2000C000
|
||||||
override HEAPSIZE = 0x0001BC00
|
override HEAPSIZE = 0x0001BC00
|
||||||
override STACKADDR = 0x20027C00
|
override STACKADDR = 0x20027C00
|
||||||
@@ -62,7 +64,15 @@ FILTER2 = $(filter-out $(filter HEAPSIZE=%,$(FILTER1)), $(FILTER1))
|
|||||||
NEWMAKEFLAGS = $(FILTER2) HEAPADDR=$(HEADADDR) HEAPSIZE=$(HEAPSIZE)
|
NEWMAKEFLAGS = $(FILTER2) HEAPADDR=$(HEADADDR) HEAPSIZE=$(HEAPSIZE)
|
||||||
|
|
||||||
ifeq ($(__K64F__),1)
|
ifeq ($(__K64F__),1)
|
||||||
include $(APP_DIR)/Makefile.k64f
|
# Currently mbasic doesnt build on K64F - heap/stack overrides exceed the app CODE region.
|
||||||
|
# TODO: Rework memory layout to fit within K64F SRAM constraints.
|
||||||
|
#include $(APP_DIR)/Makefile.k64f
|
||||||
|
clean:
|
||||||
|
|
||||||
|
all:
|
||||||
|
|
||||||
|
install:
|
||||||
|
|
||||||
else
|
else
|
||||||
# Currently mbasic doesnt build on the ZPU due to missing maths libraries. Once I can source them it should build.
|
# Currently mbasic doesnt build on the ZPU due to missing maths libraries. Once I can source them it should build.
|
||||||
#include $(APP_DIR)/Makefile.zpu
|
#include $(APP_DIR)/Makefile.zpu
|
||||||
|
|||||||
@@ -41,10 +41,14 @@ APP_COMMON_DIR = $(CURDIR)/../common
|
|||||||
BASEDIR = ../../..
|
BASEDIR = ../../..
|
||||||
|
|
||||||
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
# Override values given by parent make for this application as its memory usage differs from the standard app.
|
||||||
|
# Only apply for ZPU builds - these addresses are within the ZPU's unified BRAM address space.
|
||||||
|
# K64F uses the default heap/stack calculated by build.sh which fits within the Cortex-M4 SRAM regions.
|
||||||
|
ifeq ($(__ZPU__),1)
|
||||||
override HEAPADDR = 0x1FFF5000
|
override HEAPADDR = 0x1FFF5000
|
||||||
override HEAPSIZE = 0x00033000
|
override HEAPSIZE = 0x00033000
|
||||||
override STACKADDR = 0x20028000
|
override STACKADDR = 0x20028000
|
||||||
override STACKSIZE = 0x00000000
|
override STACKSIZE = 0x00000000
|
||||||
|
endif
|
||||||
|
|
||||||
# Modules making up Kilo.
|
# Modules making up Kilo.
|
||||||
APP_C_SRC = basic_main.c basic_editor.c basic_exectoks.c basic_expr.c basic_tokens.c basic_utils.c $(APP_COMMON_DIR)/sysutils.c
|
APP_C_SRC = basic_main.c basic_editor.c basic_exectoks.c basic_expr.c basic_tokens.c basic_utils.c $(APP_COMMON_DIR)/sysutils.c
|
||||||
|
|||||||
Reference in New Issue
Block a user