coreboot February 2013

coreboot@coreboot.org

27 participants
790 discussions

Patch set updated for coreboot: c228d09 crossgcc: fix building acpica on BSD/non-linux
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2340 -gerrit commit c228d09ec218dc3590c5a218a527d7e819184eb4 Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sat Feb 9 19:23:35 2013 +0100 crossgcc: fix building acpica on BSD/non-linux Fix building acpica on BSD/non-linux. Rename patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch to patches/acpica-unix-20121114_drop_unknown_cflags.patch Error message: cc1: warnings being treated as errors ../../../source/components/executer/exdump.c: In function 'AcpiExDumpObject': ../../../source/components/executer/exdump.c:516: warning: cast from function call of type 'const char *' to non-matching type 'unsigned int' gmake[2]: *** [obj32/exdump.o] Error 1 Also new is the removal of -Wempty-body. Reason of its removal: cc -c -O -m32 -D_CYGWIN -D_GNU_SOURCE -D_FORTIFY_SOURCE=2 -I../../../source/include -DACPI_ASL_COMPILER -I../../../source/compiler -Iobj32 -ansi -Wall -Wbad-function-cast -Wdeclaration-after-statement -Werror -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wstrict-aliasing=0 -Wstrict-prototypes -Wswitch-default -Wpointer-arith -Wundef -Waddress -Waggregate-return -Wchar-subscripts -Wempty-body -Wmissing-declarations -Wmissing-field-initializers -Wnested-externs -Wold-style-definition -Wredundant-decls -oobj32/adfile.o ../../../source/common/adfile.c cc1: error: unrecognized command line option "-Wempty-body" This change doesn't appear to be required for GNU/linuxes. Change-Id: Ia1d2915257af2a6631b5294b56f0f66b3830af3c Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- ...nix-20121114_drop_cflags_unknown_to_xcode.patch | 20 --------------- .../acpica-unix-20121114_drop_unknown_cflags.patch | 29 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch deleted file mode 100644 index a4d55da..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 08:22:38.000000000 -0800 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2012-12-05 15:53:35.000000000 -0800 -@@ -135,15 +135,11 @@ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ -- -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ -- -Wmissing-parameter-type \ - -Wnested-externs \ -- -Wold-style-declaration \ - -Wold-style-definition \ -- -Wredundant-decls \ -- -Wtype-limits -+ -Wredundant-decls - - # - # Extra warning flags (possible future use) diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch new file mode 100644 index 0000000..cfc392c --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch @@ -0,0 +1,29 @@ +diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config +--- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 17:22:38.000000000 +0100 ++++ acpica-unix-20121114/generate/unix/Makefile.config 2013-02-09 17:57:59.000000000 +0100 +@@ -115,7 +115,6 @@ + CWARNINGFLAGS = \ + -ansi \ + -Wall \ +- -Wbad-function-cast \ + -Wdeclaration-after-statement \ + -Werror \ + -Wformat=2 \ +@@ -134,16 +133,11 @@ + -Waddress \ + -Waggregate-return \ + -Wchar-subscripts \ +- -Wempty-body \ +- -Wlogical-op \ + -Wmissing-declarations \ + -Wmissing-field-initializers \ +- -Wmissing-parameter-type \ + -Wnested-externs \ +- -Wold-style-declaration \ + -Wold-style-definition \ +- -Wredundant-decls \ +- -Wtype-limits ++ -Wredundant-decls + + # + # Extra warning flags (possible future use)

1 0

Patch set updated for coreboot: bb767d7 crossgcc: don't use libdl while building GDB on FreeBSD
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2342 -gerrit commit bb767d7b222a1aafa79b7068d0ec6d650126055e Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sat Feb 9 23:58:06 2013 +0100 crossgcc: don't use libdl while building GDB on FreeBSD crossgcc: fix building GDB on FreeBSD (and possibly NetBSD/OpenBSD). Since FreeBSD doesn't have libdl, these errors are shown: - config.log: /usr/bin/ld: cannot find -ldl - crossgcc-build.log: configure: error: C compiler cannot create executables Conditionally remove -ldl from LDFLAGS. Change-Id: I79c48da7e6700a4606c9e0c1314241db8997d3f3 Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- util/crossgcc/buildgcc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ad2bb65..ff35542 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -562,8 +562,13 @@ printf "Building GDB ${GDB_VERSION} ... " cd build-gdb export PYTHONHOME=$DESTDIR$TARGETDIR rm -f .failed + if [ $(uname) = "FreeBSD" -o $(uname) = "NetBSD" ] ; then LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ - -lpthread -ldl -lutil" \ + -lpthread -lutil" + else + LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ + -lpthread -ldl -lutil" + fi CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \ ../gdb-${GDB_VERSION}/configure --prefix=$TARGETDIR \ --target=${TARGETARCH} --disable-werror --disable-nls

1 0

