Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mongoose
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
esp
mongoose
Commits
dfde5785
Commit
dfde5785
authored
Jun 02, 2016
by
Deomid Ryabkov
Committed by
rojer
Jun 02, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use fw_meta script from the build image
PUBLISHED_FROM=996721b6d28ee25fcfcb514d716552c4afa238e1
parent
1a61455e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
Makefile.build
examples/CC3200/Makefile.build
+3
-4
sdk.version
examples/CC3200/sdk.version
+1
-1
No files found.
examples/CC3200/Makefile.build
View file @
dfde5785
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
PLATFORM
=
CC3200
PLATFORM
=
CC3200
SDK_PATH
?=
/cc3200-sdk
SDK_PATH
?=
/cc3200-sdk
REPO_PATH
?=
../../..
REPO_PATH
?=
../../..
COMMON_PATH
?=
$(REPO_PATH)
/common
BUILD_DIR
?=
./.build
BUILD_DIR
?=
./.build
FW_DIR
?=
./out
FW_DIR
?=
./out
SLFS_PATH
?=
./slfs
SLFS_PATH
?=
./slfs
...
@@ -59,10 +58,10 @@ $(FW_DIR):
...
@@ -59,10 +58,10 @@ $(FW_DIR):
$(FW_ZIP)
:
$(FW_ELF) $(FW_BIN) $(SLFS_FILES)
$(FW_ZIP)
:
$(FW_ELF) $(FW_BIN) $(SLFS_FILES)
@
echo
" Code size:
$(
shell
ls -l
$(FW_BIN)
| awk '{print
$$
5}'
)
"
@
echo
" Code size:
$(
shell
ls -l
$(FW_BIN)
| awk '{print
$$
5}'
)
"
@
echo
" GEN
$(FW_MANIFEST)
"
@
echo
" GEN
$(FW_MANIFEST)
"
@
$(COMMON_PATH)
/tools/fw_meta.py
gen_build_info
\
@
fw_meta
gen_build_info
\
--json_output
=
$(BUILD_INFO_JSON)
--json_output
=
$(BUILD_INFO_JSON)
@
cp
-v
$(SLFS_FILES)
out/
@
cp
-v
$(SLFS_FILES)
out/
@
$(COMMON_PATH)
/tools/fw_meta.py
create_manifest
\
@
fw_meta
create_manifest
\
--name
=
$(PROG)
--platform
=
$(PLATFORM)
\
--name
=
$(PROG)
--platform
=
$(PLATFORM)
\
--build_info
=
$(BUILD_INFO_JSON)
\
--build_info
=
$(BUILD_INFO_JSON)
\
--output
=
$(FW_MANIFEST)
\
--output
=
$(FW_MANIFEST)
\
...
@@ -70,7 +69,7 @@ $(FW_ZIP): $(FW_ELF) $(FW_BIN) $(SLFS_FILES)
...
@@ -70,7 +69,7 @@ $(FW_ZIP): $(FW_ELF) $(FW_BIN) $(SLFS_FILES)
sys_mcuimg.bin:src
=
$
(
notdir
$(FW_BIN)
)
\
sys_mcuimg.bin:src
=
$
(
notdir
$(FW_BIN)
)
\
$
(
foreach f,
$(SLFS_FILES)
,
$
(
notdir
$(f)
)
:src
=
$
(
notdir
$(f)
))
$
(
foreach f,
$(SLFS_FILES)
,
$
(
notdir
$(f)
)
:src
=
$
(
notdir
$(f)
))
@
echo
" ZIP
$@
"
@
echo
" ZIP
$@
"
@
$(COMMON_PATH)
/tools/fw_meta.py
create_fw
\
@
fw_meta
create_fw
\
--manifest
=
$(FW_MANIFEST)
\
--manifest
=
$(FW_MANIFEST)
\
--src_dir
=
$(FW_DIR)
\
--src_dir
=
$(FW_DIR)
\
--output
=
$@
--output
=
$@
...
...
examples/CC3200/sdk.version
View file @
dfde5785
docker.cesanta.com:5000/cc3200-build:1.2.0-r
2
docker.cesanta.com:5000/cc3200-build:1.2.0-r
3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment