Commit 8ea8d324 authored by James T. Lee's avatar James T. Lee
Browse files

firmware: Remove crust

Suspend/resume features not required for SOPine for the time it takes to
build and the patches needed in the kernel.
parent 1a1c21f6
...@@ -51,14 +51,10 @@ class nest::base::firmware { ...@@ -51,14 +51,10 @@ class nest::base::firmware {
'sopine': { 'sopine': {
contain '::nest::base::firmware::arm' contain '::nest::base::firmware::arm'
contain '::nest::base::firmware::crust'
contain '::nest::base::firmware::uboot' contain '::nest::base::firmware::uboot'
Class['nest::base::firmware::arm'] Class['nest::base::firmware::arm']
~> Class['nest::base::firmware::uboot'] ~> Class['nest::base::firmware::uboot']
Class['nest::base::firmware::crust']
~> Class['nest::base::firmware::uboot']
} }
} }
......
class nest::base::firmware::crust {
# For nest::base::portage::makeopts
include '::nest::base::portage'
nest::lib::toolchain { 'or1k-linux-musl':
gcc_only => true,
}
vcsrepo { '/usr/src/crust':
ensure => latest,
provider => git,
source => 'https://gitlab.james.tl/nest/forks/crust.git',
revision => 'main',
}
~>
exec { '/bin/rm -rf /usr/src/crust/.config':
refreshonly => true,
}
$defconfig = $facts['profile']['platform'] ? {
'sopine' => 'pine64_plus_defconfig',
}
exec { 'crust-defconfig':
command => "/usr/bin/make ${defconfig}",
cwd => '/usr/src/crust',
creates => '/usr/src/crust/.config',
require => Vcsrepo['/usr/src/crust'],
}
~>
exec { 'crust-build':
command => "/usr/bin/make ${::nest::base::portage::makeopts} ${build_options}",
cwd => '/usr/src/crust',
path => ['/usr/lib/distcc/bin', '/usr/bin', '/bin'],
environment => 'HOME=/root', # for distcc
timeout => 0,
# just attempt once per config change
refreshonly => true,
noop => !$facts['build'],
require => Nest::Lib::Toolchain['or1k-linux-musl'],
}
}
...@@ -81,7 +81,7 @@ class nest::base::firmware::uboot { ...@@ -81,7 +81,7 @@ class nest::base::firmware::uboot {
} }
'sopine': { 'sopine': {
$build_options = 'BL31=/usr/src/arm-trusted-firmware/build/sun50i_a64/release/bl31.bin SCP=/usr/src/crust/build/scp/scp.bin' $build_options = 'BL31=/usr/src/arm-trusted-firmware/build/sun50i_a64/release/bl31.bin SCP=/dev/null'
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment