diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2017-02-23 20:41:55 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2017-02-23 20:41:55 +0000 |
| commit | b853277efcba023f94d1d4ee4a588c15ead6907b (patch) | |
| tree | c135b177c4faa134e21db5c28844b69bc9ee4594 | |
| parent | b215ceaaec905918e672fd257340e2fd3960e201 (diff) | |
| download | src-b853277efcba023f94d1d4ee4a588c15ead6907b.tar.gz src-b853277efcba023f94d1d4ee4a588c15ead6907b.zip | |
Fix and shorten BERI kernel builds during universe.
Stop building BERI_DE4_BASE and BERI_SIM_BASE, they aren't particularly
valid as they don't have a root dev. Do build BERI_DE4_SDROOT which
does so devices get coverage.
Remove ident from BERI_DE4_BASE for the reasons above which will cause
it to fail to build. BERI_SIM_BASE was already this way and broke
universe.[0]
Reported by: rpokala
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=314180
| -rw-r--r-- | sys/mips/conf/BERI_DE4_BASE | 4 | ||||
| -rw-r--r-- | sys/mips/conf/BERI_DE4_SDROOT | 2 | ||||
| -rw-r--r-- | sys/mips/conf/BERI_SIM_BASE | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/mips/conf/BERI_DE4_BASE b/sys/mips/conf/BERI_DE4_BASE index be1f74c93e72..7de7978b727e 100644 --- a/sys/mips/conf/BERI_DE4_BASE +++ b/sys/mips/conf/BERI_DE4_BASE @@ -7,9 +7,9 @@ # $FreeBSD$ # -include "std.BERI" +#NO_UNIVERSE -ident BERI_DE4_BASE +include "std.BERI" options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager diff --git a/sys/mips/conf/BERI_DE4_SDROOT b/sys/mips/conf/BERI_DE4_SDROOT index 7214e8c18c9e..72386f136243 100644 --- a/sys/mips/conf/BERI_DE4_SDROOT +++ b/sys/mips/conf/BERI_DE4_SDROOT @@ -6,8 +6,6 @@ # $FreeBSD$ # -#NO_UNIVERSE - include "BERI_DE4_BASE" ident BERI_DE4_SDROOT diff --git a/sys/mips/conf/BERI_SIM_BASE b/sys/mips/conf/BERI_SIM_BASE index bbf56041d0d4..f80118dcab48 100644 --- a/sys/mips/conf/BERI_SIM_BASE +++ b/sys/mips/conf/BERI_SIM_BASE @@ -6,6 +6,8 @@ # $FreeBSD$ # +#NO_UNIVERSE + include "std.BERI" options FDT |