Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13557
-gerrit
commit 6b25e37db12e8f2bccfc282986beb0a62acba354
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Tue Feb 2 17:38:45 2016 +0100
build system: Add another post-processing step
files_added is for rules that need to run after all CBFS processing is
finished, such as SoC-specific postprocessing of the image, or for
vboot, to sign the RW regions (that contain CBFS that shouldn't change
afterwards.)
Change-Id: I830aa0c93429f4971cd68e4358faba5c206c0038
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
Makefile.inc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile.inc b/Makefile.inc
index d2b19f7..f5df811 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -46,7 +46,7 @@ export objgenerated := $(obj)/generated
#######################################################################
# root rule to resolve if in build mode (ie. configuration exists)
-real-target: $(obj)/config.h coreboot build_complete
+real-target: $(obj)/config.h coreboot files_added
coreboot: build-dirs $(obj)/coreboot.rom $(obj)/cbfstool $(obj)/rmodtool
# This target can be used in site local to run scripts or additional
@@ -56,6 +56,10 @@ build_complete:: coreboot
printf "\nBuilt %s (%s)\n" $(CONFIG_MAINBOARD_DIR) \
$(CONFIG_MAINBOARD_PART_NUMBER)
+# This target can be used to run rules after all files were added to CBFS,
+# for example to process FMAP regions or the entire image.
+files_added:: build_complete
+
#######################################################################
# our phony targets
PHONY+= clean-abuild coreboot lint lint-stable build-dirs build_complete
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13413
-gerrit
commit 075607b591496261337b230b6ea68658a2bb21cf
Author: Martin Roth <martinroth(a)google.com>
Date: Sun Jan 24 19:38:33 2016 -0700
build_system: Extend site-local
- Add a target at the end of the build that can be used to run additional
scripts or additional targets after coreboot.rom is built.
- Source a site-local Kconfig file to allow site-specific configuration.
This eliminates the need to add a hook for a script at the end of the
build because you can add one yourself in site-local.
Example site-local/Makefile.inc:
build_complete::
ifeq ($(CONFIG_SITE_LOCAL),y)
echo "Running additional steps in site-local"
# run some script here to make my build unreproducible.
endif
.phony: build_complete
Example site-local/Kconfig:
menu "site-local"
config SITE_LOCAL
bool "site-local enabled"
help
Enable my site-local configuration to do stuff.
endmenu
Change-Id: Id4d1e727c69b5cdb05e7d52731bbb1d1e201864a
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
Makefile.inc | 11 +++++++++--
src/Kconfig | 3 +++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index 06d3e14..d2b19f7 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -46,12 +46,19 @@ export objgenerated := $(obj)/generated
#######################################################################
# root rule to resolve if in build mode (ie. configuration exists)
-real-target: $(obj)/config.h coreboot
+real-target: $(obj)/config.h coreboot build_complete
coreboot: build-dirs $(obj)/coreboot.rom $(obj)/cbfstool $(obj)/rmodtool
+# This target can be used in site local to run scripts or additional
+# targets after the build completes by creating a Makefile.inc in the
+# site-local directory with a target named 'build_complete::'
+build_complete:: coreboot
+ printf "\nBuilt %s (%s)\n" $(CONFIG_MAINBOARD_DIR) \
+ $(CONFIG_MAINBOARD_PART_NUMBER)
+
#######################################################################
# our phony targets
-PHONY+= clean-abuild coreboot lint lint-stable build-dirs
+PHONY+= clean-abuild coreboot lint lint-stable build-dirs build_complete
#######################################################################
# root source directories of coreboot
diff --git a/src/Kconfig b/src/Kconfig
index 4df037b..3f02843 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -407,6 +407,9 @@ config FMDFILE
endmenu
+# load site-local kconfig to allow user specific defaults and overrides
+source "site-local/Kconfig"
+
config SYSTEM_TYPE_LAPTOP
default n
bool
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13413
-gerrit
commit 1c3bb30652093ba0bd878c27ef9c79f068126aad
Author: Martin Roth <martinroth(a)google.com>
Date: Sun Jan 24 19:38:33 2016 -0700
build_system: Extend site-local
- Add a target at the end of the build that can be used to run additional
scripts or additional targets after coreboot.rom is built.
- Source a site-local Kconfig file to allow site-specific configuration.
This eliminates the need to add a hook for a script at the end of the
build because you can add one yourself in site-local.
Example site-local/Makefile.inc:
build_complete::
ifeq ($(CONFIG_SITE_LOCAL),y)
echo "Running additional steps in site-local"
# run some script here to make my build unreproducible.
endif
.phony: build_complete
Example site-local/Kconfig:
menu "site-local"
config SITE_LOCAL
bool "site-local enabled"
help
Enable my site-local configuration to do stuff.
endmenu
Change-Id: Id4d1e727c69b5cdb05e7d52731bbb1d1e201864a
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
Makefile.inc | 11 +++++++++--
src/Kconfig | 3 +++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index 122b83a..daae1fb 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -46,12 +46,19 @@ export objgenerated := $(obj)/generated
#######################################################################
# root rule to resolve if in build mode (ie. configuration exists)
-real-target: $(obj)/config.h coreboot
+real-target: $(obj)/config.h coreboot build_complete
coreboot: build-dirs $(obj)/coreboot.rom $(obj)/cbfstool $(obj)/rmodtool
+# This target can be used in site local to run scripts or additional
+# targets after the build completes by creating a Makefile.inc in the
+# site-local directory with a target named 'build_complete::'
+build_complete:: coreboot
+ printf "\nBuilt %s (%s)\n" $(CONFIG_MAINBOARD_DIR) \
+ $(CONFIG_MAINBOARD_PART_NUMBER)
+
#######################################################################
# our phony targets
-PHONY+= clean-abuild coreboot lint lint-stable build-dirs
+PHONY+= clean-abuild coreboot lint lint-stable build-dirs build_complete
#######################################################################
# root source directories of coreboot
diff --git a/src/Kconfig b/src/Kconfig
index 4df037b..3f02843 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -407,6 +407,9 @@ config FMDFILE
endmenu
+# load site-local kconfig to allow user specific defaults and overrides
+source "site-local/Kconfig"
+
config SYSTEM_TYPE_LAPTOP
default n
bool
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13556
-gerrit
commit f97abf1650678497ee5163cac9250ff630d4c6a2
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Feb 2 09:43:12 2016 -0700
lint: Make sure site-local isn't committed to coreboot repo
Change-Id: I1dc9469e3d001fe0d5b0517d45679b056586b5b3
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/lint/lint-stable-013-site-local | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/util/lint/lint-stable-013-site-local b/util/lint/lint-stable-013-site-local
new file mode 100755
index 0000000..4d0b438
--- /dev/null
+++ b/util/lint/lint-stable-013-site-local
@@ -0,0 +1,29 @@
+#!/bin/sh
+# This file is part of the coreboot project.
+#
+# Copyright 2016 Google Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# DESCR: Verify that site-local is not in the coreboot repository
+#
+# Because site-local is intended for local use only, it should never be
+# pushed to coreboot.org. Even for committing it for local use, it's
+# recommended that it be kept in a separate repository, and pulled in
+# as a git submodule.
+
+LC_ALL=C export LC_ALL
+
+if [ -n "$(command -v git)" ] && [ -e ".git" ]; then
+ if [ -n "$(git ls-files site-local/*)" ]; then
+ echo "Error: site-local is in the coreboot repo."
+ fi
+fi
the following patch was just integrated into master:
commit c1e4f8995362c6eb7d09dfc0618edcc636d30acc
Author: Lee Leahy <leroy.p.leahy(a)intel.com>
Date: Thu Jan 7 11:24:24 2016 -0800
Documentation: Add x86 documentation for required files
Document the required files to perform a minimal coreboot/FSP build for
x86.
TEST=None
Change-Id: I65b2947114634fce982ce82fb7c577fd5f47ed10
Signed-off-by: Lee Leahy <leroy.p.leahy(a)intel.com>
Reviewed-on: https://review.coreboot.org/13438
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth(a)google.com>
See https://review.coreboot.org/13438 for details.
-gerrit
the following patch was just integrated into master:
commit 2f91403303a66c5e724761a74863e3452291b154
Author: Martin Roth <martinroth(a)google.com>
Date: Fri Jan 15 10:20:11 2016 -0700
src: Fix various spelling and whitespace issues.
This fixes some spelling and whitespace issues that I came across
while working on various things in the tree.
There are no functional changes.
Change-Id: I33bc77282f2f94a1fc5f1bc713e44f72db20c1ab
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: https://review.coreboot.org/13016
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See https://review.coreboot.org/13016 for details.
-gerrit
the following patch was just integrated into master:
commit bda8a04b0105f2b097b07fa336891af6981541cb
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Feb 1 12:03:04 2016 +0100
build system: add Chrome OS futility to tools
Change-Id: I08925d110c6faa9e37107d63bfa75d0ab677d379
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
Reviewed-on: https://review.coreboot.org/13545
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
See https://review.coreboot.org/13545 for details.
-gerrit
the following patch was just integrated into master:
commit f92068d9c24f295983e4904d327f342ae39cb9ed
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Feb 1 12:02:29 2016 +0100
build system: avoid setting HOSTCC to " gcc"
Change-Id: I650b3a347edc2d575c5cbee2051f8ed7b4bd1645
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
Reviewed-on: https://review.coreboot.org/13544
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
See https://review.coreboot.org/13544 for details.
-gerrit