Patch set updated for coreboot: cf9306b crossgcc: update to ACPICA 20130117
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2343 -gerrit commit cf9306ba15c20ddc978c0c482c262ccd68f973c8 Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sun Feb 10 00:33:39 2013 +0100 crossgcc: update to ACPICA 20130117 Update ACPICA to release 20130117. New version; new features (brokenness) to fix. See patches/acpica-unix-20130117_drop_unknown_cflags.patch Change-Id: I6c4346c22f2e97b7d289f56a9435a315f8fb54d4 Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- util/crossgcc/buildgcc | 6 +- ...0121114_32bit_optimization_fortify_source.patch | 11 --- .../acpica-unix-20121114_drop_unknown_cflags.patch | 29 -------- ...cpica-unix-20121114_no_remove_destination.patch | 12 ---- .../acpica-unix-20121114_override_make.patch | 80 --------------------- ...0130117_32bit_optimization_fortify_source.patch | 82 ++++++++++++++++++++++ .../acpica-unix-20130117_drop_unknown_cflags.patch | 30 ++++++++ ...cpica-unix-20130117_no_remove_destination.patch | 13 ++++ .../acpica-unix-20130117_override_make.patch | 82 ++++++++++++++++++++++ 9 files changed, 210 insertions(+), 135 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ad2bb65..02f7b9a 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -20,8 +20,8 @@ # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA # -CROSSGCC_DATE="December 4th, 2012" -CROSSGCC_VERSION="1.20" +CROSSGCC_DATE="February 10th, 2013" +CROSSGCC_VERSION="1.21" # default settings TARGETDIR=`pwd`/xgcc @@ -37,7 +37,7 @@ GCC_VERSION=4.7.2 GCC_AUTOCONF_VERSION=2.64 BINUTILS_VERSION=2.23 GDB_VERSION=7.5 -IASL_VERSION=20121114 +IASL_VERSION=20130117 PYTHON_VERSION=2.7.3 EXPAT_VERSION=2.1.0 diff --git a/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch b/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch deleted file mode 100644 index abf80bd..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur acpica-unix-20121114/generate/unix/Makefile.config acpica-unix-20121114.patched/generate/unix/Makefile.config ---- acpica-unix-20121114/generate/unix/Makefile.config 2012-11-14 17:22:38.000000000 +0100 -+++ acpica-unix-20121114.patched/generate/unix/Makefile.config 2012-11-15 21:19:36.683902859 +0100 -@@ -104,6 +104,7 @@ - # automatically included in -Wall. - # - CFLAGS += \ -+ -O \ - $(BITSFLAG) \ - -D$(HOST) \ - -D_GNU_SOURCE \ diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch deleted file mode 100644 index cfc392c..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 17:22:38.000000000 +0100 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2013-02-09 17:57:59.000000000 +0100 -@@ -115,7 +115,6 @@ - CWARNINGFLAGS = \ - -ansi \ - -Wall \ -- -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ -@@ -134,16 +133,11 @@ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ -- -Wempty-body \ -- -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ -- -Wmissing-parameter-type \ - -Wnested-externs \ -- -Wold-style-declaration \ - -Wold-style-definition \ -- -Wredundant-decls \ -- -Wtype-limits -+ -Wredundant-decls - - # - # Extra warning flags (possible future use) diff --git a/util/crossgcc/patches/acpica-unix-20121114_no_remove_destination.patch b/util/crossgcc/patches/acpica-unix-20121114_no_remove_destination.patch deleted file mode 100644 index 85a6f1b..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_no_remove_destination.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-12-05 16:11:48.000000000 -0800 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2012-12-05 16:12:31.000000000 -0800 -@@ -57,7 +57,7 @@ - # - COPYPROG = \ - @mkdir -p ../$(BINDIR); \ -- cp --remove-destination $(PROG) ../$(BINDIR); \ -+ cp $(PROG) ../$(BINDIR); \ - echo "Copied $(PROG) to $(FINAL_PROG)"; - - # diff --git a/util/crossgcc/patches/acpica-unix-20121114_override_make.patch b/util/crossgcc/patches/acpica-unix-20121114_override_make.patch deleted file mode 100644 index c4ce67f..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_override_make.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nurbs acpica-unix-20121114.orig/generate/unix/Makefile.common acpica-unix-20121114/generate/unix/Makefile.common ---- acpica-unix-20121114.orig/generate/unix/Makefile.common 2012-11-15 00:22:38.000000000 +0800 -+++ acpica-unix-20121114/generate/unix/Makefile.common 2013-02-09 12:11:55.994133871 +0800 -@@ -19,17 +19,17 @@ - if [ $(BITS) -eq 32 ]; then \ - echo "Forced 32-bit generation of $@"; \ - mkdir -p obj32; \ -- make BITS=32; \ -+ $(MAKE) BITS=32; \ - echo "32-bit version of $@:"; \ - ls -al ../bin32/$@; \ - elif [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ - mkdir -p obj64; \ -- make BITS=64; \ -+ $(MAKE) BITS=64; \ - echo "64-bit version of $@:"; \ - ls -al ../bin64/$@; \ - else \ - mkdir -p obj32; \ -- make BITS=32; \ -+ $(MAKE) BITS=32; \ - echo "32-bit version of $@:"; \ - ls -al ../bin32/$@; \ - fi; -@@ -47,7 +47,7 @@ - (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ - pwd; \ - mkdir -p obj32; \ -- make BITS=32; \ -+ $(MAKE) BITS=32; \ - echo "32-bit version of $$toolname:"; \ - ls -al obj32/$$toolname \ - ); \ -@@ -61,7 +61,7 @@ - (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ - pwd; \ - mkdir -p obj64; \ -- make BITS=64; \ -+ $(MAKE) BITS=64; \ - echo "64-bit version of $$toolname:"; \ - ls -al obj64/$$toolname \ - ); \ -@@ -73,11 +73,11 @@ - echo "Removing $$toolname"; \ - pwd; \ - if [ -d "obj32" ] ; then \ -- make BITS=32 clean; \ -+ $(MAKE) BITS=32 clean; \ - rmdir obj32; \ - fi; \ - if [ -d "obj64" ] ; then \ -- make BITS=64 clean; \ -+ $(MAKE) BITS=64 clean; \ - rmdir obj64; \ - fi; \ - echo ""; \ -@@ -92,10 +92,10 @@ - (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ - pwd; \ - if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ -- make BITS=64 PROG=$$toolname install; \ -+ $(MAKE) BITS=64 PROG=$$toolname install; \ - echo "Installed 64-bit version of $$toolname"; \ - else \ -- make BITS=32 PROG=$$toolname install; \ -+ $(MAKE) BITS=32 PROG=$$toolname install; \ - echo "Installed 32-bit version of $$toolname"; \ - fi; \ - echo ""; \ -diff -Nurbs acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-15 00:22:38.000000000 +0800 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2013-02-09 12:11:12.978134325 +0800 -@@ -31,6 +31,7 @@ - PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl - HOST = _CYGWIN - CC = gcc -+MAKE = make - - # - # Common defines diff --git a/util/crossgcc/patches/acpica-unix-20130117_32bit_optimization_fortify_source.patch b/util/crossgcc/patches/acpica-unix-20130117_32bit_optimization_fortify_source.patch new file mode 100644 index 0000000..de94962 --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20130117_32bit_optimization_fortify_source.patch @@ -0,0 +1,82 @@ +diff -ur acpica-unix-20130117.orig/generate/unix/Makefile.common acpica-unix-20130117/generate/unix/Makefile.common +--- acpica-unix-20130117.orig/generate/unix/Makefile.common 2013-01-17 20:47:17.000000000 +0100 ++++ acpica-unix-20130117/generate/unix/Makefile.common 2013-02-10 00:23:13.000000000 +0100 +@@ -19,17 +19,17 @@ + if [ $(BITS) -eq 32 ]; then \ + echo "Forced 32-bit generation of $@"; \ + mkdir -p obj32; \ +- make BITS=32; \ ++ $(MAKE) BITS=32; \ + echo "32-bit version of $@:"; \ + ls -al ../bin32/$@; \ + elif [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ + mkdir -p obj64; \ +- make BITS=64; \ ++ $(MAKE) BITS=64; \ + echo "64-bit version of $@:"; \ + ls -al ../bin64/$@; \ + else \ + mkdir -p obj32; \ +- make BITS=32; \ ++ $(MAKE) BITS=32; \ + echo "32-bit version of $@:"; \ + ls -al ../bin32/$@; \ + fi; +@@ -47,7 +47,7 @@ + (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ + pwd; \ + mkdir -p obj32; \ +- make BITS=32; \ ++ $(MAKE) BITS=32; \ + echo "32-bit version of $$toolname:"; \ + ls -al obj32/$$toolname \ + ); \ +@@ -61,7 +61,7 @@ + (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ + pwd; \ + mkdir -p obj64; \ +- make BITS=64; \ ++ $(MAKE) BITS=64; \ + echo "64-bit version of $$toolname:"; \ + ls -al obj64/$$toolname \ + ); \ +@@ -73,11 +73,11 @@ + echo "Removing $$toolname"; \ + pwd; \ + if [ -d "obj32" ] ; then \ +- make BITS=32 clean; \ ++ $(MAKE) BITS=32 clean; \ + rmdir obj32; \ + fi; \ + if [ -d "obj64" ] ; then \ +- make BITS=64 clean; \ ++ $(MAKE) BITS=64 clean; \ + rmdir obj64; \ + fi; \ + echo ""; \ +@@ -92,10 +92,10 @@ + (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ + pwd; \ + if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ +- make BITS=64 PROG=$$toolname install; \ ++ $(MAKE) BITS=64 PROG=$$toolname install; \ + echo "Installed 64-bit version of $$toolname"; \ + else \ +- make BITS=32 PROG=$$toolname install; \ ++ $(MAKE) BITS=32 PROG=$$toolname install; \ + echo "Installed 32-bit version of $$toolname"; \ + fi; \ + echo ""; \ +Only in acpica-unix-20130117/generate/unix: Makefile.common.orig +diff -ur acpica-unix-20130117.orig/generate/unix/Makefile.config acpica-unix-20130117/generate/unix/Makefile.config +--- acpica-unix-20130117.orig/generate/unix/Makefile.config 2013-01-17 20:47:17.000000000 +0100 ++++ acpica-unix-20130117/generate/unix/Makefile.config 2013-02-10 00:23:13.000000000 +0100 +@@ -31,6 +31,7 @@ + PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl + HOST = _CYGWIN + CC = gcc ++MAKE = make + + # + # Common defines +Only in acpica-unix-20130117/generate/unix: Makefile.config.orig diff --git a/util/crossgcc/patches/acpica-unix-20130117_drop_unknown_cflags.patch b/util/crossgcc/patches/acpica-unix-20130117_drop_unknown_cflags.patch new file mode 100644 index 0000000..80d4795 --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20130117_drop_unknown_cflags.patch @@ -0,0 +1,30 @@ +diff -ur acpica-unix-20130117.orig/generate/unix/Makefile.config acpica-unix-20130117/generate/unix/Makefile.config +--- acpica-unix-20130117.orig/generate/unix/Makefile.config 2013-01-17 20:47:17.000000000 +0100 ++++ acpica-unix-20130117/generate/unix/Makefile.config 2013-02-10 00:27:38.000000000 +0100 +@@ -115,7 +115,6 @@ + CWARNINGFLAGS = \ + -ansi \ + -Wall \ +- -Wbad-function-cast \ + -Wdeclaration-after-statement \ + -Werror \ + -Wformat=2 \ +@@ -134,16 +133,11 @@ + -Waddress \ + -Waggregate-return \ + -Wchar-subscripts \ +- -Wempty-body \ +- -Wlogical-op \ + -Wmissing-declarations \ + -Wmissing-field-initializers \ +- -Wmissing-parameter-type \ + -Wnested-externs \ +- -Wold-style-declaration \ + -Wold-style-definition \ +- -Wredundant-decls \ +- -Wtype-limits ++ -Wredundant-decls + + # + # Extra warning flags (possible future use) +Only in acpica-unix-20130117/generate/unix: Makefile.config.orig diff --git a/util/crossgcc/patches/acpica-unix-20130117_no_remove_destination.patch b/util/crossgcc/patches/acpica-unix-20130117_no_remove_destination.patch new file mode 100644 index 0000000..32f5c31 --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20130117_no_remove_destination.patch @@ -0,0 +1,13 @@ +diff -ur acpica-unix-20130117.orig/generate/unix/Makefile.config acpica-unix-20130117/generate/unix/Makefile.config +--- acpica-unix-20130117.orig/generate/unix/Makefile.config 2013-01-17 20:47:17.000000000 +0100 ++++ acpica-unix-20130117/generate/unix/Makefile.config 2013-02-10 00:24:41.000000000 +0100 +@@ -57,7 +57,7 @@ + # + COPYPROG = \ + @mkdir -p ../$(BINDIR); \ +- cp --remove-destination $(PROG) ../$(BINDIR); \ ++ cp $(PROG) ../$(BINDIR); \ + echo "Copied $(PROG) to $(FINAL_PROG)"; + + # +Only in acpica-unix-20130117/generate/unix: Makefile.config.orig diff --git a/util/crossgcc/patches/acpica-unix-20130117_override_make.patch b/util/crossgcc/patches/acpica-unix-20130117_override_make.patch new file mode 100644 index 0000000..24efdbc --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20130117_override_make.patch @@ -0,0 +1,82 @@ +diff -ur acpica-unix-20130117.orig/generate/unix/Makefile.common acpica-unix-20130117/generate/unix/Makefile.common +--- acpica-unix-20130117.orig/generate/unix/Makefile.common 2013-01-17 20:47:17.000000000 +0100 ++++ acpica-unix-20130117/generate/unix/Makefile.common 2013-02-10 00:25:08.000000000 +0100 +@@ -19,17 +19,17 @@ + if [ $(BITS) -eq 32 ]; then \ + echo "Forced 32-bit generation of $@"; \ + mkdir -p obj32; \ +- make BITS=32; \ ++ $(MAKE) BITS=32; \ + echo "32-bit version of $@:"; \ + ls -al ../bin32/$@; \ + elif [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ + mkdir -p obj64; \ +- make BITS=64; \ ++ $(MAKE) BITS=64; \ + echo "64-bit version of $@:"; \ + ls -al ../bin64/$@; \ + else \ + mkdir -p obj32; \ +- make BITS=32; \ ++ $(MAKE) BITS=32; \ + echo "32-bit version of $@:"; \ + ls -al ../bin32/$@; \ + fi; +@@ -47,7 +47,7 @@ + (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ + pwd; \ + mkdir -p obj32; \ +- make BITS=32; \ ++ $(MAKE) BITS=32; \ + echo "32-bit version of $$toolname:"; \ + ls -al obj32/$$toolname \ + ); \ +@@ -61,7 +61,7 @@ + (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ + pwd; \ + mkdir -p obj64; \ +- make BITS=64; \ ++ $(MAKE) BITS=64; \ + echo "64-bit version of $$toolname:"; \ + ls -al obj64/$$toolname \ + ); \ +@@ -73,11 +73,11 @@ + echo "Removing $$toolname"; \ + pwd; \ + if [ -d "obj32" ] ; then \ +- make BITS=32 clean; \ ++ $(MAKE) BITS=32 clean; \ + rmdir obj32; \ + fi; \ + if [ -d "obj64" ] ; then \ +- make BITS=64 clean; \ ++ $(MAKE) BITS=64 clean; \ + rmdir obj64; \ + fi; \ + echo ""; \ +@@ -92,10 +92,10 @@ + (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ + pwd; \ + if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ +- make BITS=64 PROG=$$toolname install; \ ++ $(MAKE) BITS=64 PROG=$$toolname install; \ + echo "Installed 64-bit version of $$toolname"; \ + else \ +- make BITS=32 PROG=$$toolname install; \ ++ $(MAKE) BITS=32 PROG=$$toolname install; \ + echo "Installed 32-bit version of $$toolname"; \ + fi; \ + echo ""; \ +Only in acpica-unix-20130117/generate/unix: Makefile.common.orig +diff -ur acpica-unix-20130117.orig/generate/unix/Makefile.config acpica-unix-20130117/generate/unix/Makefile.config +--- acpica-unix-20130117.orig/generate/unix/Makefile.config 2013-01-17 20:47:17.000000000 +0100 ++++ acpica-unix-20130117/generate/unix/Makefile.config 2013-02-10 00:25:08.000000000 +0100 +@@ -31,6 +31,7 @@ + PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl + HOST = _CYGWIN + CC = gcc ++MAKE = make + + # + # Common defines +Only in acpica-unix-20130117/generate/unix: Makefile.config.orig

