From 5e68ada809c11fc7e33613ac663df3698bdb3e3c Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 9 Feb 2016 13:50:11 +0100 Subject: [PATCH] Make upstream tree CrOS SDK friendly - Remove submodules, since CrOS glues repos together using portage - Add COMMIT-QUEUE.ini, PRESUBMIT.cfg, .checkpatch.conf from 2016.02 Change-Id: I06b428191699034bf20b086ce88b7b27c3deb41b Signed-off-by: Patrick Georgi Reviewed-on: https://chromium-review.googlesource.com/327003 Reviewed-by: Stefan Reinauer --- .checkpatch.conf | 15 +++++++++++++++ .gitmodules | 17 ----------------- 3rdparty/arm-trusted-firmware | 1 - 3rdparty/blobs | 1 - 3rdparty/chromeec | 1 - 3rdparty/vboot | 1 - COMMIT-QUEUE.ini | 12 ++++++++++++ PRESUBMIT.cfg | 12 ++++++++++++ util/nvidia/cbootimage | 1 - 9 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 .checkpatch.conf delete mode 160000 3rdparty/arm-trusted-firmware delete mode 160000 3rdparty/blobs delete mode 160000 3rdparty/chromeec delete mode 160000 3rdparty/vboot create mode 100644 COMMIT-QUEUE.ini create mode 100644 PRESUBMIT.cfg delete mode 160000 util/nvidia/cbootimage diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000000..499d0f1084 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,15 @@ +# Not Linux, so don't expect a Linux tree. +--no-tree + +# Require every Kconfig symbol to have at least two lines in their description. +--min-conf-desc-length=2 + +# Ignore aspects we don't follow here. +--ignore C99_COMMENTS +--ignore GLOBAL_INITIALISERS +--ignore INITIALISED_STATIC +--ignore NEW_TYPEDEFS +--ignore PREFER_ALIGNED +--ignore PREFER_PACKED +--ignore PREFER_PRINTF +--ignore SPLIT_STRING diff --git a/.gitmodules b/.gitmodules index ad6b899c4e..e69de29bb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,17 +0,0 @@ -[submodule "3rdparty/blobs"] - path = 3rdparty/blobs - url = ../blobs.git - update = none - ignore = dirty -[submodule "util/nvidia-cbootimage"] - path = util/nvidia/cbootimage - url = ../nvidia-cbootimage.git -[submodule "vboot"] - path = 3rdparty/vboot - url = ../vboot.git -[submodule "arm-trusted-firmware"] - path = 3rdparty/arm-trusted-firmware - url = ../arm-trusted-firmware.git -[submodule "3rdparty/chromeec"] - path = 3rdparty/chromeec - url = ../chrome-ec.git diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware deleted file mode 160000 index 32d4f82687..0000000000 --- a/3rdparty/arm-trusted-firmware +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 32d4f826875a49fe1c4632aa71d1c04372b386aa diff --git a/3rdparty/blobs b/3rdparty/blobs deleted file mode 160000 index cca0337ea0..0000000000 --- a/3rdparty/blobs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cca0337ea0fba8a07a73ad1627338dd5738f4d3f diff --git a/3rdparty/chromeec b/3rdparty/chromeec deleted file mode 160000 index 388a7fa8cf..0000000000 --- a/3rdparty/chromeec +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 388a7fa8cff831dcb5f25a3ea4bd67de898d865a diff --git a/3rdparty/vboot b/3rdparty/vboot deleted file mode 160000 index d187cd3fc7..0000000000 --- a/3rdparty/vboot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d187cd3fc792f8bcefbee4587c83eafbd08441fc diff --git a/COMMIT-QUEUE.ini b/COMMIT-QUEUE.ini new file mode 100644 index 0000000000..96600d2ea2 --- /dev/null +++ b/COMMIT-QUEUE.ini @@ -0,0 +1,12 @@ +# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Per-project Commit Queue settings. +# Documentation: http://goo.gl/4rZhAx + +[GENERAL] + +# Stages to ignore in the commit queue. If these steps break, your CL will be +# submitted anyway. Use with caution. +ignored-stages: HWTest VMTest diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg new file mode 100644 index 0000000000..cd86e69187 --- /dev/null +++ b/PRESUBMIT.cfg @@ -0,0 +1,12 @@ +# This config file disables some of the ChromiumOS source style checks for +# coreboot as they are directly conflicting with the coreboot coding +# guidelines. + +[Hook Overrides] +branch_check: true +checkpatch_check: true +signoff_check: true +#stray_whitespace_check: false +#long_line_check: false +cros_license_check: false +tab_check: false diff --git a/util/nvidia/cbootimage b/util/nvidia/cbootimage deleted file mode 160000 index efe19b2eb9..0000000000 --- a/util/nvidia/cbootimage +++ /dev/null @@ -1 +0,0 @@ -Subproject commit efe19b2eb9db7bb3ba913f0af7d5ececb173fe82