Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not use test view and update bin folders of examples #68

Merged
merged 4 commits into from
Feb 26, 2021

Conversation

xluciano
Copy link
Contributor

@xluciano xluciano commented Jan 25, 2021

  • lib_i2c_develop now uses Tools 15
  • update the examples to use different bin folders for XS2 and XCORE-AI builds
  • update license and copyrights dates as required

@xluciano xluciano requested a review from ed-xmos January 25, 2021 10:04
@xluciano xluciano changed the title Do not use test view Do not use test view and update bin folders of examples Jan 27, 2021
@xluciano xluciano requested review from mbanth and removed request for oscarbailey-xmos February 26, 2021 14:15
Copy link
Contributor

@mbanth mbanth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@xluciano xluciano merged commit 9d27a3a into develop Feb 26, 2021
Copy link
Contributor

@xross xross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR mixes architecture and Product names. Naming should be

xs2 & xs3 OR x200/xCORE200 & xCORE.AI

Also to make the IF's easier to read, check for XCOREAI == 1

That is of the form:

if xcore.ai then
do xcore.ai stuff

Rather than:
if not xcore.ai
do xcore200 stuff

@xross
Copy link
Contributor

xross commented Mar 3, 2021

@mbanth here is my suggested makefile example for app_simple_single_port_master

Note, it removed the XCOREAI var (uses CONFIG), fixes the arch/product naming issue and the issue with the IF.

I think this scheme should be applied to the rest of the makefiles also.

# The APP_NAME variable determines the name of the final .xe file. It should
# not include the .xe postfix. If left blank the name will default to
# the project name

APP_NAME =

# The flags passed to xcc when building the application
# You can also set the following to override flags for a particular language:
#
#    XCC_XC_FLAGS, XCC_C_FLAGS, XCC_ASM_FLAGS, XCC_CPP_FLAGS
#
# If the variable XCC_MAP_FLAGS is set it overrides the flags passed to
# xcc for the final link (mapping) stage.

BUILD_FLAGS = -O2 -g -DDEBUG_PRINT_ENABLE=1 -report

XCC_FLAGS_xcore200 = $(BUILD_FLAGS)
XCC_FLAGS_xcoreai = $(BUILD_FLAGS)

# The TARGET variable determines what target system the application is
# compiled for. It either refers to an XN file in the source directories
# or a valid argument for the --target option when compiling.

ifeq ($(CONFIG),xcoreai)
TARGET = XCORE-AI-EXPLORER
else
TARGET = XCORE-200-EXPLORER
endif

# The USED_MODULES variable lists other module used by the application.

USED_MODULES = lib_i2c(>=6.0.0) lib_logging(>=2.1.0)

#=============================================================================
# The following part of the Makefile includes the common build infrastructure
# for compiling XMOS applications. You should not need to edit below here.

XMOS_MAKE_PATH ?= ../..
include $(XMOS_MAKE_PATH)/xcommon/module_xcommon/build/Makefile.common

@xluciano xluciano added this to the v6.1.0 milestone Apr 28, 2021
@xluciano xluciano deleted the feature/remove_test_view branch May 7, 2021 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants