the following patch was just integrated into master:
commit 477bc97ba0298fe03d52a0b580fd219a0958c621
Author: Furquan Shaikh <furquan(a)google.com>
Date: Mon Aug 29 22:51:41 2016 -0700
soc/intel/apollolake: Use consistent convention for community names
Instead of using a mix of _N and _NORTH, _NW and _NORTHWEST for GPIO
community names, follow one single convention. This allows for re-using
macros easily.
Change-Id: Icd9cf9ef70d03576d864688cf5d6946124c259c3
Signed-off-by: Furquan Shaikh <furquan(a)google.com>
Reviewed-on: https://review.coreboot.org/16353
Reviewed-by: Lijian Zhao <lijian.zhao(a)intel.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See https://review.coreboot.org/16353 for details.
-gerrit
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16388
-gerrit
commit ccd13afde0cb87421deed2934213133dfbffa8a2
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Aug 31 21:26:17 2016 -0600
util/docker: Add a makefile for common docker tasks
Commands for working with docker images:
build-coreboot-sdk - Build coreboot-sdk container
upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com
build-coreboot-jenkins-node - Build coreboot-jenkins-node container
upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com
clean_coreboot_containers - remove all docker coreboot containers
clean_coreboot_images - remove all docker coreboot images
Commands for using docker images
docker_build_coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk
docker_abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk
Change-Id: I3a75b0615747d32f593948f53eab076f303271bf
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/docker/Makefile | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/util/docker/Makefile b/util/docker/Makefile
new file mode 100644
index 0000000..45e23b0
--- /dev/null
+++ b/util/docker/Makefile
@@ -0,0 +1,87 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 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.
+##
+## 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.
+##
+export top=$(abspath $(CURDIR)/../..)
+export crossgcc_version=$(shell $(top)/util/crossgcc/buildgcc --version | grep 'cross toolchain' | sed 's/^.*\sv//' | sed 's/\s.*$$//')
+export DOCKER:=$(shell env sh -c "command -v docker")
+
+test_docker:
+ $(if $(DOCKER),,\
+ $(warning Docker command not found. Please install docker) \
+ $(warning https://docs.docker.com/engine/installation ) \
+ $(error halting))
+
+test_docker_login: test_docker
+ $(if $(shell if [ ! -f ~/.docker/config.json ]; then \
+ echo "docker authentication file not found"; fi), \
+ $(error Docker authentication file not found. Run 'docker login'))
+
+coreboot-sdk: test_docker
+ $(DOCKER) build -t coreboot/coreboot-sdk:$(crossgcc_version) coreboot-sdk
+
+upload-coreboot-sdk: test_docker_login
+ $(DOCKER) push coreboot/coreboot-sdk:$(crossgcc_version)
+
+coreboot-jenkins-node: test_docker
+ $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(crossgcc_version) coreboot-jenkins-node
+
+upload-coreboot-jenkins-node: test_docker_login
+ $(DOCKER) push coreboot/coreboot-jenkins-node:$(crossgcc_version)
+
+clean_coreboot_containers: test_docker
+ $(DOCKER) rm $(docker ps -a | grep 'coreboot' | sed 's|\s.*$||')
+
+clean_coreboot_images: test_docker
+ $(DOCKER) rmi $(docker images | grep coreboot | sed 's|^\S\+\s\+\S\+\s\+||' | sed 's|\s.*$||')
+
+docker_build_coreboot: test_docker
+
+ $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
+ --rm coreboot/coreboot-sdk:$(crossgcc_version) \
+ /bin/bash -c "cd /home/coreboot/coreboot && \
+ make clean && \
+ make $(BUILD_CMD)"
+ @echo "Enter root password to chown files to $$(whoami):$$(id -gn $$(whoami))"
+ @echo "Exiting now will leave built files owned by root"
+ sudo chown -R $$(whoami):$$(id -gn $$(whoami)) $(top)
+
+docker_abuild: test_docker
+ $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
+ --rm coreboot/coreboot-sdk:$(crossgcc_version) \
+ /bin/bash -c "cd /home/coreboot/coreboot && \
+ make clean && \
+ util/abuild/abuild $(ABUILD_ARGS)"
+ @echo "Enter root password to chown files to $$(whoami):$$(id -gn $$(whoami))"
+ @echo "Exiting now will leave built files owned by root"
+ sudo chown -R $$(whoami):$$(id -gn $$(whoami)) $(top)
+
+help:
+ @echo "Commands for working with docker images:"
+ @echo " build-coreboot-sdk - Build coreboot-sdk container"
+ @echo " upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com"
+ @echo " build-coreboot-jenkins-node - Build coreboot-jenkins-node container"
+ @echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com"
+ @echo " clean_coreboot_containers - remove all docker coreboot containers"
+ @echo " clean_coreboot_images - remove all docker coreboot images"
+ @echo
+ @echo "Commands for using docker images"
+ @echo " docker_build_coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk"
+ @echo " docker_abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk"
+
+.PHONY: test_docker test_docker_login help
+.PHONY: build-coreboot-jenkins-node upload-coreboot-jenkins-node
+.PHONY: build-coreboot-sdk upload-coreboot-sdk
+.PHONY: clean_coreboot_containers clean_coreboot_images
+.PHONY: docker_build_coreboot docker_abuild
+.PHONY: help
\ No newline at end of file
the following patch was just integrated into master:
commit 079feec561c3433f0e64e11695b6477a9442b903
Author: Antonello Dettori <dev(a)dettori.io>
Date: Thu Aug 18 10:32:27 2016 +0200
nvramcui: remove undeclared variable
Remove an undeclared variable that was accidentally left over,
nvramcui is currently unable to compile and operate because of this.
Regression introduced in: 904dd303cbe99541025cbea008855f807a5d9f5c
(nvramcui: refactor code)
Fixes: https://ticket.coreboot.org/issues/70
Change-Id: Ieaba615838d7593546ab5696baf1b8f9828da345
Signed-off-by: Antonello Dettori <dev(a)dettori.io>
Reviewed-on: https://review.coreboot.org/16333
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth(a)google.com>
See https://review.coreboot.org/16333 for details.
-gerrit
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16388
-gerrit
commit 42fe568baea1c9db800e25d42ef36c4c429043ce
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Aug 31 21:26:17 2016 -0600
util/docker: Add a makefile for common docker tasks
Commands for working with docker images:
build-coreboot-sdk - Build coreboot-sdk container
upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com
build-coreboot-jenkins-node - Build coreboot-jenkins-node container
upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com
clean_coreboot_containers - remove all docker coreboot containers
clean_coreboot_images - remove all docker coreboot images
Commands for using docker images
docker_build_coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk
docker_abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk
Change-Id: I3a75b0615747d32f593948f53eab076f303271bf
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/docker/Makefile | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/util/docker/Makefile b/util/docker/Makefile
new file mode 100644
index 0000000..45e23b0
--- /dev/null
+++ b/util/docker/Makefile
@@ -0,0 +1,87 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 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.
+##
+## 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.
+##
+export top=$(abspath $(CURDIR)/../..)
+export crossgcc_version=$(shell $(top)/util/crossgcc/buildgcc --version | grep 'cross toolchain' | sed 's/^.*\sv//' | sed 's/\s.*$$//')
+export DOCKER:=$(shell env sh -c "command -v docker")
+
+test_docker:
+ $(if $(DOCKER),,\
+ $(warning Docker command not found. Please install docker) \
+ $(warning https://docs.docker.com/engine/installation ) \
+ $(error halting))
+
+test_docker_login: test_docker
+ $(if $(shell if [ ! -f ~/.docker/config.json ]; then \
+ echo "docker authentication file not found"; fi), \
+ $(error Docker authentication file not found. Run 'docker login'))
+
+coreboot-sdk: test_docker
+ $(DOCKER) build -t coreboot/coreboot-sdk:$(crossgcc_version) coreboot-sdk
+
+upload-coreboot-sdk: test_docker_login
+ $(DOCKER) push coreboot/coreboot-sdk:$(crossgcc_version)
+
+coreboot-jenkins-node: test_docker
+ $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(crossgcc_version) coreboot-jenkins-node
+
+upload-coreboot-jenkins-node: test_docker_login
+ $(DOCKER) push coreboot/coreboot-jenkins-node:$(crossgcc_version)
+
+clean_coreboot_containers: test_docker
+ $(DOCKER) rm $(docker ps -a | grep 'coreboot' | sed 's|\s.*$||')
+
+clean_coreboot_images: test_docker
+ $(DOCKER) rmi $(docker images | grep coreboot | sed 's|^\S\+\s\+\S\+\s\+||' | sed 's|\s.*$||')
+
+docker_build_coreboot: test_docker
+
+ $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
+ --rm coreboot/coreboot-sdk:$(crossgcc_version) \
+ /bin/bash -c "cd /home/coreboot/coreboot && \
+ make clean && \
+ make $(BUILD_CMD)"
+ @echo "Enter root password to chown files to $$(whoami):$$(id -gn $$(whoami))"
+ @echo "Exiting now will leave built files owned by root"
+ sudo chown -R $$(whoami):$$(id -gn $$(whoami)) $(top)
+
+docker_abuild: test_docker
+ $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
+ --rm coreboot/coreboot-sdk:$(crossgcc_version) \
+ /bin/bash -c "cd /home/coreboot/coreboot && \
+ make clean && \
+ util/abuild/abuild $(ABUILD_ARGS)"
+ @echo "Enter root password to chown files to $$(whoami):$$(id -gn $$(whoami))"
+ @echo "Exiting now will leave built files owned by root"
+ sudo chown -R $$(whoami):$$(id -gn $$(whoami)) $(top)
+
+help:
+ @echo "Commands for working with docker images:"
+ @echo " build-coreboot-sdk - Build coreboot-sdk container"
+ @echo " upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com"
+ @echo " build-coreboot-jenkins-node - Build coreboot-jenkins-node container"
+ @echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com"
+ @echo " clean_coreboot_containers - remove all docker coreboot containers"
+ @echo " clean_coreboot_images - remove all docker coreboot images"
+ @echo
+ @echo "Commands for using docker images"
+ @echo " docker_build_coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk"
+ @echo " docker_abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk"
+
+.PHONY: test_docker test_docker_login help
+.PHONY: build-coreboot-jenkins-node upload-coreboot-jenkins-node
+.PHONY: build-coreboot-sdk upload-coreboot-sdk
+.PHONY: clean_coreboot_containers clean_coreboot_images
+.PHONY: docker_build_coreboot docker_abuild
+.PHONY: help
\ No newline at end of file
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16388
-gerrit
commit 19a342f833c12e7491f81cb3fadf7b6e5c70684d
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Aug 31 21:26:17 2016 -0600
util/docker: Add a makefile for common docker tasks
Commands for working with docker images:
build-coreboot-sdk - Build coreboot-sdk container
upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com
build-coreboot-jenkins-node - Build coreboot-jenkins-node container
upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com
clean_coreboot_containers - remove all docker coreboot containers
clean_coreboot_images - remove all docker coreboot images
Commands for using docker images
docker_build_coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk
docker_abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk
Change-Id: I3a75b0615747d32f593948f53eab076f303271bf
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/docker/Makefile | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/util/docker/Makefile b/util/docker/Makefile
new file mode 100644
index 0000000..a5db5fa
--- /dev/null
+++ b/util/docker/Makefile
@@ -0,0 +1,87 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 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.
+##
+## 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.
+##
+export top=$(abspath $(CURDIR)/../..)
+export crossgcc_version=$(shell $(top)/util/crossgcc/buildgcc --version | grep 'cross toolchain' | sed 's/^.*\sv//' | sed 's/\s.*$$//')
+export DOCKER:=$(shell env sh -c "command -v docker")
+
+test_docker:
+ $(if $(DOCKER),,\
+ $(warning Docker command not found. Please install docker) \
+ $(warning https://docs.docker.com/engine/installation ) \
+ $(error halting))
+
+test_docker_login: test_docker
+ $(if $(shell if [ ! -f ~/.docker/config.json ]; then \
+ echo "docker authentication file not found"; fi), \
+ $(error Docker authentication file not found. Run 'docker login'))
+
+coreboot-sdk: test_docker
+ $(DOCKER) build -t coreboot/coreboot-sdk:$(crossgcc_version) coreboot-sdk
+
+upload-coreboot-sdk: test_docker_login
+ $(DOCKER) push coreboot/coreboot-sdk:$(crossgcc_version)
+
+coreboot-jenkins-node: test_docker
+ $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(crossgcc_version) coreboot-jenkins-node
+
+upload-coreboot-jenkins-node: test_docker_login
+ $(DOCKER) push coreboot/coreboot-jenkins-node:$(crossgcc_version)
+
+clean_coreboot_containers: test_docker
+ $(DOCKER) rm $(docker ps -a | grep 'coreboot' | sed 's|\s.*$||')
+
+clean_coreboot_images: test_docker
+ $(DOCKER) rmi $(docker images | grep coreboot | sed 's|^\S\+\s\+\S\+\s\+||' | sed 's|\s.*$||')
+
+docker_build_coreboot: test_docker
+
+ $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
+ --rm coreboot/coreboot-sdk:$(crossgcc_version) \
+ /bin/bash -c "cd /home/coreboot/coreboot && \
+ make clean && \
+ make $(BUILD_CMD)"
+ @echo "Enter root password to chown files to $$(whoami):$$(id -gn $$(whoami))"
+ @echo "Exiting now will leave built files owned by root"
+ sudo chown -R $$(whoami):$$(id -gn $$(whoami)) $(top)
+
+docker_abuild: test_docker
+ $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
+ --rm coreboot/coreboot-sdk:$(crossgcc_version) \
+ /bin/bash -c "cd /home/coreboot/coreboot && \
+ make clean && \
+ util/abuild/abuild $(ABUILD_ARGS)"
+ @echo "Enter root password to chown files to $$(whoami):$$(id -gn $$(whoami))"
+ @echo "Exiting now will leave built files owned by root"
+ sudo chown -R $$(whoami):$$(id -gn $$(whoami)) $(top)
+
+help:
+ @echo "Commands for working with docker images:"
+ @echo " build-coreboot-sdk - Build coreboot-sdk container"
+ @echo " upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com"
+ @echo " build-coreboot-jenkins-node - Build coreboot-jenkins-node container"
+ @echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com"
+ @echo " clean_coreboot_containers - remove all docker coreboot containers"
+ @echo " clean_coreboot_images - remove all docker coreboot images"
+ @echo
+ @echo "Commands for using docker images"
+ @echo " docker_build_coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk"
+ @echo " docker_abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk"
+
+.PHONY: test_docker test_docker_login help
+.PHONY: build-coreboot-jenkins-node upload-coreboot-jenkins-node
+.PHONY: build-coreboot-sdk upload-coreboot-sdk
+.PHONY: clean_coreboot_containers clean_coreboot_images
+.PHONY: docker_build_coreboot docker_abuild
+.PHONY: help
\ No newline at end of file