diff --git a/coreboot-4.5.tar.xz b/coreboot-4.5.tar.xz
deleted file mode 100644
index fe54417..0000000
--- a/coreboot-4.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ffdcb0d18f506c483f8fe99df54fe7d5769f834eeffdc23160b035fee2a6027
-size 28670092
diff --git a/coreboot-4.7.tar.xz b/coreboot-4.7.tar.xz
new file mode 100644
index 0000000..fc431d1
--- /dev/null
+++ b/coreboot-4.7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d68a83f8f687e8ea212b8c5bb501e24444b57c3f73896042d09628188c851368
+size 30139964
diff --git a/coreboot-4.7.tar.xz.sig b/coreboot-4.7.tar.xz.sig
new file mode 100644
index 0000000..9721360
--- /dev/null
+++ b/coreboot-4.7.tar.xz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABCQAGBQJaW/ytAAoJEBl5bCs+T333bKIQAIwIyRp1svihsYvKXc/tSVKQ
+OVuDei/fQeWwlH3gINViKtzi4nVH/M7A6DoWRAmaYVQ/PMs0zqCFSeClByl2QL+Y
+msaKb2u5i0WjAvPauEbBvooZtqBow1xKP78d7Dpw3ys5cU/nkQxvGkPZtSy3Idv5
+NInivfswAv+GlQYrXj8XiUbdwImS2YspbGlNUGqMwQkpVQ07dGMmBzE6XFhIa3oX
+UU36AmzZ2Ea9oGZZ2zBcQcM0sADzLKjomRa0MpWZmjdx97htLqCZkVfGAD3D+JuH
+y19lWVBse0uAHOE2ZWqQVODeOIsdVVZFfFtYeIqLPE2430s4ct6h51jUyL0Ik9/K
+ARNxu5cJu/J3tLorGT8MeaSKFH3jZrV0qlp0btIG4gFctmBrc5j32LVl7oXImQmN
+8kPlKj3sdCuO27LWjg0K4JFu4Ho53DH1W9mCf7f6vxj4sd5DoY/XS3biXZNK0JYS
+3pb09fPV8I0mf3f+rpubUaABB/LgojXc1VROBbXP0VJ61AYUZZtZLiVRQEKVCEsx
+IsfJKujBkCOlHuGbnP5bmr8FgESGCKa6Hqk7GMYKuaLzm0bJHoguhpLKZPMru1X3
+skdrpyKK8RKA3sXP+Yn/JGoSSWxlRNjOFaw3MUTAKdnq9gZLmehwSoDcHhOMC0OL
+Tu96FMXju5ygnmhHftKU
+=I45w
+-----END PGP SIGNATURE-----
diff --git a/coreboot-utils.changes b/coreboot-utils.changes
index c086f00..6eadb8d 100644
--- a/coreboot-utils.changes
+++ b/coreboot-utils.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon Jan 15 18:45:33 UTC 2018 - mardnh@gmx.de
+
+- Update to 4.7
+ * Full changelog:
+ https://coreboot.org/releases/coreboot-4.7-relnotes.txt
+- Rebase patches:
+ * k8resdump.diff
+ * no-pie.patch
+ * do-explicit-fallthrough.patch
+- Adjust CFLAGS for util/ifdtool
+
+-------------------------------------------------------------------
+Wed Jan 3 19:56:38 UTC 2018 - mardnh@gmx.de
+
+- verify source signature
+
+-------------------------------------------------------------------
+Fri Dec 29 20:37:20 UTC 2017 - mardnh@gmx.de
+
+- Update to 4.6
+ * Full changelog:
+ https://www.coreboot.org/releases/coreboot-4.6-relnotes.txt
+- Fix URL
+- Build with intelmetool
+
-------------------------------------------------------------------
Fri Jun 16 12:00:39 UTC 2017 - alarrosa@suse.com
diff --git a/coreboot-utils.keyring b/coreboot-utils.keyring
new file mode 100644
index 0000000..10d0533
--- /dev/null
+++ b/coreboot-utils.keyring
@@ -0,0 +1,84 @@
+
+
+
+
+Public Key Server -- Get "0x19796c2b3e4f7df7 "
+
+Public Key Server -- Get "0x19796c2b3e4f7df7 "
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.6
+Comment: Hostname: keyserver.ubuntu.com
+
+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
+JG97gjU=
+=CzD9
+-----END PGP PUBLIC KEY BLOCK-----
+
+
diff --git a/coreboot-utils.spec b/coreboot-utils.spec
index caa257f..73a195b 100644
--- a/coreboot-utils.spec
+++ b/coreboot-utils.spec
@@ -1,7 +1,7 @@
#
# spec file for package coreboot-utils
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,9 +21,12 @@ Url: http://coreboot.org/
Summary: A universal flash programming utility
License: GPL-2.0
Group: Development/Tools/Other
-Version: 4.5
+Version: 4.7
Release: 0
-Source0: http://www.coreboot.org/releases/coreboot-%{version}.tar.xz
+Source0: https://www.coreboot.org/releases/coreboot-%{version}.tar.xz
+Source1: https://www.coreboot.org/releases/coreboot-%{version}.tar.xz.sig
+#http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x19796C2B3E4F7DF7#/%%{name}.keyring
+Source3: %{name}.keyring
Patch1: no-pie.patch
Patch2: k8resdump.diff
Patch3: do-explicit-fallthrough.patch
@@ -56,13 +59,14 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -DCMOS_HAL=1 -I." -C util/nvramtool
make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/romcc romcc
make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/cbmem
make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ifdfake
-make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ifdtool
+make %{?_smp_mflags} CFLAGS="%{optflags} -I../../src/commonlib/include" -C util/ifdtool
make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/cbfstool
make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/k8resdump
%ifarch %{ix86} x86_64
CXXFLAGS="$CXXFLAGS -fPIC"
CFLAGS="$CFLAGS -fPIC"
make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/inteltool
+make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/intelmetool
make %{?_smp_mflags} HOSTCC="cc %{optflags}" -C util/amdfwtool
make %{?_smp_mflags} CFLAGS="%{optflags} -I." -C util/viatool
(cd util/msrtool && %configure && make %{?_smp_mflags})
@@ -78,6 +82,7 @@ make %{?_smp_mflags} PREFIX=%{buildroot}/%{_prefix} -C util/ectool install
make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/superiotool install
make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/nvramtool install
make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/ifdfake install
+make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/intelmetool install
# ifdtool & viatool install targets try to install a nonexistent manpage...
install util/ifdtool/ifdtool %{buildroot}%{_bindir}
install util/cbfstool/cbfstool %{buildroot}%{_bindir}
@@ -121,6 +126,7 @@ install -pm644 util/msrtool/COPYING COPYING.msrtool
%{_bindir}/viatool
%{_sbindir}/ectool
%{_sbindir}/inteltool
+%{_sbindir}/intelmetool
%{_sbindir}/amdfwtool
%{_sbindir}/k8-compare-pci-space.pl
%{_sbindir}/k8-interpret-extended-memory-settings.pl
diff --git a/do-explicit-fallthrough.patch b/do-explicit-fallthrough.patch
index af76b08..a77c770 100644
--- a/do-explicit-fallthrough.patch
+++ b/do-explicit-fallthrough.patch
@@ -1,12 +1,11 @@
-Index: coreboot-4.5/util/cbfstool/lz4/lib/lz4frame.c
-===================================================================
---- coreboot-4.5.orig/util/cbfstool/lz4/lib/lz4frame.c
-+++ coreboot-4.5/util/cbfstool/lz4/lib/lz4frame.c
-@@ -1091,7 +1091,7 @@ size_t LZ4F_decompress(LZ4F_decompressio
- dctxPtr->tmpInTarget = minFHSize; /* minimum to attempt decode */
+diff --git a/util/cbfstool/lz4/lib/lz4frame.c b/util/cbfstool/lz4/lib/lz4frame.c
+index f984b27..1505875 100644
+--- a/util/cbfstool/lz4/lib/lz4frame.c
++++ b/util/cbfstool/lz4/lib/lz4frame.c
+@@ -1092,6 +1092,7 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext,
dctxPtr->dStage = dstage_storeHeader;
}
--
+ /* Falls through. */
+ __attribute__ ((fallthrough));
case dstage_storeHeader:
{
diff --git a/k8resdump.diff b/k8resdump.diff
index 2315c63..ed2de00 100644
--- a/k8resdump.diff
+++ b/k8resdump.diff
@@ -1,13 +1,13 @@
-Index: coreboot-4.3/util/k8resdump/Makefile
-===================================================================
---- coreboot-4.3.orig/util/k8resdump/Makefile
-+++ coreboot-4.3/util/k8resdump/Makefile
-@@ -25,7 +25,7 @@ OS_ARCH = $(shell uname)
+diff --git a/util/k8resdump/Makefile b/util/k8resdump/Makefile
+index e260351..48651f2 100644
+--- a/util/k8resdump/Makefile
++++ b/util/k8resdump/Makefile
+@@ -24,7 +24,7 @@ OS_ARCH = $(shell uname)
ifeq ($(OS_ARCH), SunOS)
LDFLAGS = -lpci
else
-LDFLAGS = -lpci -lz -static
+LDFLAGS = -lpci -lz
- STRIP_ARGS = -s
endif
+ OBJS = k8resdump.o
diff --git a/no-pie.patch b/no-pie.patch
index 0b26b23..4f84522 100644
--- a/no-pie.patch
+++ b/no-pie.patch
@@ -1,15 +1,16 @@
-Index: coreboot-4.5/util/msrtool/Makefile.in
-===================================================================
---- coreboot-4.5.orig/util/msrtool/Makefile.in
-+++ coreboot-4.5/util/msrtool/Makefile.in
-@@ -19,8 +19,8 @@ PROGRAM = msrtool
+diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
+index 3d50f4c..adda869 100644
+--- a/util/msrtool/Makefile.in
++++ b/util/msrtool/Makefile.in
+@@ -19,8 +19,9 @@ PROGRAM = msrtool
CC = @CC@
INSTALL = @INSTALL@
PREFIX = @PREFIX@
--CFLAGS = @CFLAGS@ -fno-pic
+-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
+CFLAGS = @CFLAGS@ -fPIC -fno-PIE
+LDFLAGS = @LDFLAGS@ -fPIC -no-pie
++
TARGETS = geodegx2.o geodelx.o cs5536.o k8.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o
SYSTEMS = linux.o darwin.o freebsd.o