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.

Sign up for GitHub

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

Jump to bottom

target [sysinit | sysdown] commands #230

Merged
merged 9 commits into from
Nov 1, 2018
Merged

target [sysinit | sysdown] commands #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd7f089
syscfg: Extract setting reference functionality
ccollins476ad Oct 16, 2018
5d015e6
logcfg: Allow logs to be defined in `syscfg.yml`
ccollins476ad Oct 16, 2018
36e1081
logcfg: `target logcfg <show | brief>` commands
ccollins476ad Oct 16, 2018
32bc505
val: Generic setting value structure
ccollins476ad Oct 25, 2018
359e47a
stage: Use ValSetting (generic setting value)
ccollins476ad Oct 25, 2018
3d0a613
logcfg: use ValSetting (generic setting value)
ccollins476ad Oct 25, 2018
f7d0dc2
Higher level structures for sysinit/sysdown
ccollins476ad Oct 25, 2018
0307b25
Add `newt target [sysinit | sysdown]` cmds
ccollins476ad Oct 25, 2018
db826a3
CLI: Move some target commands to a new file
ccollins476ad Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 32 additions & 42 deletions newt/builder/targetbuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ import (
"mynewt.apache.org/newt/newt/resolve"
"mynewt.apache.org/newt/newt/symbol"
"mynewt.apache.org/newt/newt/syscfg"
"mynewt.apache.org/newt/newt/sysdown"
"mynewt.apache.org/newt/newt/sysinit"
"mynewt.apache.org/newt/newt/target"
"mynewt.apache.org/newt/newt/toolchain"
"mynewt.apache.org/newt/util"
Expand Down Expand Up @@ -101,6 +99,9 @@ func NewTargetTester(target *target.Target,
injectedSettings: map[string]string{},
}

// Indicate that this version of newt supports the generated logcfg header.
t.InjectSetting("NEWT_FEATURE_LOGCFG", "1")

return t, nil
}

Expand Down Expand Up @@ -213,66 +214,59 @@ func (t *TargetBuilder) validateAndWriteCfg() error {
log.Warn(line)
}

if err := syscfg.EnsureWritten(t.res.Cfg,
GeneratedIncludeDir(t.target.Name())); err != nil {
incDir := GeneratedIncludeDir(t.target.Name())
srcDir := GeneratedSrcDir(t.target.Name())

if err := syscfg.EnsureWritten(t.res.Cfg, incDir); err != nil {
return err
}

return nil
}

func (t *TargetBuilder) generateSysinit() error {
if err := t.ensureResolved(); err != nil {
if err := t.res.LCfg.EnsureWritten(incDir); err != nil {
return err
}

srcDir := GeneratedSrcDir(t.target.Name())

// Generate loader sysinit.
if t.res.LoaderSet != nil {
lpkgs := resolve.RpkgSliceToLpkgSlice(t.res.LoaderSet.Rpkgs)
sysinit.EnsureWritten(lpkgs, srcDir,
pkg.ShortName(t.target.Package()), true)
if err := t.res.SysinitCfg.EnsureWritten(lpkgs, srcDir,
pkg.ShortName(t.target.Package()), true); err != nil {

return err
}
}

// Generate app sysinit.
lpkgs := resolve.RpkgSliceToLpkgSlice(t.res.AppSet.Rpkgs)
sysinit.EnsureWritten(lpkgs, srcDir,
pkg.ShortName(t.target.Package()), false)
if err := t.res.SysinitCfg.EnsureWritten(lpkgs, srcDir,
pkg.ShortName(t.target.Package()), false); err != nil {

return nil
}

func (t *TargetBuilder) generateSysdown() error {
if err := t.ensureResolved(); err != nil {
return err
}

srcDir := GeneratedSrcDir(t.target.Name())
// Generate loader sysinit.
if t.res.LoaderSet != nil {
lpkgs := resolve.RpkgSliceToLpkgSlice(t.res.LoaderSet.Rpkgs)
if err := t.res.SysdownCfg.EnsureWritten(lpkgs, srcDir,
pkg.ShortName(t.target.Package()), true); err != nil {

lpkgs := resolve.RpkgSliceToLpkgSlice(t.res.AppSet.Rpkgs)
sysdown.EnsureWritten(lpkgs, t.res.Cfg, srcDir,
pkg.ShortName(t.target.Package()))
return err
}
}

return nil
}
// XXX: Generate loader sysdown.

func (t *TargetBuilder) generateFlashMap() error {
return t.bspPkg.FlashMap.EnsureWritten(
GeneratedSrcDir(t.target.Name()),
GeneratedIncludeDir(t.target.Name()),
pkg.ShortName(t.target.Package()))
}
// Generate app sysdown.
lpkgs = resolve.RpkgSliceToLpkgSlice(t.res.AppSet.Rpkgs)
if err := t.res.SysdownCfg.EnsureWritten(lpkgs, srcDir,
pkg.ShortName(t.target.Package()), false); err != nil {

func (t *TargetBuilder) generateCode() error {
if err := t.generateSysinit(); err != nil {
return err
}

if err := t.generateSysdown(); err != nil {
return err
}
// Generate flash map.
if err := t.bspPkg.FlashMap.EnsureWritten(srcDir, incDir,
pkg.ShortName(t.target.Package())); err != nil {

if err := t.generateFlashMap(); err != nil {
return err
}

Expand Down Expand Up @@ -330,10 +324,6 @@ func (t *TargetBuilder) PrepBuild() error {

logDepInfo(t.res)

if err := t.generateCode(); err != nil {
return err
}

return nil
}

Expand Down