You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/10/31 20:11:09 UTC
[1/2] incubator-mynewt-newt git commit: newt - Fix additional build
errors for sim apps.
Repository: incubator-mynewt-newt
Updated Branches:
refs/heads/develop c2fe80578 -> f04edf545
newt - Fix additional build errors for sim apps.
For builds, newt was ensuring that the BSP specified a linker script.
This is too strict of a requirement, as the native BSP does not use
custom linker scripts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/54d3c0b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/54d3c0b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/54d3c0b8
Branch: refs/heads/develop
Commit: 54d3c0b8382200884f0a077b24317d9c86b31933
Parents: c2fe805
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Oct 31 11:06:42 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Oct 31 11:06:42 2016 -0700
----------------------------------------------------------------------
newt/builder/targetbuild.go | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/54d3c0b8/newt/builder/targetbuild.go
----------------------------------------------------------------------
diff --git a/newt/builder/targetbuild.go b/newt/builder/targetbuild.go
index 9274a8d..b6e6fdd 100644
--- a/newt/builder/targetbuild.go
+++ b/newt/builder/targetbuild.go
@@ -332,11 +332,6 @@ func (t *TargetBuilder) buildLoader() error {
/* set up the linker elf and linker script for the app */
t.AppBuilder.linkElf = t.LoaderBuilder.AppLinkerElfPath()
- linkerScript := t.bspPkg.Part2LinkerScript
-
- if linkerScript == "" {
- return util.NewNewtError("BSP must specify linker script ")
- }
return nil
@@ -365,12 +360,7 @@ func (t *TargetBuilder) Build() error {
if err := t.buildLoader(); err != nil {
return err
}
-
linkerScript = t.bspPkg.Part2LinkerScript
- if linkerScript == "" {
- return util.NewNewtError(
- "BSP does not specify part 2 linker script for split image")
- }
}
/* Link the app. */
[2/2] incubator-mynewt-newt git commit: newt - Fix reporting of bad
boot path for mfg img.
Posted by cc...@apache.org.
newt - Fix reporting of bad boot path for mfg img.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/f04edf54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/f04edf54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/f04edf54
Branch: refs/heads/develop
Commit: f04edf545f5c1c3d241ea443370fff77dcc87ce8
Parents: 54d3c0b
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Oct 31 13:12:10 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Oct 31 13:12:10 2016 -0700
----------------------------------------------------------------------
newt/mfg/paths.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/f04edf54/newt/mfg/paths.go
----------------------------------------------------------------------
diff --git a/newt/mfg/paths.go b/newt/mfg/paths.go
index cd9d38f..f05abb3 100644
--- a/newt/mfg/paths.go
+++ b/newt/mfg/paths.go
@@ -92,7 +92,7 @@ func (mi *MfgImage) BootBinPath() string {
}
return MfgBootBinPath(mi.basePkg.Name(),
- pkg.ShortName(mi.boot.Package()))
+ pkg.ShortName(mi.boot.App()))
}
func (mi *MfgImage) BootElfPath() string {
@@ -100,7 +100,7 @@ func (mi *MfgImage) BootElfPath() string {
return ""
}
- return MfgBootElfPath(mi.basePkg.Name(), pkg.ShortName(mi.boot.Package()))
+ return MfgBootElfPath(mi.basePkg.Name(), pkg.ShortName(mi.boot.App()))
}
func (mi *MfgImage) BootManifestPath() string {
@@ -109,7 +109,7 @@ func (mi *MfgImage) BootManifestPath() string {
}
return MfgBootManifestPath(mi.basePkg.Name(),
- pkg.ShortName(mi.boot.Package()))
+ pkg.ShortName(mi.boot.App()))
}
func (mi *MfgImage) AppImgPath(imageIdx int) string {