summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-11 14:33:11 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-12 02:42:43 +0200
commitdee4420318be0e4685d6e9a4a208eceef7e0b21c (patch)
tree13fb2321b6a3a467b6779667cac51c798f0d6f85
parentf2c15f513622a24eb14f309921d52c6052b28f99 (diff)
downloadcoreboot-dee4420318be0e4685d6e9a4a208eceef7e0b21c.tar.xz
libpayload: Rename Config.in -> Kconfig
libpayload is the only Kconfig based project under the coreboot umbrella that is using Config.in as its name for Kconfig config files. Rename that to Kconfig as on the other projects for consistency. Change-Id: I1c69ec13582d88409384b492484535dcc5e1ad20 Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/10520 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
-rw-r--r--payloads/libpayload/Kconfig (renamed from payloads/libpayload/Config.in)5
-rw-r--r--payloads/libpayload/arch/Config.in33
-rw-r--r--payloads/libpayload/arch/arm/Kconfig (renamed from payloads/libpayload/arch/arm/Config.in)0
-rw-r--r--payloads/libpayload/arch/arm64/Kconfig (renamed from payloads/libpayload/arch/arm64/Config.in)0
-rw-r--r--payloads/libpayload/arch/mips/Kconfig (renamed from payloads/libpayload/arch/mips/Config.in)0
-rw-r--r--payloads/libpayload/arch/x86/Kconfig (renamed from payloads/libpayload/arch/x86/Config.in)0
-rw-r--r--payloads/libpayload/util/kconfig/Makefile2
7 files changed, 5 insertions, 35 deletions
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Kconfig
index 9bd06f7684..5c40170cce 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Kconfig
@@ -591,4 +591,7 @@ config IO_ADDRESS_SPACE
default n
bool
-source "arch/Config.in"
+source "arch/arm/Kconfig"
+source "arch/arm64/Kconfig"
+source "arch/mips/Kconfig"
+source "arch/x86/Kconfig"
diff --git a/payloads/libpayload/arch/Config.in b/payloads/libpayload/arch/Config.in
deleted file mode 100644
index 057fe2b590..0000000000
--- a/payloads/libpayload/arch/Config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-## This file is part of the libpayload project.
-##
-## Copyright (c) 2012 Google Inc.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions
-## are met:
-## 1. Redistributions of source code must retain the above copyright
-## notice, this list of conditions and the following disclaimer.
-## 2. Redistributions in binary form must reproduce the above copyright
-## notice, this list of conditions and the following disclaimer in the
-## documentation and/or other materials provided with the distribution.
-## 3. The name of the author may not be used to endorse or promote products
-## derived from this software without specific prior written permission.
-##
-## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-##
-
-source "arch/arm/Config.in"
-source "arch/arm64/Config.in"
-source "arch/mips/Config.in"
-source "arch/x86/Config.in"
diff --git a/payloads/libpayload/arch/arm/Config.in b/payloads/libpayload/arch/arm/Kconfig
index b1f2bb4a80..b1f2bb4a80 100644
--- a/payloads/libpayload/arch/arm/Config.in
+++ b/payloads/libpayload/arch/arm/Kconfig
diff --git a/payloads/libpayload/arch/arm64/Config.in b/payloads/libpayload/arch/arm64/Kconfig
index d2f8e5675a..d2f8e5675a 100644
--- a/payloads/libpayload/arch/arm64/Config.in
+++ b/payloads/libpayload/arch/arm64/Kconfig
diff --git a/payloads/libpayload/arch/mips/Config.in b/payloads/libpayload/arch/mips/Kconfig
index 8462218e4d..8462218e4d 100644
--- a/payloads/libpayload/arch/mips/Config.in
+++ b/payloads/libpayload/arch/mips/Kconfig
diff --git a/payloads/libpayload/arch/x86/Config.in b/payloads/libpayload/arch/x86/Kconfig
index 4a5e6bd88e..4a5e6bd88e 100644
--- a/payloads/libpayload/arch/x86/Config.in
+++ b/payloads/libpayload/arch/x86/Kconfig
diff --git a/payloads/libpayload/util/kconfig/Makefile b/payloads/libpayload/util/kconfig/Makefile
index 5931e28d0c..8d423fccc7 100644
--- a/payloads/libpayload/util/kconfig/Makefile
+++ b/payloads/libpayload/util/kconfig/Makefile
@@ -10,7 +10,7 @@ ifeq ($(_OS),MINGW32)
regex-objs=regex.o
endif
-Kconfig := Config.in
+Kconfig := Kconfig
xconfig: prepare $(objk)/qconf
$(Q)$(objk)/qconf $(Kconfig)