From 56ef23f1fd8c48f26fae017924e31a1f11f31e5e86ee246c6c044131dc08068f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 7 Feb 2016 09:19:57 +0000 Subject: [PATCH] Accepting request 358156 from home:pluskalm:branches:hardware - Update to 4.3 * cleanups and improvements to many of the utilities * cbfstool: Many fixes and extensions to integrate with FMAP * Add amdfwtool to combine AMD firmware blobs instead of using shell scripts. OBS-URL: https://build.opensuse.org/request/show/358156 OBS-URL: https://build.opensuse.org/package/show/hardware/coreboot-utils?expand=0&rev=20 --- coreboot-4.2.tar.xz | 3 --- coreboot-4.3.tar.xz | 3 +++ coreboot-utils.changes | 9 +++++++++ coreboot-utils.spec | 10 +++++----- k8resdump.diff | 8 +++++--- 5 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 coreboot-4.2.tar.xz create mode 100644 coreboot-4.3.tar.xz diff --git a/coreboot-4.2.tar.xz b/coreboot-4.2.tar.xz deleted file mode 100644 index c0adfd5..0000000 --- a/coreboot-4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9a737cdf252da547cc3500749d94428eeaed77e1ff170e618156a754deb0b9e -size 25524028 diff --git a/coreboot-4.3.tar.xz b/coreboot-4.3.tar.xz new file mode 100644 index 0000000..4c5a550 --- /dev/null +++ b/coreboot-4.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b0fa00596ff08e196d60aa901a1b782c6905c176faef13c16ed10eb7fd1f2d9 +size 25655692 diff --git a/coreboot-utils.changes b/coreboot-utils.changes index 60b2225..4751303 100644 --- a/coreboot-utils.changes +++ b/coreboot-utils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Feb 7 08:59:31 UTC 2016 - mpluskal@suse.com + +- Update to 4.3 + * cleanups and improvements to many of the utilities + * cbfstool: Many fixes and extensions to integrate with FMAP + * Add amdfwtool to combine AMD firmware blobs instead of using + shell scripts. + ------------------------------------------------------------------- Sun Dec 6 16:14:56 UTC 2015 - p.drouand@gmail.com diff --git a/coreboot-utils.spec b/coreboot-utils.spec index c0d6e72..ecf270f 100644 --- a/coreboot-utils.spec +++ b/coreboot-utils.spec @@ -1,7 +1,7 @@ # # spec file for package coreboot-utils # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +21,7 @@ Url: http://coreboot.org/ Summary: A universal flash programming utility License: GPL-2.0 Group: Development/Tools/Other -Version: 4.2 +Version: 4.3 Release: 0 Source0: http://www.coreboot.org/releases/coreboot-%{version}.tar.xz Patch2: k8resdump.diff @@ -46,13 +46,13 @@ make %{?_smp_mflags} CC="%{__cc} %{optflags}" -C util/superiotool 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/fletcher make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ifdfake make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ifdtool make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/cbfstool make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/k8resdump %ifarch %{ix86} x86_64 make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/inteltool +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}) %endif @@ -71,7 +71,6 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/ifdfake inst install util/ifdtool/ifdtool %{buildroot}%{_bindir} install util/cbfstool/cbfstool %{buildroot}%{_bindir} install util/cbmem/cbmem %{buildroot}%{_bindir} -install util/fletcher/fletcher %{buildroot}%{_bindir} install util/romcc/romcc %{buildroot}%{_bindir} install -pm644 util/romcc/romcc.1 %{buildroot}%{_mandir}/man1/ install util/k8resdump/k8resdump %{buildroot}%{_sbindir} @@ -80,6 +79,7 @@ install util/amdtools/k8-read-mem-settings.sh %{buildroot}%{_sbindir} %ifarch %{ix86} x86_64 make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/inteltool install install util/viatool/viatool %{buildroot}%{_bindir} +install util/amdfwtool/amdfwtool %{buildroot}%{_sbindir} make -C util/msrtool DESTDIR=%{buildroot} PREFIX=%{_prefix} install %endif @@ -104,13 +104,13 @@ install -pm644 util/msrtool/COPYING COPYING.msrtool %doc README.amdtools example_input.amdtools %{_bindir}/cbfstool %{_bindir}/cbmem -%{_bindir}/fletcher %{_bindir}/ifdfake %{_bindir}/ifdtool %{_bindir}/romcc %{_bindir}/viatool %{_sbindir}/ectool %{_sbindir}/inteltool +%{_sbindir}/amdfwtool %{_sbindir}/k8-compare-pci-space.pl %{_sbindir}/k8-interpret-extended-memory-settings.pl %{_sbindir}/k8-read-mem-settings.sh diff --git a/k8resdump.diff b/k8resdump.diff index 2e8fbef..2315c63 100644 --- a/k8resdump.diff +++ b/k8resdump.diff @@ -1,6 +1,8 @@ ---- a/util/k8resdump/Makefile -+++ b/util/k8resdump/Makefile -@@ -16,7 +16,7 @@ +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) ifeq ($(OS_ARCH), SunOS) LDFLAGS = -lpci else