Idwer Vollering has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37968 )
Change subject: romcc: cleanup leftovers
......................................................................
romcc: cleanup leftovers
Change-Id: I5112e0ce66e3bcd8c1f020089278766d2f27edb8
Signed-off-by: Idwer Vollering <vidwer(a)gmail.com>
---
M .gitignore
M util/README.md
M util/abuild/abuild.1
M util/lint/check_lint_tests
M util/lint/lint-000-license-headers
M util/lint/lint-014-qualified-types
M util/lint/lint-extended-015-final-newlines
M util/lint/lint-stable-010-asm-syntax
8 files changed, 2 insertions(+), 31 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/37968/1
diff --git a/.gitignore b/.gitignore
index 0cc6ae2..86ddd19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,7 +115,6 @@
util/nvramtool/nvramtool
util/optionlist/Options.wiki
util/pmh7tool/pmh7tool
-util/romcc/build
util/runfw/googlesnow
util/superiotool/superiotool
util/vgabios/testbios
diff --git a/util/README.md b/util/README.md
index 55bcaab..66438a9 100644
--- a/util/README.md
+++ b/util/README.md
@@ -86,8 +86,6 @@
* _sifive-gpt.py_ - Wraps the bootblock in a GPT partition for
SiFive's bootrom. `Python3`
* __rockchip__ - Generate Rockchip idblock bootloader. `Python2`
-* __romcc__ - Compile a C source file generating a binary that does not
-implicitly use RAM. `C`
* __sconfig__ - coreboot device tree compiler `Lex` `Yacc`
* __scripts__
* _config_ - Manipulate options in a .config file from the
diff --git a/util/abuild/abuild.1 b/util/abuild/abuild.1
index 2eee84b..ccdfff6 100644
--- a/util/abuild/abuild.1
+++ b/util/abuild/abuild.1
@@ -78,7 +78,6 @@
.B abuild
is covered by the GNU General Public License (GPL), version 2 or later.
.SH SEE ALSO
-.BR romcc (1),
.BR flashrom (1).
.SH COPYRIGHT
2004 Stefan Reinauer
diff --git a/util/lint/check_lint_tests b/util/lint/check_lint_tests
index 6b1860f..20d49a7 100755
--- a/util/lint/check_lint_tests
+++ b/util/lint/check_lint_tests
@@ -35,11 +35,6 @@
sed -i "s/for more details./for more details.\n \* You${SPACE}should${SPACE}have received a copy of the GNU General Public License\n \* along with this program; if not, write to the Free Software\n \* Foundation, Inc./" ${TESTFILE009}
git add ${TESTFILE009}
-#lint-stable-010-asm-syntax
-TESTFILE010=src/arch/x86/bootblock_romcc.S
-sed -i "1s/^/.att${UNDERSCORE}syntax noprefix\n/" ${TESTFILE010}
-git add ${TESTFILE010}
-
#lint-stable-012-executable-bit
TESTFILE012=src/lib/libgcc.c
chmod +x ${TESTFILE012}
diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers
index 9b3553b..5adbc7c 100755
--- a/util/lint/lint-000-license-headers
+++ b/util/lint/lint-000-license-headers
@@ -24,8 +24,6 @@
^util/amdtools/example_input/|\
^util/cbfstool/lzma/|\
^util/kconfig/|\
-^util/romcc/tests|\
-^util/romcc/results|\
Kconfig|\
\<COPYING\>|\
\<LICENSE\>|\
diff --git a/util/lint/lint-014-qualified-types b/util/lint/lint-014-qualified-types
index 98679ea..976748f 100755
--- a/util/lint/lint-014-qualified-types
+++ b/util/lint/lint-014-qualified-types
@@ -17,7 +17,7 @@
LC_ALL=C export LC_ALL
INCLUDED_DIRS='^src/\|^util/\|payloads/libpayload\|payloads/coreinfo'
-EXCLUDED_DIRS='^src/vendorcode\|^util/romcc\|cbfstool/lzma\|cbfstool/lz4'
+EXCLUDED_DIRS='^src/vendorcode\|^util/cbfstool/lzma\|cbfstool/lz4'
INCLUDED_FILES='\.[ch]:'
# Use git grep if the code is in a git repo, otherwise use grep.
diff --git a/util/lint/lint-extended-015-final-newlines b/util/lint/lint-extended-015-final-newlines
index b5a503f..15462d6 100755
--- a/util/lint/lint-extended-015-final-newlines
+++ b/util/lint/lint-extended-015-final-newlines
@@ -18,7 +18,7 @@
PIDS=""
INCLUDED_DIRS_AND_FILES='util/* src/* payloads/* configs/* Makefile *.inc'
-EXCLUDED_DIRS='src/vendorcode/\|util/romcc/\|cbfstool/lzma/\|cbfstool/lz4/\|Documentation/\|build/\|3rdparty/\|\.git/\|coreboot-builds/\|util/nvidia/cbootimage/'
+EXCLUDED_DIRS='src/vendorcode/\|util/cbfstool/lzma/\|cbfstool/lz4/\|Documentation/\|build/\|3rdparty/\|\.git/\|coreboot-builds/\|util/nvidia/cbootimage/'
EXCLUDED_FILES='\.jpg$\|\.cksum$\|\.bin$\|\.vbt$\|\.hex$\|\.ico$\|\.o$\|\.bz2$\|\.xz$\|^.tmpconfig\|\.pyc$\|_shipped$\|sha256$\|\.png$\|\.patch$'
# Use git ls-files if the code is in a git repo, otherwise use find.
diff --git a/util/lint/lint-stable-010-asm-syntax b/util/lint/lint-stable-010-asm-syntax
index a102a77..e69de29 100755
--- a/util/lint/lint-stable-010-asm-syntax
+++ b/util/lint/lint-stable-010-asm-syntax
@@ -1,18 +0,0 @@
-#!/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.
-#
-# 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: Check that we use a single assembler syntax
-
-LC_ALL=C export LC_ALL
-git grep -n "\.\(att\|intel\)_syntax\>" | grep -v '\.patch:'
--
To view, visit https://review.coreboot.org/c/coreboot/+/37968
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5112e0ce66e3bcd8c1f020089278766d2f27edb8
Gerrit-Change-Number: 37968
Gerrit-PatchSet: 1
Gerrit-Owner: Idwer Vollering <vidwer(a)gmail.com>
Gerrit-MessageType: newchange
Hello Nico Huber, Patrick Georgi,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/42548
to review the following change.
Change subject: Add qc_blobs repository
......................................................................
Add qc_blobs repository
This patch adds a separate blobs repository for Qualcomm blobs,
analogous to the existing AMD blobs. Qualcomm's binary licenses allow
files to be redistributed and used by anyone, but they explicitly
require the user to agree to the license terms when just *downloading*
the binary (even if they're not using them to build any firmware). Some
community members do not like to have to agree to licenses for files
they're not actually using, so we are keeping these files separate from
the main blobs repository and adding an extra Kconfig to make sure the
user is aware of and must explicitly agree to this before downloading
these files.
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Change-Id: I247746c1b633343064c9f32ef1556000475d6c4a
---
M .gitmodules
A 3rdparty/qc_blobs
M Makefile.inc
M src/Kconfig
M util/abuild/abuild
M util/release/build-release
6 files changed, 31 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/42548/1
diff --git a/.gitmodules b/.gitmodules
index 9545bb6..bc4a6eb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,8 @@
path = 3rdparty/cmocka
url = ../cmocka.git
update = none
+[submodule "3rdparty/qc_blobs"]
+ path = 3rdparty/qc_blobs
+ url = ../qc_blobs.git
+ update = none
+ ignore = dirty
diff --git a/3rdparty/qc_blobs b/3rdparty/qc_blobs
new file mode 160000
index 0000000..126fef6
--- /dev/null
+++ b/3rdparty/qc_blobs
@@ -0,0 +1 @@
+Subproject commit 126fef6b996237403039aa603945fc4caa75c8d6
diff --git a/Makefile.inc b/Makefile.inc
index 86335d9..605913a 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -195,6 +195,9 @@
ifeq ($(CONFIG_USE_AMD_BLOBS),y)
forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/amd_blobs))
endif
+ifeq ($(CONFIG_USE_QC_BLOBS),y)
+forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/qc_blobs))
+endif
endif
UPDATED_SUBMODULES:=1
COREBOOT_EXPORTS += UPDATED_SUBMODULES
diff --git a/src/Kconfig b/src/Kconfig
index 621a582..30ab68a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -234,6 +234,26 @@
Note that for some products, omitting PSP, SMU images, or other items
may result in a nonbooting coreboot.rom.
+config USE_QC_BLOBS
+ bool "Allow QC blobs repository (selecting this agrees to the license)
+ depends on USE_BLOBS
+ help
+ This draws in the qc_blobs repository, which contains binary files
+ distributed by Qualcomm that are required to build firmware for
+ certain Qualcomm SoCs (including QcLib, QC-SEC, qtiseclib and QUP
+ firmware). If you say Y here you are implicitly agreeing to the
+ license agreements of all files in this repository (which you can
+ browse at https://review.coreboot.org/cgit/qc_blobs.git/tree/ ).
+
+ *******************************************************************
+ PLEASE MAKE SURE YOU READ ALL 'LICENSE' FILES IN ALL SUBDIRECTORIES
+ OF THIS REPOSITORY AND AGREE TO THEIR TERMS BEFORE SELECTING THIS!
+ *******************************************************************
+
+ Not selecting this option means certain Qualcomm SoCs and related
+ mainboards cannot be built and will be hidden from the "Mainboards"
+ section.
+
config COVERAGE
bool "Code coverage support"
depends on COMPILER_GCC
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 022567d..55d441f 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -714,7 +714,7 @@
shift;;
-B|--blobs) shift
customizing="${customizing}, blobs"
- configoptions="${configoptions}CONFIG_USE_AMD_BLOBS=y\nCONFIG_ADD_FSP_BINARIES=y\n"
+ configoptions="${configoptions}CONFIG_USE_AMD_BLOBS=y\nCONFIG_USE_QC_BLOBS=y\nCONFIG_ADD_FSP_BINARIES=y\n"
;;
-A|--any-toolchain) shift
customizing="${customizing}, any-toolchain"
diff --git a/util/release/build-release b/util/release/build-release
index 7ca6001..ce8e600 100755
--- a/util/release/build-release
+++ b/util/release/build-release
@@ -72,6 +72,7 @@
exclude_paths+="3rdparty/fsp "
exclude_paths+="3rdparty/intel-microcode "
exclude_paths+="3rdparty/amd_blobs "
+exclude_paths+="3rdparty/qc_blobs "
for i in ${exclude_paths}; do
blobs_paths+="coreboot-${VERSION_NAME}/${i} "
exclude_opts+="--exclude=coreboot-${VERSION_NAME}/${i} "
--
To view, visit https://review.coreboot.org/c/coreboot/+/42548
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I247746c1b633343064c9f32ef1556000475d6c4a
Gerrit-Change-Number: 42548
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-MessageType: newchange