1 0

New patch to review for coreboot: 53b42ad AMD SB900: fix warnings
by Martin Roth 10 Feb '13

10 Feb '13

Martin Roth (martin.roth(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2349 -gerrit commit 53b42ad1978dad9048222dec4e7609dea1b4f898 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Feb 10 14:26:20 2013 -0700 AMD SB900: fix warnings Add a prototype to a .h file Remove an unused file (GppHp.c) from the build by deleting it from the makefile. I left the file since this is vendorcode. This is the code for PCIe hotplug. Inside GppHp.c, make functions not called from outside static. This obviously isn't important since the file isn't used, but for the sake of the cleanup I thought I'd go ahead with it... This was tested with the torpedo build. This fixes these warnings: src/vendorcode/amd/cimx/sb900/Dispatcher.c: In function 'LocateImage': src/vendorcode/amd/cimx/sb900/Dispatcher.c:193:38: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] src/vendorcode/amd/cimx/sb900/Usb.c:740:1: warning: no previous prototype for 'XhciA12Fix' [-Wmissing-prototypes] src/vendorcode/amd/cimx/sb900/GppHp.c:65:1: warning: no previous prototype for 'sbGppHotPlugSmiProcess' [-Wmissing-prototypes] src/vendorcode/amd/cimx/sb900/GppHp.c: In function 'sbGppHotPlugSmiProcess': src/vendorcode/amd/cimx/sb900/GppHp.c:76:5: warning: implicit declaration of function 'SbStall' [-Wimplicit-function-declaration] src/vendorcode/amd/cimx/sb900/GppHp.c: At top level: src/vendorcode/amd/cimx/sb900/GppHp.c:101:1: warning: no previous prototype for 'sbGppHotUnplugSmiProcess' [-Wmissing-prototypes] src/vendorcode/amd/cimx/sb900/GppHp.c:134:1: warning: no previous prototype for 'sbGppHotplugSmiCallback' [-Wmissing-prototypes] src/vendorcode/amd/cimx/sb900/GppHp.c: In function 'sbGppHotplugSmiCallback': src/vendorcode/amd/cimx/sb900/GppHp.c:158:5: warning: implicit declaration of function 'outPort80' [-Wimplicit-function-declaration] Change-Id: I5a1a20eeb81e1f4d59e3e3192f081e11d8506f56 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/vendorcode/amd/cimx/sb900/Dispatcher.c | 2 +- src/vendorcode/amd/cimx/sb900/GppHp.c | 5 +++-- src/vendorcode/amd/cimx/sb900/Makefile.inc | 1 - src/vendorcode/amd/cimx/sb900/SbSubFun.h | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vendorcode/amd/cimx/sb900/Dispatcher.c b/src/vendorcode/amd/cimx/sb900/Dispatcher.c index 152ffc2..583f929 100644 --- a/src/vendorcode/amd/cimx/sb900/Dispatcher.c +++ b/src/vendorcode/amd/cimx/sb900/Dispatcher.c @@ -190,7 +190,7 @@ LocateImage ( #ifdef x64 12346789 #else - Result = VerifyImage (Signature, (VOID*) (__int64)ImagePtr); + Result = VerifyImage (Signature, (VOID*) (intptr_t) ImagePtr); #endif if ( Result != NULL ) { return Result; diff --git a/src/vendorcode/amd/cimx/sb900/GppHp.c b/src/vendorcode/amd/cimx/sb900/GppHp.c index 4975b8a..24f5ec8 100644 --- a/src/vendorcode/amd/cimx/sb900/GppHp.c +++ b/src/vendorcode/amd/cimx/sb900/GppHp.c @@ -43,6 +43,7 @@ */ #include "SbPlatform.h" #include "cbtypes.h" +#include "AmdSbLib.h" // // Declaration of external functions @@ -61,7 +62,7 @@ UINT8 GppPortPollingLtssm (IN AMDSBCFG* pConfig, IN UINT8 ActivePorts, IN BOOLEA * @param[in] HpPort The hot plug port number. * */ -VOID +static VOID sbGppHotPlugSmiProcess ( IN AMDSBCFG* pConfig, IN UINT32 HpPort @@ -97,7 +98,7 @@ sbGppHotPlugSmiProcess ( * @param[in] HpPort The hot plug port number. * */ -VOID +static VOID sbGppHotUnplugSmiProcess ( IN AMDSBCFG* pConfig, IN UINT32 HpPort diff --git a/src/vendorcode/amd/cimx/sb900/Makefile.inc b/src/vendorcode/amd/cimx/sb900/Makefile.inc index e29bdc9..75b499e 100755 --- a/src/vendorcode/amd/cimx/sb900/Makefile.inc +++ b/src/vendorcode/amd/cimx/sb900/Makefile.inc @@ -76,7 +76,6 @@ ramstage-y += Usb.c #ramstage-y += Legacy.c #ramstage-y += SbModInf.c ramstage-y += Debug.c -ramstage-y += GppHp.c ramstage-y += Hwm.c CIMX_CFLAGS = diff --git a/src/vendorcode/amd/cimx/sb900/SbSubFun.h b/src/vendorcode/amd/cimx/sb900/SbSubFun.h index 3349c1b..69563ef 100644 --- a/src/vendorcode/amd/cimx/sb900/SbSubFun.h +++ b/src/vendorcode/amd/cimx/sb900/SbSubFun.h @@ -605,3 +605,4 @@ void TurnOffCG2 (OUT void); */ void BackUpCG2 (OUT void); +void XhciA12Fix (OUT void); \ No newline at end of file

1 0

New patch to review for coreboot: 62a6f26 AMD Family12h: Fix warnings
by Martin Roth 10 Feb '13

10 Feb '13

Martin Roth (martin.roth(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2348 -gerrit commit 62a6f26387bb605b89fcd3e6e8c39417a576a7e3 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Feb 10 14:53:35 2013 -0700 AMD Family12h: Fix warnings Add needed prototypes to .h files. Remove unused variables and fix types in printk statements. Add #IFNDEFs around #DEFINEs to keep them from being defined twice. Fix a whole bunch of casts. Fix undefined pre-increment behaviour in a couple of macros. These now match the macros in the F14 tree. Change a value of 0xFF that was getting truncated when being assigned to a 4-bit bitfield to a value of 0x0f. This was tested with the torpedo build. This fixes roughly 132 of the 561 warnings in the coreboot build so I'm not going to list them all. Here is a sample of the warnings fixed: In file included from src/cpu/amd/agesa/family12/model_12_init.c:35:0: src/include/cpu/amd/amdfam12.h:52:5: warning: redundant redeclaration of 'get_initial_apicid' [-Wredundant-decls] In file included from src/cpu/amd/agesa/family12/model_12_init.c:34:0: src/include/cpu/amd/multicore.h:48:5: note: previous declaration of 'get_initial_apicid' was here src/northbridge/amd/agesa/family12/northbridge.c:50:10: warning: no previous prototype for 'get_node_pci' [-Wmissing-prototypes] src/northbridge/amd/agesa/family12/northbridge.c: In function 'get_hw_mem_hole_info': src/northbridge/amd/agesa/family12/northbridge.c:302:13: warning: unused variable 'i' [-Wunused-variable] src/northbridge/amd/agesa/family12/northbridge.c: In function 'domain_set_resources': src/northbridge/amd/agesa/family12/northbridge.c:587:5: warning: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'device_t' [-Wformat] src/northbridge/amd/agesa/family12/northbridge.c:587:5: warning: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'device_t' [-Wformat] src/northbridge/amd/agesa/family12/northbridge.c:716:1: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int' [-Wformat] In file included from src/mainboard/amd/torpedo/agesawrapper.h:31:0, from src/northbridge/amd/agesa/family12/northbridge.c:38: src/vendorcode/amd/agesa/f12/AGESA.h:1282:0: warning: "TOP_MEM" redefined [enabled by default] In file included from src/northbridge/amd/agesa/family12/northbridge.c:34:0: src/include/cpu/amd/mtrr.h:31:0: note: this is the location of the previous definition In file included from src/mainboard/amd/torpedo/agesawrapper.h:31:0, from src/northbridge/amd/agesa/family12/northbridge.c:38: src/vendorcode/amd/agesa/f12/AGESA.h:1283:0: warning: "TOP_MEM2" redefined [enabled by default] src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c: In function 'PcieInputParserGetNumberOfComplexes': src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c:99:19: warning: operation on 'ComplexList' may be undefined [-Wsequence-point] src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c: In function 'PcieInputParserGetLengthOfPcieEnginesList': src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c:126:20: warning: operation on 'PciePortList' may be undefined [-Wsequence-point] src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c: In function 'PcieInputParserGetLengthOfDdiEnginesList': src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c:153:19: warning: operation on 'DdiLinkList' may be undefined [-Wsequence-point] src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c: In function 'PcieInputParserGetComplexDescriptorOfSocket': src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c:225:17: warning: operation on 'ComplexList' may be undefined [-Wsequence-point] src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePhyServices.c:246:1: warning: no previous prototype for 'PcieFmForceDccRecalibrationCallback' [-Wmissing-prototypes] In file included from src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexConfig.c:58:0: src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/LlanoComplexData.h:120:5: warning: large integer implicitly truncated to unsigned type [-Woverflow] And fixed a boatload of these types of warning: src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c: In function 'HeapGetBaseAddress': src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c:687:17: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c:694:19: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c:701:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c:702:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c:705:23: warning: assignment makes integer from pointer without a cast [enabled by default] src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c:709:21: warning: assignment makes integer from pointer without a cast [enabled by default] Change-Id: I97fa0b8edb453eb582e4402c66482ae9f0a8f764 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/include/cpu/amd/amdfam12.h | 1 - src/northbridge/amd/agesa/family12/northbridge.c | 19 +++++----- src/northbridge/amd/agesa/family12/northbridge.h | 2 ++ src/vendorcode/amd/agesa/f12/AGESA.h | 4 +++ .../amd/agesa/f12/Legacy/Proc/Dispatcher.c | 6 ++-- .../amd/agesa/f12/Legacy/Proc/hobTransfer.c | 8 ++--- src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c | 4 +-- .../amd/agesa/f12/Proc/CPU/cpuApicUtilities.c | 4 +-- .../amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c | 2 +- .../amd/agesa/f12/Proc/CPU/cpuPostInit.c | 2 +- .../amd/agesa/f12/Proc/CPU/heapManager.c | 40 +++++++++++----------- .../amd/agesa/f12/Proc/Common/AmdS3LateRestore.c | 2 +- .../amd/agesa/f12/Proc/Common/AmdS3Save.c | 6 ++-- src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h | 2 +- .../GNB/Modules/GnbPcieConfig/PcieConfigData.c | 4 +-- .../Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.h | 4 +-- .../f12/Proc/GNB/PCIe/Family/LN/LlanoComplexData.h | 2 +- .../f12/Proc/GNB/PCIe/Family/PcieFamilyServices.h | 7 ++++ .../amd/agesa/f12/Proc/Mem/Feat/S3/mfs3.c | 10 +++--- 19 files changed, 70 insertions(+), 59 deletions(-) diff --git a/src/include/cpu/amd/amdfam12.h b/src/include/cpu/amd/amdfam12.h index cabd532..905fead 100644 --- a/src/include/cpu/amd/amdfam12.h +++ b/src/include/cpu/amd/amdfam12.h @@ -49,6 +49,5 @@ void wait_all_aps_started(u32 bsp_apicid); void allow_all_aps_stop(u32 bsp_apicid); #endif void get_bus_conf(void); -u32 get_initial_apicid(void); #endif /* CPU_AMD_FAM12_H */ diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 9c598e8..7c82e39 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -299,7 +299,6 @@ struct hw_mem_hole_info { static struct hw_mem_hole_info get_hw_mem_hole_info(void) { struct hw_mem_hole_info mem_hole; - int i; mem_hole.hole_startk = CONFIG_HW_MEM_HOLE_SIZEK; mem_hole.node_id = -1; @@ -582,10 +581,8 @@ static void domain_read_resources(device_t dev) static void domain_set_resources(device_t dev) { - u32 val; printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__); - printk(BIOS_DEBUG, " amsr - incoming dev = %08lx\n",dev); - + printk(BIOS_DEBUG, " amsr - incoming dev = %08x\n", (u32) dev); #if CONFIG_PCI_64BIT_PREF_MEM struct resource *io, *mem1, *mem2; @@ -593,7 +590,7 @@ static void domain_set_resources(device_t dev) #endif unsigned long mmio_basek; u32 pci_tolm; - int i, idx; + int idx; struct bus *link; #if CONFIG_HW_MEM_HOLE_SIZEK != 0 struct hw_mem_hole_info mem_hole; @@ -712,8 +709,9 @@ printk(BIOS_DEBUG, "adsr - 0xa0000 to 0xbffff resource.\n"); sizek = limitk - 768; } - -printk(BIOS_DEBUG, "adsr: mmio_basek=%08x, basek=%08x, limitk=%08x\n", mmio_basek, basek, limitk); + printk(BIOS_DEBUG, + "adsr: mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", + mmio_basek, basek, limitk); /* split the region to accomodate pci memory space */ if ( (basek < 4*1024*1024 ) && (limitk > mmio_basek) ) { @@ -760,7 +758,7 @@ printk(BIOS_DEBUG, "adsr: mmio_basek=%08x, basek=%08x, limitk=%08x\n", mmio_bas /* Leave some space for ACPI, PIRQ and MP tables */ #if CONFIG_GFXUMA high_tables_base = uma_memory_base - HIGH_MEMORY_SIZE; - printk(BIOS_DEBUG, " adsr - uma_memory_base = %x.\n",uma_memory_base); + printk(BIOS_DEBUG, " adsr - uma_memory_base = %llx.\n", uma_memory_base); #else high_tables_base = (limitk * 1024) - HIGH_MEMORY_SIZE; #endif @@ -768,8 +766,9 @@ printk(BIOS_DEBUG, "adsr: mmio_basek=%08x, basek=%08x, limitk=%08x\n", mmio_bas } #endif } -printk(BIOS_DEBUG, " adsr - mmio_basek = %x.\n",mmio_basek); -printk(BIOS_DEBUG, " adsr - high_tables_size = %x.\n",high_tables_size); + printk(BIOS_DEBUG, " adsr - mmio_basek = %lx.\n", mmio_basek); + printk(BIOS_DEBUG, " adsr - high_tables_size = %llx.\n", + high_tables_size); #if CONFIG_GFXUMA uma_resource(dev, 7, uma_memory_base >> 10, uma_memory_size >> 10); diff --git a/src/northbridge/amd/agesa/family12/northbridge.h b/src/northbridge/amd/agesa/family12/northbridge.h index 8de80ff..d5c12f2 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.h +++ b/src/northbridge/amd/agesa/family12/northbridge.h @@ -23,4 +23,6 @@ static struct device_operations pci_domain_ops; static struct device_operations cpu_bus_ops; +device_t get_node_pci(u32 nodeid, u32 fn); + #endif /* NORTHBRIDGE_AMD_AGESA_FAM12H_H */ diff --git a/src/vendorcode/amd/agesa/f12/AGESA.h b/src/vendorcode/amd/agesa/f12/AGESA.h index b939eb4..9f61807 100644 --- a/src/vendorcode/amd/agesa/f12/AGESA.h +++ b/src/vendorcode/amd/agesa/f12/AGESA.h @@ -1279,8 +1279,12 @@ typedef enum { ///< CPU MSR Register definitions ------------------------------------------ #define SYS_CFG 0xC0010010 +#ifndef TOP_MEM #define TOP_MEM 0xC001001A +#endif +#ifndef TOP_MEM2 #define TOP_MEM2 0xC001001D +#endif #define HWCR 0xC0010015 #define NB_CFG 0xC001001F diff --git a/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c index 1c2a8c2..865c84f 100644 --- a/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c +++ b/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c @@ -104,7 +104,7 @@ AmdAgesaDispatcher ( // 2. Try next dispatcher if possible, and we have not already got status back if ((mCpuModuleID.NextBlock != NULL) && (Status == AGESA_UNSUPPORTED)) { - ModuleEntry = (MODULE_ENTRY) (UINT64) mCpuModuleID.NextBlock->ModuleDispatcher; + ModuleEntry = (MODULE_ENTRY) (intptr_t) mCpuModuleID.NextBlock->ModuleDispatcher; if (ModuleEntry != NULL) { Status = (*ModuleEntry) (ConfigPtr); } @@ -116,10 +116,10 @@ AmdAgesaDispatcher ( ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr; ImageEnd = ImageStart + 4; // Locate/test image base that matches this component - AltImagePtr = LibAmdLocateImage ((VOID *) (UINT64)ImageStart, (VOID *) (UINT64)ImageEnd, 4096, (CHAR8 *)AGESA_ID); + AltImagePtr = LibAmdLocateImage ((VOID *) (intptr_t) ImageStart, (VOID *) (intptr_t) ImageEnd, 4096, (CHAR8 *)AGESA_ID); if (AltImagePtr != NULL) { //Invoke alternative Image - ImageEntry = (IMAGE_ENTRY) ((UINT64) AltImagePtr + AltImagePtr->EntryPointAddress); + ImageEntry = (IMAGE_ENTRY) ((intptr_t) AltImagePtr + AltImagePtr->EntryPointAddress); Status = (*ImageEntry) (ConfigPtr); } } diff --git a/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c index c4a790a..bf8e6d2 100644 --- a/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c +++ b/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c @@ -208,12 +208,12 @@ CopyHeapToTempRamAtPost ( TotalSize = sizeof (HEAP_MANAGER); SizeOfNodeData = 0; AlignTo16ByteInTempMem = 0; - BaseAddressInCache = (UINT8 *) StdHeader->HeapBasePtr; + BaseAddressInCache = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; HeapManagerInCache = (HEAP_MANAGER *) BaseAddressInCache; HeapInCacheOffset = HeapManagerInCache->FirstActiveBufferOffset; HeapInCache = (BUFFER_NODE *) (BaseAddressInCache + HeapInCacheOffset); - BaseAddressInTempMem = (UINT8 *) UserOptions.CfgHeapDramAddress; + BaseAddressInTempMem = (UINT8 *) (intptr_t) UserOptions.CfgHeapDramAddress; HeapManagerInTempMem = (HEAP_MANAGER *) BaseAddressInTempMem; HeapInTempMem = (BUFFER_NODE *) (BaseAddressInTempMem + TotalSize); @@ -307,8 +307,8 @@ CopyHeapToMainRamAtPost ( TotalSize = sizeof (HEAP_MANAGER); SizeOfNodeData = 0; AlignTo16ByteInMainMem = 0; - BaseAddressInTempMem = (UINT8 *) StdHeader->HeapBasePtr; - HeapManagerInTempMem = (HEAP_MANAGER *) StdHeader->HeapBasePtr; + BaseAddressInTempMem = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; + HeapManagerInTempMem = (HEAP_MANAGER *) (intptr_t) StdHeader->HeapBasePtr; HeapInTempMemOffset = HeapManagerInTempMem->FirstActiveBufferOffset; HeapInTempMem = (BUFFER_NODE *) (BaseAddressInTempMem + HeapInTempMemOffset); diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c index 4a5fb91..6174e07 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c +++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c @@ -216,7 +216,7 @@ SaveDeviceContext ( UINT64 EndAddress; VOID *OrMask; - StartAddress = (UINT64) DeviceList; + StartAddress = (UINT64) (intptr_t) DeviceList; Device.CommonDeviceHeader = (DEVICE_DESCRIPTOR *) &DeviceList[1]; OrMask = (UINT8 *) DeviceList + DeviceList->RelativeOrMaskOffset; @@ -280,7 +280,7 @@ SaveDeviceContext ( break; } } - EndAddress = (UINT64) OrMask; + EndAddress = (UINT64) (intptr_t) OrMask; *ActualBufferSize = (UINT32) (EndAddress - StartAddress); } diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c index 37a84f7..06a1d7b 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c +++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c @@ -807,7 +807,7 @@ ApUtilSetupIdtForHlt ( DescSize = 8; } - HandlerOffset = (UINT64) NmiHandler; + HandlerOffset = (UINT64) (intptr_t) NmiHandler; NmiIdtDescPtr->OffsetLo = (UINT16) HandlerOffset & 0xFFFF; NmiIdtDescPtr->OffsetHi = (UINT16) (HandlerOffset >> 16); GetCsSelector (&NmiIdtDescPtr->Selector, StdHeader); @@ -816,7 +816,7 @@ ApUtilSetupIdtForHlt ( NmiIdtDescPtr->Offset64 = (UINT32) (HandlerOffset >> 32); NmiIdtDescPtr->Rsvd64 = 0; IdtInfo.Limit = (UINT16) ((DescSize * 3) - 1); - IdtInfo.Base = (UINT64) NmiIdtDescPtr - (DescSize * 2); + IdtInfo.Base = (UINT64) (intptr_t) NmiIdtDescPtr - (DescSize * 2); // IDS_EXCEPTION_TRAP (IDS_IDT_UPDATE_EXCEPTION_VECTOR_FOR_AP, &IdtInfo, StdHeader); SetIdtr (&IdtInfo , StdHeader); } diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c index c4d408a..2d9b221 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c +++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c @@ -205,7 +205,7 @@ LoadMicrocode ( PATCH_LOADER PatchLoaderMsr; // Load microcode patch into CPU - PatchLoaderMsr.RawData = (UINT64) MicrocodePatchPtr; + PatchLoaderMsr.RawData = (UINT64) (intptr_t) MicrocodePatchPtr; PatchLoaderMsr.BitFields.SBZ = 0; LibAmdMsrWrite (MSR_PATCH_LOADER, &PatchLoaderMsr.RawData, StdHeader); diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c index 5b90207..2c87c2b 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c +++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c @@ -217,7 +217,7 @@ GetPstateGatherDataAddressAtPost ( AddressValue = P_STATE_DATA_GATHER_TEMP_ADDR; - *Ptr = (UINT64 *)(AddressValue); + *Ptr = (UINT64 *) (intptr_t) (AddressValue); return AGESA_SUCCESS; } diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c index e45cb0b..dacaded 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c +++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c @@ -155,13 +155,13 @@ HeapManagerInit ( GetCpuServicesOfCurrentCore ((const CPU_SPECIFIC_SERVICES **)&FamilySpecificServices, StdHeader); FamilySpecificServices->GetCacheInfo (FamilySpecificServices, (const VOID **)&CacheInfoPtr, &Ignored, StdHeader); - HeapBufferPtr = (UINT8 *) StdHeader->HeapBasePtr; + HeapBufferPtr = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; // Check whether the heap manager is already initialized LibAmdMsrRead (AMD_MTRR_VARIABLE_HEAP_MASK, &MsrData, StdHeader); if (MsrData == (CacheInfoPtr->VariableMtrrMask & (UINT64) AMD_HEAP_MTRR_MASK)) { LibAmdMsrRead (AMD_MTRR_VARIABLE_HEAP_BASE, &MsrData, StdHeader); - if ((MsrData & CacheInfoPtr->HeapBaseMask) == ((UINT64) HeapBufferPtr & CacheInfoPtr->HeapBaseMask)) { + if ((MsrData & CacheInfoPtr->HeapBaseMask) == ((UINT64) (intptr_t) HeapBufferPtr & CacheInfoPtr->HeapBaseMask)) { if (((HEAP_MANAGER *) HeapBufferPtr)->Signature == HEAP_SIGNATURE_VALID) { // This is not a bug, there are multiple premem basic entry points, // and each will call heap init to make sure create struct will succeed. @@ -177,7 +177,7 @@ HeapManagerInit ( } // Set variable MTRR base and mask - MsrData = ((UINT64) HeapBufferPtr & CacheInfoPtr->HeapBaseMask); + MsrData = ((UINT64) (intptr_t) HeapBufferPtr & CacheInfoPtr->HeapBaseMask); MsrMask = CacheInfoPtr->VariableMtrrHeapMask & (UINT64) AMD_HEAP_MTRR_MASK; MsrData |= 0x06; @@ -306,20 +306,20 @@ HeapAllocateBuffer ( AllocateHeapParams->RequestedBufferSize += NUM_OF_SENTINEL * SIZE_OF_SENTINEL; // Get base address - BaseAddress = (UINT8 *) StdHeader->HeapBasePtr; + BaseAddress = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; HeapManager = (HEAP_MANAGER *) BaseAddress; // Check Heap database is valid if ((BaseAddress == NULL) || (HeapManager->Signature != HEAP_SIGNATURE_VALID)) { // The base address in StdHeader is incorrect, get base address by itself - BaseAddress = (UINT8 *) HeapGetBaseAddress (StdHeader); + BaseAddress = (UINT8 *) (intptr_t) HeapGetBaseAddress (StdHeader); HeapManager = (HEAP_MANAGER *) BaseAddress; if ((BaseAddress == NULL) || (HeapManager->Signature != HEAP_SIGNATURE_VALID)) { // Heap is not available, ASSERT here ASSERT (FALSE); return AGESA_ERROR; } - StdHeader->HeapBasePtr = (UINT64) BaseAddress; + StdHeader->HeapBasePtr = (UINT64) (intptr_t) BaseAddress; } // Allocate @@ -451,20 +451,20 @@ HeapDeallocateBuffer ( ASSERT (StdHeader != NULL); HeapLocateFlag = TRUE; - BaseAddress = (UINT8 *) StdHeader->HeapBasePtr; + BaseAddress = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; HeapManager = (HEAP_MANAGER *) BaseAddress; // Check Heap database is valid if ((BaseAddress == NULL) || (HeapManager->Signature != HEAP_SIGNATURE_VALID)) { // The base address in StdHeader is incorrect, get base address by itself - BaseAddress = (UINT8 *) HeapGetBaseAddress (StdHeader); + BaseAddress = (UINT8 *) (intptr_t) HeapGetBaseAddress (StdHeader); HeapManager = (HEAP_MANAGER *) BaseAddress; if ((BaseAddress == NULL) || (HeapManager->Signature != HEAP_SIGNATURE_VALID)) { // Heap is not available, ASSERT here ASSERT (FALSE); return AGESA_ERROR; } - StdHeader->HeapBasePtr = (UINT64) BaseAddress; + StdHeader->HeapBasePtr = (UINT64) (intptr_t) BaseAddress; } OffsetOfPreviousNode = AMD_HEAP_INVALID_HEAP_OFFSET; @@ -580,20 +580,20 @@ HeapLocateBuffer ( ASSERT (StdHeader != NULL); HeapLocateFlag = TRUE; - BaseAddress = (UINT8 *) StdHeader->HeapBasePtr; + BaseAddress = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; HeapManager = (HEAP_MANAGER *) BaseAddress; // Check Heap database is valid if ((BaseAddress == NULL) || (HeapManager->Signature != HEAP_SIGNATURE_VALID)) { // The base address in StdHeader is incorrect, get base address by itself - BaseAddress = (UINT8 *) HeapGetBaseAddress (StdHeader); + BaseAddress = (UINT8 *) (intptr_t) HeapGetBaseAddress (StdHeader); HeapManager = (HEAP_MANAGER *) BaseAddress; if ((BaseAddress == NULL) || (HeapManager->Signature != HEAP_SIGNATURE_VALID)) { // Heap is not available, ASSERT here ASSERT (FALSE); return AGESA_ERROR; } - StdHeader->HeapBasePtr = (UINT64) BaseAddress; + StdHeader->HeapBasePtr = (UINT64) (intptr_t) BaseAddress; } OffsetOfCurrentNode = HeapManager->FirstActiveBufferOffset; CurrentNode = (BUFFER_NODE *) (BaseAddress + OffsetOfCurrentNode); @@ -684,29 +684,29 @@ HeapGetBaseAddress ( // Firstly, we try to see if heap is in cache BaseAddress = HeapGetCurrentBase (StdHeader); - HeapManager = (HEAP_MANAGER *) BaseAddress; + HeapManager = (HEAP_MANAGER *) (intptr_t) BaseAddress; if ((HeapManager->Signature != HEAP_SIGNATURE_VALID) && (StdHeader->HeapStatus != HEAP_DO_NOT_EXIST_YET) && (StdHeader->HeapStatus != HEAP_LOCAL_CACHE)) { // Secondly, we try to see if heap is in temp memory BaseAddress = UserOptions.CfgHeapDramAddress; - HeapManager = (HEAP_MANAGER *) BaseAddress; + HeapManager = (HEAP_MANAGER *) (intptr_t) BaseAddress; if (HeapManager->Signature != HEAP_SIGNATURE_VALID) { // Thirdly, we try to see if heap in main memory // by locating with external buffer manager (IBV) AgesaBuffer.StdHeader = *StdHeader; AgesaBuffer.BufferHandle = AMD_HEAP_IN_MAIN_MEMORY_HANDLE; if (AgesaLocateBuffer (0, &AgesaBuffer) == AGESA_SUCCESS) { - BaseAddress = (UINT64) AgesaBuffer.BufferPointer; - HeapManager = (HEAP_MANAGER *) BaseAddress; + BaseAddress = (UINT64) (intptr_t) AgesaBuffer.BufferPointer; + HeapManager = (HEAP_MANAGER *) (intptr_t) BaseAddress; if (HeapManager->Signature != HEAP_SIGNATURE_VALID) { // No valid heap signature ever found, return a NULL pointer - BaseAddress = NULL; + BaseAddress = (UINT64) (intptr_t) NULL; } } else { // No heap buffer is allocated by external manager (IBV), return a NULL pointer - BaseAddress = NULL; + BaseAddress = (UINT64) (intptr_t) NULL; } } } @@ -748,7 +748,7 @@ DeleteFreeSpaceNode ( BUFFER_NODE *PreviousFreeSpaceNode; - BaseAddress = (UINT8 *) StdHeader->HeapBasePtr; + BaseAddress = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; HeapManager = (HEAP_MANAGER *) BaseAddress; OffsetOfPreviousNode = AMD_HEAP_INVALID_HEAP_OFFSET; @@ -807,7 +807,7 @@ InsertFreeSpaceNode ( BUFFER_NODE *PreviousFreeSpaceNode; BUFFER_NODE *LocalInsertFreeSpaceNode; - BaseAddress = (UINT8 *) StdHeader->HeapBasePtr; + BaseAddress = (UINT8 *) (intptr_t) StdHeader->HeapBasePtr; HeapManager = (HEAP_MANAGER *) BaseAddress; OffsetOfPreviousNode = AMD_HEAP_INVALID_HEAP_OFFSET; diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c index d2a0bf0..01665da 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c +++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c @@ -119,7 +119,7 @@ AmdS3LateRestore ( ASSERT (S3LateParams != NULL); BufferPointer = (UINT8 *) S3LateParams->S3DataBlock.VolatileStorage; - S3LateParams->StdHeader.HeapBasePtr = (UINT64)((UINT8 *)(&BufferPointer[(((S3_VOLATILE_STORAGE_HEADER *) S3LateParams->S3DataBlock.VolatileStorage)->HeapOffset)])); + S3LateParams->StdHeader.HeapBasePtr = (UINT64) (intptr_t) ((UINT8 *)(&BufferPointer[(((S3_VOLATILE_STORAGE_HEADER *) S3LateParams->S3DataBlock.VolatileStorage)->HeapOffset)])); ASSERT (S3LateParams->StdHeader.HeapBasePtr != 0); IDS_HDT_CONSOLE_INIT (&S3LateParams->StdHeader); diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c index ae07e42..66a6fa7 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c +++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c @@ -227,9 +227,9 @@ AmdS3Save ( BufferPointer = AllocParams.BufferPtr; AmdS3SaveParams->S3DataBlock.VolatileStorage = &(BufferPointer[EarlyBufferSize]); - ((S3_VOLATILE_STORAGE_HEADER *) AmdS3SaveParams->S3DataBlock.VolatileStorage)->HeapOffset = NULL; + ((S3_VOLATILE_STORAGE_HEADER *) AmdS3SaveParams->S3DataBlock.VolatileStorage)->HeapOffset = (intptr_t) NULL; ((S3_VOLATILE_STORAGE_HEADER *) AmdS3SaveParams->S3DataBlock.VolatileStorage)->HeapSize = HeapSize; - ((S3_VOLATILE_STORAGE_HEADER *) AmdS3SaveParams->S3DataBlock.VolatileStorage)->RegisterDataOffset = NULL; + ((S3_VOLATILE_STORAGE_HEADER *) AmdS3SaveParams->S3DataBlock.VolatileStorage)->RegisterDataOffset = (intptr_t) NULL; ((S3_VOLATILE_STORAGE_HEADER *) AmdS3SaveParams->S3DataBlock.VolatileStorage)->RegisterDataSize = LateContextSize; if (HeapSize != 0) { @@ -246,7 +246,7 @@ AmdS3Save ( HeapStatus = AmdS3SaveParams->StdHeader.HeapStatus; AmdS3SaveParams->StdHeader.HeapStatus = HEAP_S3_RESUME; - AmdS3SaveParams->StdHeader.HeapBasePtr = (UINT64) HeapPtr; + AmdS3SaveParams->StdHeader.HeapBasePtr = (UINT64) (intptr_t) HeapPtr; for (i = 0; i < S3LATE_TABLE_SIZE; i++) { if (HeapPtrs[i] != NULL) { diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h b/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h index 2842fd7..6839ba5 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h +++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/Gnb.h @@ -82,7 +82,7 @@ #define PVOID UINT64 -#define GnbLibGetHeader(x) ((AMD_CONFIG_PARAMS*) (x)->StdHeader) +#define GnbLibGetHeader(x) ((AMD_CONFIG_PARAMS*) (intptr_t) (x)->StdHeader) #define AGESA_STATUS_UPDATE(Current, Aggregated) \ if (Current > Aggregated) { \ diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c index 6f4f8fb..d69a896 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c +++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c @@ -195,7 +195,7 @@ PcieConfigBuildData ( return AGESA_FATAL; } LibAmdMemFill (Pcie, 0x00, sizeof (PCIe_PLATFORM_CONFIG) + ComplexesDataLength, StdHeader); - Pcie->StdHeader = (PVOID) StdHeader; + Pcie->StdHeader = (PVOID) (intptr_t) StdHeader; Pcie->Header.Child = offsetof (PCIe_PLATFORM_CONFIG, ComplexList); PcieConfigSetDescriptorFlags (Pcie, DESCRIPTOR_PLATFORM | DESCRIPTOR_TERMINATE_LIST | DESCRIPTOR_TERMINATE_TOPOLOGY); Buffer = (UINT8 *) (Pcie) + sizeof (PCIe_PLATFORM_CONFIG); @@ -422,7 +422,7 @@ PcieLocateConfigurationData ( return AGESA_FATAL; } PcieUpdateConfigurationData (*Pcie); - (*Pcie)->StdHeader = (PVOID) StdHeader; + (*Pcie)->StdHeader = (PVOID) (intptr_t) StdHeader; return AGESA_SUCCESS; } diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.h b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.h index e04d4ca..682e336 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.h +++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.h @@ -185,7 +185,7 @@ PcieUserConfigConfigDump ( #define PcieConfigGetChildWrapper(Descriptor) ((PCIe_WRAPPER_CONFIG *) PcieConfigGetChild (DESCRIPTOR_ALL_WRAPPERS, &((Descriptor)->Header))) #define PcieConfigGetChildEngine(Descriptor) ((PCIe_ENGINE_CONFIG *) PcieConfigGetChild (DESCRIPTOR_ALL_ENGINES, &((Descriptor)->Header))) #define PcieConfigGetChildSilicon(Descriptor) ((PCIe_SILICON_CONFIG *) PcieConfigGetChild (DESCRIPTOR_SILICON, &((Descriptor)->Header))) -#define PcieConfigGetNextDescriptor(Descriptor) (Descriptor != NULL ? ((((Descriptor->Header.DescriptorFlags & DESCRIPTOR_TERMINATE_LIST) != 0) ? NULL : (++Descriptor))) : NULL) +#define PcieConfigGetNextDescriptor(Descriptor) (Descriptor != NULL ? ((((Descriptor->Header.DescriptorFlags & DESCRIPTOR_TERMINATE_LIST) != 0) ? NULL : (Descriptor+1))) : NULL) #define PcieConfigIsPcieEngine(Descriptor) (Descriptor != NULL ? ((Descriptor->Header.DescriptorFlags & DESCRIPTOR_PCIE_ENGINE) != 0) : (1==0)) #define PcieConfigIsDdiEngine(Descriptor) (Descriptor != NULL ? ((Descriptor->Header.DescriptorFlags & DESCRIPTOR_DDI_ENGINE) != 0) : (1==0)) #define PcieConfigIsPcieWrapper(Descriptor) (Descriptor != NULL ? ((Descriptor->Header.DescriptorFlags & DESCRIPTOR_PCIE_WRAPPER) != 0) : (1==0)) @@ -195,7 +195,7 @@ PcieUserConfigConfigDump ( #define PcieConfigIsVirtualDesciptor(Descriptor) (Descriptor != NULL ? ((Descriptor->Header.DescriptorFlags & DESCRIPTOR_VIRTUAL) != 0) : (1==0)) #define PcieConfigSetDescriptorFlags(Descriptor, SetDescriptorFlags) (Descriptor)->Header.DescriptorFlags |= SetDescriptorFlags #define PcieConfigResetDescriptorFlags(Descriptor, ResetDescriptorFlags) ((PCIe_DESCRIPTOR_HEADER *) Descriptor)->DescriptorFlags &= (~(ResetDescriptorFlags)) -#define PcieInputParsetGetNextDescriptor(Descriptor) (Descriptor != NULL ? ((((Descriptor->Flags & DESCRIPTOR_TERMINATE_LIST) != 0) ? NULL : (++Descriptor))) : NULL) +#define PcieInputParsetGetNextDescriptor(Descriptor) (Descriptor != NULL ? ((((Descriptor->Flags & DESCRIPTOR_TERMINATE_LIST) != 0) ? NULL : (Descriptor+1))) : NULL) #define PcieConfigGetNextTopologyDescriptor(Descriptor, Termination) (((((PCIe_DESCRIPTOR_HEADER *) Descriptor)->DescriptorFlags & Termination) != 0) ? NULL : ((UINT8 *) Descriptor + ((PCIe_DESCRIPTOR_HEADER *) Descriptor)->Peer)) #endif diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/LlanoComplexData.h b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/LlanoComplexData.h index 5fa4f64..f15374e 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/LlanoComplexData.h +++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/LlanoComplexData.h @@ -117,7 +117,7 @@ F12_COMPLEX_CONFIG ComplexData = { DDI_NUMBER_OF_PIFs, DDI_START_PHY_LANE, DDI_END_PHY_LANE, - (UINT8)0xff, + 0x0f, 0x0, 8, { diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/PcieFamilyServices.h b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/PcieFamilyServices.h index a9a3863..bc250c2 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/PcieFamilyServices.h +++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/PcieFamilyServices.h @@ -48,6 +48,13 @@ #define _PCIECOMPLEXCONFIG_H_ +AGESA_STATUS +PcieFmForceDccRecalibrationCallback ( + IN PCIe_WRAPPER_CONFIG *Wrapper, + IN OUT VOID *Buffer, + IN PCIe_PLATFORM_CONFIG *Pcie + ); + VOID PcieFmPhyApplyGanging ( IN PCIe_WRAPPER_CONFIG *Wrapper, diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/Feat/S3/mfs3.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/Feat/S3/mfs3.c index fdf0d6b..728bd01 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/Mem/Feat/S3/mfs3.c +++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/Feat/S3/mfs3.c @@ -261,30 +261,30 @@ MemFS3GetDeviceList ( (*DeviceBlockHdrPtr)->RelativeOrMaskOffset = (UINT16) AllocHeapParams.RequestedBufferSize; // Copy device list on the stack to the heap. - BufferOffset = sizeof (DEVICE_BLOCK_HEADER) + (UINT64) AllocHeapParams.BufferPtr; + BufferOffset = sizeof (DEVICE_BLOCK_HEADER) + (UINT64) (intptr_t) AllocHeapParams.BufferPtr; for (Die = 0; Die < DieCount; Die ++) { for (i = PRESELFREF; i <= POSTSELFREF; i ++) { // Copy PCI device descriptor to the heap if it exists. if (DeviceDescript[Die].PCIDevice[i].RegisterListID != 0xFFFFFFFF) { - LibAmdMemCopy ((VOID *) BufferOffset, &(DeviceDescript[Die].PCIDevice[i]), sizeof (PCI_DEVICE_DESCRIPTOR), StdHeader); + LibAmdMemCopy ((VOID *) (intptr_t) BufferOffset, &(DeviceDescript[Die].PCIDevice[i]), sizeof (PCI_DEVICE_DESCRIPTOR), StdHeader); (*DeviceBlockHdrPtr)->NumDevices ++; BufferOffset += sizeof (PCI_DEVICE_DESCRIPTOR); } // Copy conditional PCI device descriptor to the heap if it exists. if (DeviceDescript[Die].CPCIDevice[i].RegisterListID != 0xFFFFFFFF) { - LibAmdMemCopy ((VOID *) BufferOffset, &(DeviceDescript[Die].CPCIDevice[i]), sizeof (CONDITIONAL_PCI_DEVICE_DESCRIPTOR), StdHeader); + LibAmdMemCopy ((VOID *) (intptr_t) BufferOffset, &(DeviceDescript[Die].CPCIDevice[i]), sizeof (CONDITIONAL_PCI_DEVICE_DESCRIPTOR), StdHeader); (*DeviceBlockHdrPtr)->NumDevices ++; BufferOffset += sizeof (CONDITIONAL_PCI_DEVICE_DESCRIPTOR); } // Copy MSR device descriptor to the heap if it exists. if (DeviceDescript[Die].MSRDevice[i].RegisterListID != 0xFFFFFFFF) { - LibAmdMemCopy ((VOID *) BufferOffset, &(DeviceDescript[Die].MSRDevice[i]), sizeof (MSR_DEVICE_DESCRIPTOR), StdHeader); + LibAmdMemCopy ((VOID *) (intptr_t) BufferOffset, &(DeviceDescript[Die].MSRDevice[i]), sizeof (MSR_DEVICE_DESCRIPTOR), StdHeader); (*DeviceBlockHdrPtr)->NumDevices ++; BufferOffset += sizeof (MSR_DEVICE_DESCRIPTOR); } // Copy conditional MSR device descriptor to the heap if it exists. if (DeviceDescript[Die].CMSRDevice[i].RegisterListID != 0xFFFFFFFF) { - LibAmdMemCopy ((VOID *) BufferOffset, &(DeviceDescript[Die].PCIDevice[i]), sizeof (CONDITIONAL_MSR_DEVICE_DESCRIPTOR), StdHeader); + LibAmdMemCopy ((VOID *) (intptr_t) BufferOffset, &(DeviceDescript[Die].PCIDevice[i]), sizeof (CONDITIONAL_MSR_DEVICE_DESCRIPTOR), StdHeader); (*DeviceBlockHdrPtr)->NumDevices ++; BufferOffset += sizeof (CONDITIONAL_MSR_DEVICE_DESCRIPTOR); }

1 0

Patch set updated for coreboot: b29acba crossgcc: fix building acpica on BSD/non-linux
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2340 -gerrit commit b29acbad96125b7c8e6ee7ead0a40bca0faba5ea Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sat Feb 9 19:23:35 2013 +0100 crossgcc: fix building acpica on BSD/non-linux Fix building acpica on BSD/non-linux. Error message: cc1: warnings being treated as errors ../../../source/components/executer/exdump.c: In function 'AcpiExDumpObject': ../../../source/components/executer/exdump.c:516: warning: cast from function call of type 'const char *' to non-matching type 'unsigned int' gmake[2]: *** [obj32/exdump.o] Error 1 Also new is the removal of -Wempty-body. Reason of its removal: cc -c -O -m32 -D_CYGWIN -D_GNU_SOURCE -D_FORTIFY_SOURCE=2 -I../../../source/include -DACPI_ASL_COMPILER -I../../../source/compiler -Iobj32 -ansi -Wall -Wbad-function-cast -Wdeclaration-after-statement -Werror -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wstrict-aliasing=0 -Wstrict-prototypes -Wswitch-default -Wpointer-arith -Wundef -Waddress -Waggregate-return -Wchar-subscripts -Wempty-body -Wmissing-declarations -Wmissing-field-initializers -Wnested-externs -Wold-style-definition -Wredundant-decls -oobj32/adfile.o ../../../source/common/adfile.c cc1: error: unrecognized command line option "-Wempty-body" This change doesn't appear to be required for GNU/linuxes. Change-Id: Ia1d2915257af2a6631b5294b56f0f66b3830af3c Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- ...nix-20121114_drop_cflags_unknown_to_xcode.patch | 20 --------------- .../acpica-unix-20121114_drop_unknown_cflags.patch | 29 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch deleted file mode 100644 index a4d55da..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 08:22:38.000000000 -0800 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2012-12-05 15:53:35.000000000 -0800 -@@ -135,15 +135,11 @@ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ -- -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ -- -Wmissing-parameter-type \ - -Wnested-externs \ -- -Wold-style-declaration \ - -Wold-style-definition \ -- -Wredundant-decls \ -- -Wtype-limits -+ -Wredundant-decls - - # - # Extra warning flags (possible future use) diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch new file mode 100644 index 0000000..cfc392c --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch @@ -0,0 +1,29 @@ +diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config +--- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 17:22:38.000000000 +0100 ++++ acpica-unix-20121114/generate/unix/Makefile.config 2013-02-09 17:57:59.000000000 +0100 +@@ -115,7 +115,6 @@ + CWARNINGFLAGS = \ + -ansi \ + -Wall \ +- -Wbad-function-cast \ + -Wdeclaration-after-statement \ + -Werror \ + -Wformat=2 \ +@@ -134,16 +133,11 @@ + -Waddress \ + -Waggregate-return \ + -Wchar-subscripts \ +- -Wempty-body \ +- -Wlogical-op \ + -Wmissing-declarations \ + -Wmissing-field-initializers \ +- -Wmissing-parameter-type \ + -Wnested-externs \ +- -Wold-style-declaration \ + -Wold-style-definition \ +- -Wredundant-decls \ +- -Wtype-limits ++ -Wredundant-decls + + # + # Extra warning flags (possible future use)

1 0

Patch set updated for coreboot: da19ba8 crossgcc: fix building acpica on BSD/non-linux
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2340 -gerrit commit da19ba81e527a0206983ff86d323066d10c179d7 Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sat Feb 9 19:23:35 2013 +0100 crossgcc: fix building acpica on BSD/non-linux Fix building acpica on BSD/non-linux. Error message: cc1: warnings being treated as errors ../../../source/components/executer/exdump.c: In function 'AcpiExDumpObject': ../../../source/components/executer/exdump.c:516: warning: cast from function call of type 'const char *' to non-matching type 'unsigned int' gmake[2]: *** [obj32/exdump.o] Error 1 This change doesn't appear to be required for GNU/linuxes. Change-Id: Ia1d2915257af2a6631b5294b56f0f66b3830af3c Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- ...nix-20121114_drop_cflags_unknown_to_xcode.patch | 20 --------------- .../acpica-unix-20121114_drop_unknown_cflags.patch | 29 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch deleted file mode 100644 index a4d55da..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 08:22:38.000000000 -0800 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2012-12-05 15:53:35.000000000 -0800 -@@ -135,15 +135,11 @@ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ -- -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ -- -Wmissing-parameter-type \ - -Wnested-externs \ -- -Wold-style-declaration \ - -Wold-style-definition \ -- -Wredundant-decls \ -- -Wtype-limits -+ -Wredundant-decls - - # - # Extra warning flags (possible future use) diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch new file mode 100644 index 0000000..cfc392c --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20121114_drop_unknown_cflags.patch @@ -0,0 +1,29 @@ +diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config +--- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 17:22:38.000000000 +0100 ++++ acpica-unix-20121114/generate/unix/Makefile.config 2013-02-09 17:57:59.000000000 +0100 +@@ -115,7 +115,6 @@ + CWARNINGFLAGS = \ + -ansi \ + -Wall \ +- -Wbad-function-cast \ + -Wdeclaration-after-statement \ + -Werror \ + -Wformat=2 \ +@@ -134,16 +133,11 @@ + -Waddress \ + -Waggregate-return \ + -Wchar-subscripts \ +- -Wempty-body \ +- -Wlogical-op \ + -Wmissing-declarations \ + -Wmissing-field-initializers \ +- -Wmissing-parameter-type \ + -Wnested-externs \ +- -Wold-style-declaration \ + -Wold-style-definition \ +- -Wredundant-decls \ +- -Wtype-limits ++ -Wredundant-decls + + # + # Extra warning flags (possible future use)

1 0

Patch set updated for coreboot: aaeec91 crossgcc: don't use libdl while building GDB on FreeBSD
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2342 -gerrit commit aaeec913b666fc6bd4d20cc5367d8de0d65f32aa Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sat Feb 9 23:58:06 2013 +0100 crossgcc: don't use libdl while building GDB on FreeBSD crossgcc: fix building GDB on FreeBSD (and possibly NetBSD/OpenBSD). Since FreeBSD doesn't have libdl, these errors are shown: - config.log: /usr/bin/ld: cannot find -ldl - crossgcc-build.log: configure: error: C compiler cannot create executables Conditially remove -ldl from LDFLAGS. Change-Id: I79c48da7e6700a4606c9e0c1314241db8997d3f3 Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- util/crossgcc/buildgcc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ad2bb65..ff35542 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -562,8 +562,13 @@ printf "Building GDB ${GDB_VERSION} ... " cd build-gdb export PYTHONHOME=$DESTDIR$TARGETDIR rm -f .failed + if [ $(uname) = "FreeBSD" -o $(uname) = "NetBSD" ] ; then LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ - -lpthread -ldl -lutil" \ + -lpthread -lutil" + else + LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ + -lpthread -ldl -lutil" + fi CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \ ../gdb-${GDB_VERSION}/configure --prefix=$TARGETDIR \ --target=${TARGETARCH} --disable-werror --disable-nls

1 0

Patch set updated for coreboot: 0659670 crossgcc: fix building GDB on FreeBSD
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2342 -gerrit commit 0659670bb96768acaf5a6f95e16bd02f37aef7ec Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sat Feb 9 23:58:06 2013 +0100 crossgcc: fix building GDB on FreeBSD crossgcc: fix building GDB on FreeBSD (and NetBSD?). Since FreeBSD doesn't have libdl, these errors are shown: - config.log: /usr/bin/ld: cannot find -ldl - crossgcc-build.log: configure: error: C compiler cannot create executables Change-Id: I79c48da7e6700a4606c9e0c1314241db8997d3f3 Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- util/crossgcc/buildgcc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ad2bb65..f07034e 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -562,15 +562,21 @@ printf "Building GDB ${GDB_VERSION} ... " cd build-gdb export PYTHONHOME=$DESTDIR$TARGETDIR rm -f .failed + if [ $(uname) = "FreeBSD" -o $(uname) = "NetBSD" ] ; then LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ - -lpthread -ldl -lutil" \ + -lpthread -lutil" + else + LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ + -lpthread -ldl -lutil" + fi CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \ ../gdb-${GDB_VERSION}/configure --prefix=$TARGETDIR \ --target=${TARGETARCH} --disable-werror --disable-nls $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) > build-gdb/crossgcc-build.log 2>&1 +) +#) > build-gdb/crossgcc-build.log 2>&1 test -r build-gdb/.failed && printf "${RED}failed${NC}\n" || \ printf "${green}ok${NC}\n" test -r build-gdb/.failed && exit 1

1 0

Patch set updated for coreboot: b85283d crossgcc: fix building GDB on FreeBSD
by Idwer Vollering 10 Feb '13

10 Feb '13

Idwer Vollering (vidwer(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2342 -gerrit commit b85283d4b411f958bbaea1389f818725cbb94fe5 Author: Idwer Vollering <vidwer(a)gmail.com> Date: Sat Feb 9 23:58:06 2013 +0100 crossgcc: fix building GDB on FreeBSD crossgcc: fix building GDB on FreeBSD (and NetBSD?). Since FreeBSD doesn't have libdl, these errors are shown: - config.log: /usr/bin/ld: cannot find -ldl - crossgcc-build.log: configure: error: C compiler cannot create executables Change-Id: I79c48da7e6700a4606c9e0c1314241db8997d3f3 Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- util/crossgcc/buildgcc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ad2bb65..1a2b397 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -562,15 +562,21 @@ printf "Building GDB ${GDB_VERSION} ... " cd build-gdb export PYTHONHOME=$DESTDIR$TARGETDIR rm -f .failed +# if [ $(uname) = "FreeBSD" -o $(uname) = "NetBSD" ] ; then +# LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ +# -lpthread -lutil" +# else LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ - -lpthread -ldl -lutil" \ + -lpthread -ldl -lutil" +# fi CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \ ../gdb-${GDB_VERSION}/configure --prefix=$TARGETDIR \ --target=${TARGETARCH} --disable-werror --disable-nls $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) > build-gdb/crossgcc-build.log 2>&1 +) +#) > build-gdb/crossgcc-build.log 2>&1 test -r build-gdb/.failed && printf "${RED}failed${NC}\n" || \ printf "${green}ok${NC}\n" test -r build-gdb/.failed && exit 1

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
79
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot February 2013