coreboot-gerrit January 2015

coreboot-gerrit@coreboot.org

1 participants
1236 discussions

New patch to review for coreboot: d81fe89 util/gitconfig/pre-commit: Use clang-format to sanitise commits
by Edward O'Callaghan 02 Jan '15

02 Jan '15

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8037 -gerrit commit d81fe89a8368b39ab5d191f32b983cf4b356eee8 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sat Jan 3 02:08:33 2015 +1100 util/gitconfig/pre-commit: Use clang-format to sanitise commits Use the `git-format' tool to sanitise coreboot commits such that they conform to coreboot's coding style. This fancy piece of machinary allows one to have LibFormat from Clang to automatically check your commit conforms to coreboot's coding style, fix any issues automatically and provides you a diff you may review and apply at your convenience. Change-Id: If49017ea82f0707efd47cae5978a286a9af8f3b7 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- util/gitconfig/pre-commit | 140 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/util/gitconfig/pre-commit b/util/gitconfig/pre-commit index 8ab3e56..e414b05 100755 --- a/util/gitconfig/pre-commit +++ b/util/gitconfig/pre-commit @@ -1,2 +1,142 @@ #!/bin/sh exec make lint-stable + +# git pre-commit hook that runs an clang-format stylecheck. +# Features: +# - abort commit when commit does not comply with the style guidelines +# - create a patch of the proposed style changes + +# modifications for clang-format by rene.milk(a)wwu.de +# This file is part of a set of unofficial pre-commit hooks available +# at github. +# Link: https://github.com/githubbrowser/Pre-commit-hooks +# Contact: David Martin, david.martin.mailbox(a)googlemail.com + + +################################################################## +# SETTINGS +# set path to clang-format binary +CLANG_FORMAT="/usr/bin/clang-format" + +# remove any older patches from previous commits. Set to true or false. +# DELETE_OLD_PATCHES=false +DELETE_OLD_PATCHES=false + +# only parse files with the extensions in FILE_EXTS. Set to true or false. +# if false every changed file in the commit will be parsed with clang-format. +# if true only files matching one of the extensions are parsed with clang-format. +# PARSE_EXTS=true +PARSE_EXTS=true + +# file types to parse. Only effective when PARSE_EXTS is true. +# FILE_EXTS=".c .h .cpp .hpp" +FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx" + +################################################################## +# There should be no need to change anything below this line. + +# Reference: http://stackoverflow.com/questions/1055671/how-can-i-get-the-behavior-of-gn… +canonicalize_filename () { + local target_file=$1 + local physical_directory="" + local result="" + + # Need to restore the working directory after work. + pushd `pwd` > /dev/null + + cd "$(dirname "$target_file")" + target_file=`basename $target_file` + + # Iterate down a (possible) chain of symlinks + while [ -L "$target_file" ] + do + target_file=$(readlink "$target_file") + cd "$(dirname "$target_file")" + target_file=$(basename "$target_file") + done + + # Compute the canonicalized name by finding the physical path + # for the directory we're in and appending the target file. + physical_directory=`pwd -P` + result="$physical_directory"/"$target_file" + + # restore the working directory after work. + popd > /dev/null + + echo "$result" +} + +# exit on error +set -e + +# check whether the given file matches any of the set extensions +matches_extension() { + local filename=$(basename "$1") + local extension=".${filename##*.}" + local ext + + for ext in $FILE_EXTS; do [[ "$ext" == "$extension" ]] && return 0; done + + return 1 +} + +# necessary check for initial commit +if git rev-parse --verify HEAD >/dev/null 2>&1 ; then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +if [ ! -x "$CLANG_FORMAT" ] ; then + printf "Error: clang-format executable not found.\n" + printf "Set the correct path in $(canonicalize_filename "$0").\n" + exit 1 +fi + +# create a random filename to store our generated patch +prefix="pre-commit-clang-format" +suffix="$(date +%s)" +patch="/tmp/$prefix-$suffix.patch" + +# clean up any older clang-format patches +$DELETE_OLD_PATCHES && rm -f /tmp/$prefix*.patch + +# create one patch containing all changes to the files +git diff-index --cached --diff-filter=ACMR --name-only $against -- | while read file; +do + # ignore file if we do check for file extensions and the file + # does not match any of the extensions specified in $FILE_EXTS + if $PARSE_EXTS && ! matches_extension "$file"; then + continue; + fi + + # clang-format our sourcefile, create a patch with diff and append it to our $patch + # The sed call is necessary to transform the patch from + # --- $file timestamp + # +++ - timestamp + # to both lines working on the same file and having a a/ and b/ prefix. + # Else it can not be applied with 'git apply'. + "$CLANG_FORMAT" -style=file "$file" | \ + diff -u "$file" - | \ + sed -e "1s|--- |--- a/|" -e "2s|+++ -|+++ b/$file|" >> "$patch" +done + +# if no patch has been generated all is ok, clean up the file stub and exit +if [ ! -s "$patch" ] ; then + printf "Files in this commit comply with the clang-format rules.\n" + rm -f "$patch" + exit 0 +fi + +# a patch has been created, notify the user and exit +printf "\nThe following differences were found between the code to commit " +printf "and the clang-format rules:\n\n" +cat "$patch" + +printf "\nYou can apply these changes with:\n git apply $patch\n" +printf "(may need to be called from the root directory of your repository)\n" +printf "Aborting commit. Apply changes and commit again or skip checking with" +printf " --no-verify (not recommended).\n" + +exit 1

1 0

New patch to review for coreboot: 907184f Provide coreboot coding style formalisation file for clang-format
by Edward O'Callaghan 02 Jan '15

02 Jan '15

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8036 -gerrit commit 907184f632283a6bdd3ccfdf15d0bd37132eb95b Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sat Jan 3 01:55:22 2015 +1100 Provide coreboot coding style formalisation file for clang-format The Clang project has a powerful code rewrite engine in the form of LibFormat. A auxiliary tool is provided called `clang-format' that can take a coding style formalisation file and rewrite your code to conform to this style. Further, a wrapper script called `git-clang-format' is also provided that can hook pre-commits potentially replacing our slow and poor coverage regexp scripts on pre-commits. Herein we provide essentially the Linux Style Guide formalism. Change-Id: Ica2207fdb8a4702793fa73eba6293b7b36ea9050 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- .clang-format | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..a3ef233 --- /dev/null +++ b/.clang-format @@ -0,0 +1,6 @@ +BasedOnStyle: LLVM +IndentWidth: 8 +UseTab: Always +BreakBeforeBraces: Linux +AllowShortIfStatementsOnASingleLine: false +IndentCaseLabels: false

