me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix TS80P build

Browse Source
This commit is contained in:
Ben V. Brown
2020-08-18 19:31:25 +10:00
parent 275708ee25
commit 3f6819287d
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ccpp.yml → .github/workflows/pr.yml vendored
View File

@@ -1,12 +1,10 @@
name: C/C++ CI name: CI PR
on: [pull_request, push] on: [pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-latest
runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: chmod - name: chmod

22
.github/workflows/push.yml vendored Normal file
View File

@@ -0,0 +1,22 @@
name: CI Push
on: [push]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: chmod
run: chmod +x build.sh
- name: translation
run: |
cd Translation\ Editor
python3 make_translation.py
- name: make
run: ./build.sh -l EN
- name: Archive production artifacts
uses: actions/upload-artifact@v1
with:
name: compiled
path: ci/artefacts

6
workspace/TS100/Makefile
View File

@@ -35,7 +35,7 @@ INC_PD_DRIVERS_DIR = ./Core/Drivers/FUSB302
SOURCE_MIDDLEWARES_DIR = ./Middlewares SOURCE_MIDDLEWARES_DIR = ./Middlewares
# Device dependent settings # Device dependent settings
ifeq ($(model),$(filter $(model),TS100 TS80)) ifeq ($(model),$(filter $(model),TS100 TS80 TS80P))
$(info Building for Miniware ) $(info Building for Miniware )
DEVICE_INCLUDES = -I$(MINIWARE_INC_DIR) \ DEVICE_INCLUDES = -I$(MINIWARE_INC_DIR) \
-I$(INC_CMSIS_DEVICE)\ -I$(INC_CMSIS_DEVICE)\
@@ -116,7 +116,7 @@ LIBS=
COMPILER=gcc COMPILER=gcc
# arm-none-eabi is the general ARM compiler, # arm-none-eabi is the general ARM compiler,
#riscv-none-embed- is the riscv compiler #riscv-none-embed- is the riscv compiler
ifeq ($(model),$(filter $(model),TS100 TS80)) ifeq ($(model),$(filter $(model),TS100 TS80 TS80P))
COMPILER_PREFIX=arm-none-eabi COMPILER_PREFIX=arm-none-eabi
endif endif
ifeq ($(model),Pinecil) ifeq ($(model),Pinecil)
@@ -137,7 +137,7 @@ ifeq ($(model),Pinecil)
AS=$(COMPILER_PREFIX)-gcc -x assembler-with-cpp AS=$(COMPILER_PREFIX)-gcc -x assembler-with-cpp
endif endif
# compiler flags --------------------------------------------------------------- # compiler flags ---------------------------------------------------------------
ifeq ($(model),$(filter $(model),TS100 TS80)) ifeq ($(model),$(filter $(model),TS100 TS80 TS80P))
CPUFLAGS= -mthumb \ CPUFLAGS= -mthumb \
-mcpu=cortex-m3 \ -mcpu=cortex-m3 \
-mfloat-abi=soft -mfloat-abi=soft