1 0

Patch set updated for coreboot: 64b6ea6 build system: collect compiler configuration in xcompile
by Edward O'Callaghan 02 Jan '15

02 Jan '15

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7612 -gerrit commit 64b6ea6fe2b52875f10095fa217a0a5b4b00ff3c Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Nov 29 14:16:07 2014 +0100 build system: collect compiler configuration in xcompile Move clang specifics and compiler runtime handling to xcompile and out of the main build paths. Change-Id: I0f12f755420f315127e6d9adc00b1246c6e7131b Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- Makefile | 25 +--------------- src/arch/x86/Makefile.inc | 2 -- toolchain.inc | 15 +++------- util/xcompile/xcompile | 72 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 59 insertions(+), 55 deletions(-) diff --git a/Makefile b/Makefile index 6ef9838..19d65f4 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,6 @@ $(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile: util/xcompile/xcompile A=`mktemp $@.XXXXXX`; $< $(XGCCPATH) > $$A && mv $$A $@ 2> /dev/null -include .xcompile - export top := $(CURDIR) export src := src export srck := $(top)/util/kconfig @@ -112,33 +110,12 @@ real-all: config else include $(HAVE_DOTCONFIG) - -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -# FIXME: armv7/aarch64 won't build right now -# NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a -# this means the triple is i386-linux-elf instead of i386-none-elf -CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-linux-elf -m32 -# Tone down some clang warnings -CFLAGS_x86_32 += -Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow -CC_x86_32:=clang -HOSTCC := clang +include .xcompile ifneq ($(CONFIG_MMX),y) CFLAGS_x86_32 += -mno-mmx endif -# FIXME: we end up with conflicting flags with this, not clear on this part. -#ifneq ($(CONFIG_SSE),y) -#CFLAGS_x86_32 += -mno-sse -#endif - -CFLAGS_arm = -no-integrated-as -Qunused-arguments -target arm-eabi -ccc-gcc-name $(CC_arm) -CC_arm:=clang - -CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) -CC_aarch64:=clang -endif - include toolchain.inc strip_quotes = $(subst ",,$(subst \",,$(1))) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index a92c55c..8e67d56 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -29,8 +29,6 @@ subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) DISASSEMBLY=-Wa,-acdlns -else -DISASSEMBLY=-Wa,--divide endif OPTION_TABLE_H:= diff --git a/toolchain.inc b/toolchain.inc index e6f530a..432e633 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -59,9 +59,9 @@ ARCHDIR-arm := arm ARCHDIR-arm64 := arm64 ARCHDIR-riscv := riscv -CFLAGS_arm := -mno-unaligned-access -ffunction-sections -fdata-sections +CFLAGS_arm += -mno-unaligned-access -ffunction-sections -fdata-sections -CFLAGS_arm64 := -ffunction-sections -fdata-sections +CFLAGS_arm64 += -ffunction-sections -fdata-sections toolchain_to_dir = \ $(foreach arch,$(ARCH_SUPPORTED),\ @@ -93,15 +93,8 @@ STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2)) CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -COMPILER_RT_FLAGS_$(1) := -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -COMPILER_RT_$(1) = $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-librt-file-name 2>/dev/null) -else -COMPILER_RT_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name)) -ifeq ($(2),x86_32) -COMPILER_RT_FLAGS_$(1) := --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 -endif -endif +COMPILER_RT_$(1) := $$(COMPILER_RT_$(2)) +COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2)) endef # define_class: Allows defining any program as dynamic class and compiler tool diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 45dae8c..081f3f8 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -59,6 +59,7 @@ elif program_exists cc; then else die "no host compiler found" fi +CLANG=clang cat <<EOF # platform agnostic and host tools @@ -98,11 +99,11 @@ testas() { if [ -z "$use_dash_twidth" ]; then ASFLAGS="" - CFLAGS="" + CFLAGS_GCC="" LDFLAGS="" else ASFLAGS="--$twidth" - CFLAGS="-m$twidth" + CFLAGS_GCC="-m$twidth" LDFLAGS="-b $full_arch" fi @@ -111,7 +112,7 @@ testas() { [ -n "$use_dash_twidth" ] && case "$full_arch" in "elf32-i386" ) LDFLAGS="$LDFLAGS -melf_i386" - CFLAGS="$CFLAGS -Wl,-b,elf32-i386 -Wl,-melf_i386" + CFLAGS_GCC="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386" ;; esac @@ -122,38 +123,56 @@ detect_special_flags() { local architecture="$1" # GCC 4.6 is much more picky about unused variables. # Turn off it's warnings for now: - testcc "$CC" "$CFLAGS -Wno-unused-but-set-variable " && - CFLAGS="$CFLAGS -Wno-unused-but-set-variable " + testcc "$CC" "$CFLAGS_GCC -Wno-unused-but-set-variable " && + CFLAGS_GCC="$CFLAGS_GCC -Wno-unused-but-set-variable " # Use bfd linker instead of gold if available: - testcc "$CC" "$CFLAGS -fuse-ld=bfd" && - CFLAGS="$CFLAGS -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' + testcc "$CC" "$CFLAGS_GCC -fuse-ld=bfd" && + CFLAGS_GCC="$CFLAGS_GCC -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' - testcc "$CC" "$CFLAGS -fno-stack-protector"&& - CFLAGS="$CFLAGS -fno-stack-protector" - testcc "$CC" "$CFLAGS -Wl,--build-id=none" && - CFLAGS="$CFLAGS -Wl,--build-id=none" + testcc "$CC" "$CFLAGS_GCC -fno-stack-protector"&& + CFLAGS_GCC="$CFLAGS_GCC -fno-stack-protector" + testcc "$CC" "$CFLAGS_GCC -Wl,--build-id=none" && + CFLAGS_GCC="$CFLAGS_GCC -Wl,--build-id=none" case "$architecture" in x86) - testcc "$CC" "$CFLAGS -Wa,--divide" && - CFLAGS="$CFLAGS -Wa,--divide" + testcc "$CC" "$CFLAGS_GCC -Wa,--divide" && + CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" + testcc "$CLANG" "$CFLAGS_CLANG -no-integrated-as" && + CFLAGS_CLANG="$CFLAGS_CLANG -no-integrated-as" + testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && + CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" # Always build for i686 -- no sse/mmx instructions since SMM # modules are compiled using these flags. Note that this # doesn't prevent a project using xcompile to explicitly # specify -mmsse, etc flags. - CFLAGS="$CFLAGS -march=i686" + CFLAGS_GCC="$CFLAGS_GCC -march=i686" ;; esac } +detect_compiler_runtime() { + CC_RT_CLANG="`${CLANG} ${CFLAGS_CLANG} -print-librt-file-name`" + CC_RT_GCC="`${GCCPREFIX}gcc ${CFLAGS_GCC} -print-libgcc-file-name`" +} + report_arch_toolchain() { cat <<EOF # elf${TWIDTH}-${TBFDARCH} toolchain (${GCCPREFIX}gcc) ARCH_SUPPORTED+=${TARCH} SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} +ifeq (\$(CONFIG_COMPILER_GCC),y) CC_${TARCH}:=${GCCPREFIX}gcc -CFLAGS_${TARCH}:=${CFLAGS} +CFLAGS_${TARCH}:=${CFLAGS_GCC} +COMPILER_RT_${TARCH}:=${CC_RT_GCC} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC} +else +CC_${TARCH}:=${CLANG} +CFLAGS_${TARCH}:=${CFLAGS_CLANG} +COMPILER_RT_${TARCH}:=${CC_RT_CLANG} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG} +endif CPP_${TARCH}:=${GCCPREFIX}cpp AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS} LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS} @@ -173,10 +192,12 @@ SUPPORTED_ARCHITECTURE="x86 arm aarch64 riscv" arch_config_arm() { TARCH="arm" TBFDARCH="littlearm" - TCLIST="armv7a armv7-a" + # N.B. clang expects armv7-a to come first else clang can not find prefixed binutils. + TCLIST="armv7-a armv7a" TWIDTH="32" TSUPP="arm armv4 armv7" TABI="eabi" + CC_RT_EXTRA_GCC= } arch_config_aarch64() { @@ -185,6 +206,7 @@ arch_config_aarch64() { TCLIST="aarch64" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_riscv() { @@ -193,6 +215,7 @@ arch_config_riscv() { TCLIST="riscv" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_x86() { @@ -201,6 +224,7 @@ arch_config_x86() { TCLIST="i386 x86_64" TWIDTH="32" TABI="elf" + CC_RT_EXTRA_GCC="--wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3" } test_architecture() { @@ -234,13 +258,25 @@ test_architecture() { testas "$gccprefixes" "$TWIDTH" "$TBFDARCH" "TRUE" && break done - if [ "$GCCPREFIX" = "invalid" ]; then - echo "Warning: no suitable GCC for $architecture." >&2 + for clang_arch in $TCLIST invalid; do + # NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a + # this means the triple is i386-linux-elf instead of i386-none-elf + # See: http://llvm.org/bugs/show_bug.cgi?id=21538 + testcc "clang" "-target ${clang_arch}-linux-$TABI -c" && break + done + + if [ "$GCCPREFIX" = "invalid" -a "$clang_arch" = "invalid" ]; then + echo "Warning: no suitable compiler for $architecture." >&2 continue fi CC="${GCCPREFIX}"gcc + CFLAGS_GCC= + CFLAGS_CLANG="-target ${clang_arch}-linux-${TABI} -Qunused-arguments -ccc-gcc-name ${CC} -m${TWIDTH}" + # tone down some warnings + CFLAGS_CLANG="${CFLAGS_CLANG} -Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow" detect_special_flags "$architecture" + detect_compiler_runtime "$architecture" report_arch_toolchain }

1 0

Patch set updated for coreboot: f5743f3 build system: collect compiler configuration in xcompile
by Patrick Georgi 02 Jan '15

02 Jan '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7612 -gerrit commit f5743f32fd2ab3c555fc0ba32c9d04c05de2db89 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Nov 29 14:16:07 2014 +0100 build system: collect compiler configuration in xcompile Move clang specifics and compiler runtime handling to xcompile and out of the main build paths. Change-Id: I0f12f755420f315127e6d9adc00b1246c6e7131b Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- Makefile | 25 +---------------- src/arch/x86/Makefile.inc | 2 -- toolchain.inc | 15 +++-------- util/xcompile/xcompile | 69 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 57 insertions(+), 54 deletions(-) diff --git a/Makefile b/Makefile index 6ef9838..19d65f4 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,6 @@ $(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile: util/xcompile/xcompile A=`mktemp $@.XXXXXX`; $< $(XGCCPATH) > $$A && mv $$A $@ 2> /dev/null -include .xcompile - export top := $(CURDIR) export src := src export srck := $(top)/util/kconfig @@ -112,33 +110,12 @@ real-all: config else include $(HAVE_DOTCONFIG) - -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -# FIXME: armv7/aarch64 won't build right now -# NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a -# this means the triple is i386-linux-elf instead of i386-none-elf -CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-linux-elf -m32 -# Tone down some clang warnings -CFLAGS_x86_32 += -Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow -CC_x86_32:=clang -HOSTCC := clang +include .xcompile ifneq ($(CONFIG_MMX),y) CFLAGS_x86_32 += -mno-mmx endif -# FIXME: we end up with conflicting flags with this, not clear on this part. -#ifneq ($(CONFIG_SSE),y) -#CFLAGS_x86_32 += -mno-sse -#endif - -CFLAGS_arm = -no-integrated-as -Qunused-arguments -target arm-eabi -ccc-gcc-name $(CC_arm) -CC_arm:=clang - -CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) -CC_aarch64:=clang -endif - include toolchain.inc strip_quotes = $(subst ",,$(subst \",,$(1))) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index a92c55c..8e67d56 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -29,8 +29,6 @@ subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) DISASSEMBLY=-Wa,-acdlns -else -DISASSEMBLY=-Wa,--divide endif OPTION_TABLE_H:= diff --git a/toolchain.inc b/toolchain.inc index e6f530a..432e633 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -59,9 +59,9 @@ ARCHDIR-arm := arm ARCHDIR-arm64 := arm64 ARCHDIR-riscv := riscv -CFLAGS_arm := -mno-unaligned-access -ffunction-sections -fdata-sections +CFLAGS_arm += -mno-unaligned-access -ffunction-sections -fdata-sections -CFLAGS_arm64 := -ffunction-sections -fdata-sections +CFLAGS_arm64 += -ffunction-sections -fdata-sections toolchain_to_dir = \ $(foreach arch,$(ARCH_SUPPORTED),\ @@ -93,15 +93,8 @@ STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2)) CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -COMPILER_RT_FLAGS_$(1) := -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -COMPILER_RT_$(1) = $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-librt-file-name 2>/dev/null) -else -COMPILER_RT_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name)) -ifeq ($(2),x86_32) -COMPILER_RT_FLAGS_$(1) := --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 -endif -endif +COMPILER_RT_$(1) := $$(COMPILER_RT_$(2)) +COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2)) endef # define_class: Allows defining any program as dynamic class and compiler tool diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 45dae8c..f6de6d8 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -59,6 +59,7 @@ elif program_exists cc; then else die "no host compiler found" fi +CLANG=clang cat <<EOF # platform agnostic and host tools @@ -98,11 +99,11 @@ testas() { if [ -z "$use_dash_twidth" ]; then ASFLAGS="" - CFLAGS="" + CFLAGS_GCC="" LDFLAGS="" else ASFLAGS="--$twidth" - CFLAGS="-m$twidth" + CFLAGS_GCC="-m$twidth" LDFLAGS="-b $full_arch" fi @@ -111,7 +112,7 @@ testas() { [ -n "$use_dash_twidth" ] && case "$full_arch" in "elf32-i386" ) LDFLAGS="$LDFLAGS -melf_i386" - CFLAGS="$CFLAGS -Wl,-b,elf32-i386 -Wl,-melf_i386" + CFLAGS_GCC="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386" ;; esac @@ -122,38 +123,56 @@ detect_special_flags() { local architecture="$1" # GCC 4.6 is much more picky about unused variables. # Turn off it's warnings for now: - testcc "$CC" "$CFLAGS -Wno-unused-but-set-variable " && - CFLAGS="$CFLAGS -Wno-unused-but-set-variable " + testcc "$CC" "$CFLAGS_GCC -Wno-unused-but-set-variable " && + CFLAGS_GCC="$CFLAGS_GCC -Wno-unused-but-set-variable " # Use bfd linker instead of gold if available: - testcc "$CC" "$CFLAGS -fuse-ld=bfd" && - CFLAGS="$CFLAGS -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' + testcc "$CC" "$CFLAGS_GCC -fuse-ld=bfd" && + CFLAGS_GCC="$CFLAGS_GCC -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' - testcc "$CC" "$CFLAGS -fno-stack-protector"&& - CFLAGS="$CFLAGS -fno-stack-protector" - testcc "$CC" "$CFLAGS -Wl,--build-id=none" && - CFLAGS="$CFLAGS -Wl,--build-id=none" + testcc "$CC" "$CFLAGS_GCC -fno-stack-protector"&& + CFLAGS_GCC="$CFLAGS_GCC -fno-stack-protector" + testcc "$CC" "$CFLAGS_GCC -Wl,--build-id=none" && + CFLAGS_GCC="$CFLAGS_GCC -Wl,--build-id=none" case "$architecture" in x86) - testcc "$CC" "$CFLAGS -Wa,--divide" && - CFLAGS="$CFLAGS -Wa,--divide" + testcc "$CC" "$CFLAGS_GCC -Wa,--divide" && + CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" + testcc "$CLANG" "$CFLAGS_CLANG -no-integrated-as" && + CFLAGS_CLANG="$CFLAGS_CLANG -no-integrated-as" + testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && + CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" # Always build for i686 -- no sse/mmx instructions since SMM # modules are compiled using these flags. Note that this # doesn't prevent a project using xcompile to explicitly # specify -mmsse, etc flags. - CFLAGS="$CFLAGS -march=i686" + CFLAGS_GCC="$CFLAGS_GCC -march=i686" ;; esac } +detect_compiler_runtime() { + CC_RT_CLANG="`${CLANG} ${CFLAGS_CLANG} -print-librt-file-name`" + CC_RT_GCC="`${GCCPREFIX}gcc ${CFLAGS_GCC} -print-libgcc-file-name`" +} + report_arch_toolchain() { cat <<EOF # elf${TWIDTH}-${TBFDARCH} toolchain (${GCCPREFIX}gcc) ARCH_SUPPORTED+=${TARCH} SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} +ifeq (\$(CONFIG_COMPILER_GCC),y) CC_${TARCH}:=${GCCPREFIX}gcc -CFLAGS_${TARCH}:=${CFLAGS} +CFLAGS_${TARCH}:=${CFLAGS_GCC} +COMPILER_RT_${TARCH}:=${CC_RT_GCC} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC} +else +CC_${TARCH}:=${CLANG} +CFLAGS_${TARCH}:=${CFLAGS_CLANG} +COMPILER_RT_${TARCH}:=${CC_RT_CLANG} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG} +endif CPP_${TARCH}:=${GCCPREFIX}cpp AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS} LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS} @@ -177,6 +196,7 @@ arch_config_arm() { TWIDTH="32" TSUPP="arm armv4 armv7" TABI="eabi" + CC_RT_EXTRA_GCC= } arch_config_aarch64() { @@ -185,6 +205,7 @@ arch_config_aarch64() { TCLIST="aarch64" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_riscv() { @@ -193,6 +214,7 @@ arch_config_riscv() { TCLIST="riscv" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_x86() { @@ -201,6 +223,7 @@ arch_config_x86() { TCLIST="i386 x86_64" TWIDTH="32" TABI="elf" + CC_RT_EXTRA_GCC="--wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3" } test_architecture() { @@ -234,13 +257,25 @@ test_architecture() { testas "$gccprefixes" "$TWIDTH" "$TBFDARCH" "TRUE" && break done - if [ "$GCCPREFIX" = "invalid" ]; then - echo "Warning: no suitable GCC for $architecture." >&2 + for clang_arch in $TCLIST invalid; do + # NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a + # this means the triple is i386-linux-elf instead of i386-none-elf + # See: http://llvm.org/bugs/show_bug.cgi?id=21538 + testcc "clang" "-target ${clang_arch}-linux-$TABI -c" && break + done + + if [ "$GCCPREFIX" = "invalid" -a "$clang_arch" = "invalid" ]; then + echo "Warning: no suitable compiler for $architecture." >&2 continue fi CC="${GCCPREFIX}"gcc + CFLAGS_GCC= + CFLAGS_CLANG="-target ${clang_arch}-linux-${TABI} -Qunused-arguments -ccc-gcc-name ${CC} -m${TWIDTH}" + # tone down some warnings + CFLAGS_CLANG="${CFLAGS_CLANG} -Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow" detect_special_flags "$architecture" + detect_compiler_runtime "$architecture" report_arch_toolchain }

1 0

Patch set updated for coreboot: 6750450 northbridge/gm45/raminit.c: enable GS45 high-performance mode
by Francis Rowe 02 Jan '15

02 Jan '15

Francis Rowe (info(a)gluglug.org.uk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7786 -gerrit commit 67504507ce9611eefbcc8a47ac50322308a98f0f Author: Francis Rowe <info(a)gluglug.org.uk> Date: Fri Dec 12 12:42:01 2014 +0000 northbridge/gm45/raminit.c: enable GS45 high-performance mode X200S uses GS45 chipset, unlike X200 which uses GM45. These two chipsets are mostly compatible except for raminit. The datasheets for GS45 describe a high- and low-performance mode for different CPUs. Coreboot currently disables GS45 altogether, but forcing coreboot to treat high-performance GS45 as GM45 makes the X200S boot if it has the right CPU type. Hardcode-enable GS45 high-performance mode in coreboot, passing it off as GM45. This is known to work with all CPUs except the SU (low performance) models. Patch courtesy of sgsit. Change-Id: I57032bb6e1ebdaf4e2aa09548e73d253afb9b078 Signed-off-by: Francis Rowe <info(a)gluglug.org.uk> Signed-off-by: Steve Shenton <sgsit(a)libreboot.org> --- src/northbridge/intel/gm45/raminit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c index 60b05bd..da38ef4 100644 --- a/src/northbridge/intel/gm45/raminit.c +++ b/src/northbridge/intel/gm45/raminit.c @@ -109,8 +109,8 @@ void get_gmch_info(sysinfo_t *sysinfo) printk(BIOS_SPEW, "GMCH: GS40\n"); break; case GMCH_GS45: - printk(BIOS_SPEW, "GMCH: GS45, using low power mode by default\n"); - sysinfo->gs45_low_power_mode = 1; + printk(BIOS_SPEW, "GMCH: GS45, using high performance mode by default\n"); + sysinfo->gs45_low_power_mode = 0; break; case GMCH_PM45: printk(BIOS_SPEW, "GMCH: PM45\n"); @@ -1693,7 +1693,7 @@ void raminit(sysinfo_t *const sysinfo, const int s3resume) { const dimminfo_t *const dimms = sysinfo->dimms; const timings_t *const timings = &sysinfo->selected_timings; - const int sff = sysinfo->gfx_type == GMCH_GS45; + const int sff = (sysinfo->gfx_type == GMCH_GS45) && (sysinfo->gs45_low_power_mode == 1); int ch; u8 reg8;

1 0

Patch set updated for coreboot: 694d592 northbridge/gm45/raminit.c: enable GS45 high-performance mode
by Francis Rowe 02 Jan '15

02 Jan '15

Francis Rowe (info(a)gluglug.org.uk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7786 -gerrit commit 694d592d5ea081ade705f20cae56912866196a8f Author: Francis Rowe <info(a)gluglug.org.uk> Date: Fri Dec 12 12:42:01 2014 +0000 northbridge/gm45/raminit.c: enable GS45 high-performance mode X200S uses GS45 chipset, unlike X200 which uses GM45. These two chipsets are mostly compatible except for raminit. The datasheets for GS45 describe a high- and low-performance mode for different CPU's. Coreboot currently disables GS45 altogether, but forcing coreboot to treat high-performance GS45 as GM45 makes the X200S boot if it has the right CPU type. Hardcode-enable GS45 high-performance mode in coreboot, passing it off as GM45. This is known to work with all CPUs except the SU (low performance) models. Patch courtesy of sgsit. Change-Id: I57032bb6e1ebdaf4e2aa09548e73d253afb9b078 Signed-off-by: Francis Rowe <info(a)gluglug.org.uk> Signed-off-by: Steve Shenton <sgsit(a)libreboot.org> --- src/northbridge/intel/gm45/raminit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c index 60b05bd..da38ef4 100644 --- a/src/northbridge/intel/gm45/raminit.c +++ b/src/northbridge/intel/gm45/raminit.c @@ -109,8 +109,8 @@ void get_gmch_info(sysinfo_t *sysinfo) printk(BIOS_SPEW, "GMCH: GS40\n"); break; case GMCH_GS45: - printk(BIOS_SPEW, "GMCH: GS45, using low power mode by default\n"); - sysinfo->gs45_low_power_mode = 1; + printk(BIOS_SPEW, "GMCH: GS45, using high performance mode by default\n"); + sysinfo->gs45_low_power_mode = 0; break; case GMCH_PM45: printk(BIOS_SPEW, "GMCH: PM45\n"); @@ -1693,7 +1693,7 @@ void raminit(sysinfo_t *const sysinfo, const int s3resume) { const dimminfo_t *const dimms = sysinfo->dimms; const timings_t *const timings = &sysinfo->selected_timings; - const int sff = sysinfo->gfx_type == GMCH_GS45; + const int sff = (sysinfo->gfx_type == GMCH_GS45) && (sysinfo->gs45_low_power_mode == 1); int ch; u8 reg8;

1 0

Patch set updated for coreboot: 6389b8d northbridge/gm45/raminit.c: enable GS45 high-perf
by Francis Rowe 02 Jan '15

02 Jan '15

Francis Rowe (info(a)gluglug.org.uk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7786 -gerrit commit 6389b8d63d18dec264ff67eb674b953fff219175 Author: Francis Rowe <info(a)gluglug.org.uk> Date: Fri Dec 12 12:42:01 2014 +0000 northbridge/gm45/raminit.c: enable GS45 high-perf X200S uses GS45 chipset, unlike X200 which uses GM45. These two chipsets are mostly compatible except for raminit. The datasheets for GS45 describe a high- and low-performance mode for different CPU's. Coreboot currently disables GS45 altogether, but forcing coreboot to treat high-performance GS45 as GM45 makes the X200S boot if it has the right CPU type. Hardcode-enable GS45 high-performance mode in coreboot, passing it off as GM45. This is known to work with all CPUs except the SU (low performance) models. Patch courtesy of sgsit. Change-Id: I57032bb6e1ebdaf4e2aa09548e73d253afb9b078 Signed-off-by: Francis Rowe <info(a)gluglug.org.uk> Signed-off-by: Steve Shenton <sgsit(a)libreboot.org> --- src/northbridge/intel/gm45/raminit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c index 60b05bd..da38ef4 100644 --- a/src/northbridge/intel/gm45/raminit.c +++ b/src/northbridge/intel/gm45/raminit.c @@ -109,8 +109,8 @@ void get_gmch_info(sysinfo_t *sysinfo) printk(BIOS_SPEW, "GMCH: GS40\n"); break; case GMCH_GS45: - printk(BIOS_SPEW, "GMCH: GS45, using low power mode by default\n"); - sysinfo->gs45_low_power_mode = 1; + printk(BIOS_SPEW, "GMCH: GS45, using high performance mode by default\n"); + sysinfo->gs45_low_power_mode = 0; break; case GMCH_PM45: printk(BIOS_SPEW, "GMCH: PM45\n"); @@ -1693,7 +1693,7 @@ void raminit(sysinfo_t *const sysinfo, const int s3resume) { const dimminfo_t *const dimms = sysinfo->dimms; const timings_t *const timings = &sysinfo->selected_timings; - const int sff = sysinfo->gfx_type == GMCH_GS45; + const int sff = (sysinfo->gfx_type == GMCH_GS45) && (sysinfo->gs45_low_power_mode == 1); int ch; u8 reg8;

1 0

New patch to review for coreboot: aa17dca northbridge/amd/agesa/familyXY: Make NULL device op explicit
by Edward O'Callaghan 02 Jan '15

02 Jan '15

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8035 -gerrit commit aa17dca7aa36da483cb2124d13d6110e813d8717 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri Jan 2 15:11:49 2015 +1100 northbridge/amd/agesa/familyXY: Make NULL device op explicit Use 'DEVICE_NOOP' macro introduced in: commit 530355d include/device/device.h: Provide DEVICE_NOOP macro shim to provide formalism. Make the null device ops here explicit and in-line with formalism elsewhere. Change-Id: I2400b29a5108a6bae21959177e53321810ca1407 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/northbridge/amd/agesa/family10/northbridge.c | 2 +- src/northbridge/amd/agesa/family12/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family14/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15/northbridge.c | 2 +- src/northbridge/amd/agesa/family15rl/northbridge.c | 2 +- src/northbridge/amd/agesa/family15tn/northbridge.c | 2 +- src/northbridge/amd/agesa/family16kb/northbridge.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c index 2b2dad5..3099585 100644 --- a/src/northbridge/amd/agesa/family10/northbridge.c +++ b/src/northbridge/amd/agesa/family10/northbridge.c @@ -945,7 +945,7 @@ static struct device_operations pci_domain_ops = { .read_resources = amdfam10_domain_read_resources, .set_resources = amdfam10_domain_set_resources, .enable_resources = amdfam10_domain_enable_resources, - .init = NULL, + .init = DEVICE_NOOP, .scan_bus = amdfam10_domain_scan_bus, .ops_pci_bus = pci_bus_default_ops, }; diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index a3b3493..9d078ed 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -932,7 +932,7 @@ static struct device_operations pci_domain_ops = { .read_resources = domain_read_resources, .set_resources = domain_set_resources, .enable_resources = domain_enable_resources, - .init = NULL, + .init = DEVICE_NOOP, .scan_bus = pci_domain_scan_bus, }; @@ -940,7 +940,7 @@ static struct device_operations pci_domain_ops = { static struct device_operations cpu_bus_ops = { .read_resources = cpu_bus_read_resources, .set_resources = cpu_bus_set_resources, - .enable_resources = NULL, + .enable_resources = DEVICE_NOOP, .init = cpu_bus_init, .scan_bus = 0, }; diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index ff669ef..4017944 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -947,14 +947,14 @@ static struct device_operations pci_domain_ops = { .read_resources = domain_read_resources, .set_resources = domain_set_resources, .enable_resources = domain_enable_resources, - .init = NULL, + .init = DEVICE_NOOP, .scan_bus = pci_domain_scan_bus, }; static struct device_operations cpu_bus_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, - .enable_resources = NULL, + .enable_resources = DEVICE_NOOP, .init = cpu_bus_init, .scan_bus = cpu_bus_scan, }; diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index c030d57..2a816ff 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -968,7 +968,7 @@ static struct device_operations pci_domain_ops = { .read_resources = domain_read_resources, .set_resources = domain_set_resources, .enable_resources = domain_enable_resources, - .init = NULL, + .init = DEVICE_NOOP, .scan_bus = f15_pci_domain_scan_bus, .ops_pci_bus = pci_bus_default_ops, }; diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c index a27e902..867a9d9 100644 --- a/src/northbridge/amd/agesa/family15rl/northbridge.c +++ b/src/northbridge/amd/agesa/family15rl/northbridge.c @@ -957,7 +957,7 @@ static struct device_operations pci_domain_ops = { .read_resources = domain_read_resources, .set_resources = domain_set_resources, .enable_resources = domain_enable_resources, - .init = NULL, + .init = DEVICE_NOOP, .scan_bus = pci_domain_scan_bus, .ops_pci_bus = pci_bus_default_ops, }; diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index c7f7fef..8993923 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -955,7 +955,7 @@ static struct device_operations pci_domain_ops = { .read_resources = domain_read_resources, .set_resources = domain_set_resources, .enable_resources = domain_enable_resources, - .init = NULL, + .init = DEVICE_NOOP, .scan_bus = pci_domain_scan_bus, .ops_pci_bus = pci_bus_default_ops, }; diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index 86adfae..9c16dfb 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -999,7 +999,7 @@ static struct device_operations pci_domain_ops = { .read_resources = domain_read_resources, .set_resources = domain_set_resources, .enable_resources = domain_enable_resources, - .init = NULL, + .init = DEVICE_NOOP, .scan_bus = pci_domain_scan_bus, .ops_pci_bus = pci_bus_default_ops, };

1 0

Patch set updated for coreboot: 741c86f northbridge/amd/agesa/family1{4, 5}: Remove cruft from dimmSpd.c
by Edward O'Callaghan 02 Jan '15

02 Jan '15

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8017 -gerrit commit 741c86f2e40b8ae4674f758114521a25f9f80831 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Jan 1 04:09:04 2015 +1100 northbridge/amd/agesa/family1{4,5}: Remove cruft from dimmSpd.c Remove useless comment pretaining to abusing pragma's for old GCC/GDB interaction issues. Change-Id: Ic83a0285ac947a23699a81a82b89de08a47ab052 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/northbridge/amd/agesa/family14/dimmSpd.c | 3 --- src/northbridge/amd/agesa/family15/dimmSpd.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/northbridge/amd/agesa/family14/dimmSpd.c b/src/northbridge/amd/agesa/family14/dimmSpd.c index 6ca2ce1..bee2c7e 100644 --- a/src/northbridge/amd/agesa/family14/dimmSpd.c +++ b/src/northbridge/amd/agesa/family14/dimmSpd.c @@ -30,9 +30,6 @@ #include <northbridge/amd/agesa/dimmSpd.h> -/* uncomment for source level debug - GDB gets really confused otherwise. */ -//#pragma optimize ("", off) - /** * Gets the SMBus address for an SPD from the array in devicetree.cb * then read the SPD into the supplied buffer. diff --git a/src/northbridge/amd/agesa/family15/dimmSpd.c b/src/northbridge/amd/agesa/family15/dimmSpd.c index bf8e59e..201f293 100644 --- a/src/northbridge/amd/agesa/family15/dimmSpd.c +++ b/src/northbridge/amd/agesa/family15/dimmSpd.c @@ -30,9 +30,6 @@ #include <northbridge/amd/agesa/dimmSpd.h> -/* uncomment for source level debug - GDB gets really confused otherwise. */ -//#pragma optimize ("", off) - /** * Gets the SMBus address for an SPD from the array in devicetree.cb * then read the SPD into the supplied buffer.

1 0

Patch set updated for coreboot: 0ae3c77 amd/agesa/family12/dimmSpd.c: Indent (tab) fix
by Edward O'Callaghan 02 Jan '15

02 Jan '15

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8016 -gerrit commit 0ae3c77ec3cbcd6b21f0c63b2fa722f2dd7cbec3 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu Jan 1 04:02:55 2015 +1100 amd/agesa/family12/dimmSpd.c: Indent (tab) fix Trivial; Use tab over space for indent. Clean up some ASCII art while here. Change-Id: Id2478d140a98596c5eeefdf5b047c1ca23203909 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/northbridge/amd/agesa/family12/dimmSpd.c | 44 +++++++++++++++------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/northbridge/amd/agesa/family12/dimmSpd.c b/src/northbridge/amd/agesa/family12/dimmSpd.c index e8ef02a..3fbc6df 100644 --- a/src/northbridge/amd/agesa/family12/dimmSpd.c +++ b/src/northbridge/amd/agesa/family12/dimmSpd.c @@ -1,4 +1,4 @@ -/***************************************************************************** +/* * * Copyright (c) 2011, Advanced Micro Devices, Inc. * All rights reserved. @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - ***************************************************************************/ + */ #include <stdlib.h> #include "Porting.h" @@ -34,20 +34,21 @@ #include <northbridge/amd/agesa/dimmSpd.h> -typedef struct _DIMM_INFO_SMBUS{ - UINT8 SocketId; - UINT8 MemChannelId; - UINT8 DimmId; - UINT8 SmbusAddress; +typedef struct _DIMM_INFO_SMBUS { + UINT8 SocketId; + UINT8 MemChannelId; + UINT8 DimmId; + UINT8 SmbusAddress; } DIMM_INFO_SMBUS; + /* * SPD address table - porting required */ STATIC CONST DIMM_INFO_SMBUS SpdAddrLookup [] = { - /* Socket, Channel, Dimm, Smbus */ - {0, 0, 0, 0xA0}, - {0, 1, 0, 0xA2} + /* Socket, Channel, Dimm, Smbus */ + {0, 0, 0, 0xA0}, + {0, 1, 0, 0xA2} }; AGESA_STATUS @@ -57,17 +58,18 @@ AmdMemoryReadSPD ( IN OUT AGESA_READ_SPD_PARAMS *SpdData ) { - UINT8 SmBusAddress = 0; - UINTN Index; - UINTN MaxSocket = ARRAY_SIZE(SpdAddrLookup); - for (Index = 0; Index < MaxSocket; Index ++){ - if ((SpdData->SocketId == SpdAddrLookup[Index].SocketId) && - (SpdData->MemChannelId == SpdAddrLookup[Index].MemChannelId) && - (SpdData->DimmId == SpdAddrLookup[Index].DimmId)) { - SmBusAddress = SpdAddrLookup[Index].SmbusAddress; - break; - } - } + UINT8 SmBusAddress = 0; + UINTN Index; + UINTN MaxSocket = ARRAY_SIZE(SpdAddrLookup); + + for (Index = 0; Index < MaxSocket; Index ++) { + if ((SpdData->SocketId == SpdAddrLookup[Index].SocketId) && + (SpdData->MemChannelId == SpdAddrLookup[Index].MemChannelId) && + (SpdData->DimmId == SpdAddrLookup[Index].DimmId)) { + SmBusAddress = SpdAddrLookup[Index].SmbusAddress; + break; + } + } if (SmBusAddress == 0) return AGESA_ERROR;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2015