coreboot-gerrit December 2016

coreboot-gerrit@coreboot.org

1 participants
1140 discussions

Patch merged into coreboot/master: configs: Add some sample default configuration files
by gerrit＠coreboot.org 08 Dec '16

08 Dec '16

the following patch was just integrated into master: commit 7a128cb9c394837c67b63705f048e715755738de Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 23 21:00:05 2016 -0700 configs: Add some sample default configuration files Test some config options that don't typically get tested. Change-Id: Ie05c99411c8ce6462a6f5502b086ee2b72a4324b Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/17591 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber <nico.h(a)gmx.de> See https://review.coreboot.org/17591 for details. -gerrit

1 0

Patch set updated for coreboot: util/abuild: Fix or disable shellcheck warnings
by Martin Roth 08 Dec '16

08 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17722 -gerrit commit bc70140ba66a97b6115ec67cf7c021e7399028d5 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 30 16:32:20 2016 -0700 util/abuild: Fix or disable shellcheck warnings This cleans up the shellcheck warnings in abuild. Warning count: 1 Unexpected ==. 1 Use "${var:?}" to ensure this never expands to / . 1 VARIABLE appears unused. Verify it or export it. 1 Use "$@" (with quotes) to prevent whitespace problems. 2 Consider using { cmd1; cmd2; } >> file instead of individual redirects. 2 Expressions don't expand in single quotes, use double quotes for that. 3 Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. 4 $/${} is unnecessary on arithmetic variables. 5 Check exit code directly with 'if mycmd;', not indirectly with $?. 5 Use cd ... || exit in case cd fails. 11 Declare and assign separately to avoid masking return values. 13 Use $(..) instead of legacy `..`. 20 Don't use variables in the printf format string. 104 Double quote to prevent globbing. Change-Id: I9c77e122435ba87ce3a4aee76b5022f7265f9ef2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/abuild/abuild | 281 ++++++++++++++++++++++++++++------------------------- 1 file changed, 151 insertions(+), 130 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 300921a..f94e49a 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -32,7 +32,7 @@ export KCONFIG_OVERWRITECONFIG=1 PAYLOAD=/dev/null # path to coreboot XGCC -XGCCPATH="`pwd`/util/crossgcc/xgcc/bin/" +XGCCPATH="${TOP}/util/crossgcc/xgcc/bin/" # Add XGCC to the path. if [ -d "$XGCCPATH" ] && [[ ":$PATH:" != *":$XGCCPATH:"* ]]; then @@ -77,30 +77,25 @@ quiet=false # clang mode enabled by -sb option. scanbuild=false -ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/i86pc/i386/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ - -e "s/Power Macintosh/ppc/"` - trap interrupt INT function interrupt { - printf "\n$0: execution interrupted manually.\n" + printf "\n%s: execution interrupted manually.\n" "$0" if [ "$mode" == "junit" ]; then - printf "$0: deleting incomplete xml output file.\n" + printf "%s: deleting incomplete xml output file.\n" "$0" fi exit 1 } function debug { - test "$verbose" == "true" && printf "$*\n" + test "$verbose" == "true" && echo "$*" } function junit { - test "$mode" == "junit" && printf "$*\n" >> $XMLFILE + test "$mode" == "junit" && echo "$*" >> "$XMLFILE" return 0 } @@ -108,9 +103,9 @@ function junitfile { test "$mode" == "junit" && { printf '<![CDATA[\n' - cat $1 + cat "$1" printf ']]>\n' - } >> $XMLFILE + } >> "$XMLFILE" } # Return mainboard descriptors. @@ -120,6 +115,7 @@ function junitfile function get_mainboards { local search_space=${1-*/*} + # shellcheck disable=SC2086 grep -h "^[[:space:]]*config\>[[:space:]]*\<BOARD_" \ ${ROOT}/src/mainboard/${search_space}/Kconfig.name 2>/dev/null | \ sed "s,^.*\<BOARD_$[A-Z0-9_]*$\>.*$,\1," @@ -130,6 +126,7 @@ function mainboard_directory { local MAINBOARD=$1 + # shellcheck disable=SC2086 grep -l "^[[:space:]]*config\>[[:space:]]*\<BOARD_${MAINBOARD}\>" \ ${ROOT}/src/mainboard/*/*/Kconfig.name | \ sed "s:^$ROOT/src/mainboard/$.*$/Kconfig.name$:\1:" @@ -139,15 +136,17 @@ function mainboard_directory function mainboard_vendor { local MAINBOARD=$1 + local kconfig_file - local kconfig_file=$( \ + # shellcheck disable=SC2086 + kconfig_file=$( \ grep -l "^[[:space:]]*config\>[[:space:]]*\<BOARD_${MAINBOARD}\>" \ ${ROOT}/src/mainboard/*/*/Kconfig.name | \ sed "s:^$${ROOT}/src/mainboard/.*$/.*/$Kconfig.name$$:\1/\2:" ) if [ ! -f "$kconfig_file" ]; then exit 1 fi - grep "^[[:space:]]*config\>[[:space:]]*\<VENDOR_" $kconfig_file | \ + grep "^[[:space:]]*config\>[[:space:]]*\<VENDOR_" "$kconfig_file" | \ sed "s,^.*\<VENDOR_$[A-Z0-9_]*$\>.*$,\1," } @@ -157,16 +156,18 @@ function mainboard_vendor # If a directory contains multiple boards, returns them all. function normalize_target { - local targets=$(get_mainboards $1) + local targets + + targets=$(get_mainboards "$1") if [ -n "$targets" ]; then - echo $targets + echo "$targets" return fi - local targets=$(echo $1 | tr ',' ' ') + targets=$(echo "$1" | tr ',' ' ') for i in $targets; do - if [ -n "$(mainboard_directory $i)" ]; then - echo $i + if [ -n "$(mainboard_directory "$i")" ]; then + echo "$i" else echo "$i is not a valid target" >&2 exit 1 @@ -174,34 +175,36 @@ function normalize_target done } +# shellcheck disable=SC2129 function create_config { local BUILD_NAME=$1 local build_dir=$2 + local board_srcdir - local config_file=${build_dir}/config.build - local board_srcdir=$(mainboard_directory ${BUILD_NAME}) + local config_file="${build_dir}/config.build" + board_srcdir="$(mainboard_directory "${BUILD_NAME}")" - mkdir -p ${build_dir} - mkdir -p $TARGET/sharedutils + mkdir -p "${build_dir}" + mkdir -p "$TARGET/sharedutils" - if [ "$quiet" == "false" ]; then printf " Creating config file for $BUILD_NAME... \n"; fi - printf "CONFIG_VENDOR_$(mainboard_vendor ${BUILD_NAME})=y\n" > ${config_file} - printf "CONFIG_BOARD_${BUILD_NAME}=y\n" >> ${config_file} - grep "select[\t ]*ARCH" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig | \ - sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> ${config_file} - printf "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"\n" >> ${config_file} + if [ "$quiet" == "false" ]; then echo " Creating config file for $BUILD_NAME..."; fi + echo "CONFIG_VENDOR_$(mainboard_vendor "${BUILD_NAME}")=y" > "${config_file}" + echo "CONFIG_BOARD_${BUILD_NAME}=y" >> "${config_file}" + grep "select[\t ]*ARCH" "${ROOT}/src/mainboard/${board_srcdir}/Kconfig" | \ + sed "s,^.*$ARCH_.*$[^A-Z0-9_]*,CONFIG_\1=y," >> "${config_file}" + echo "CONFIG_MAINBOARD_DIR=\"${board_srcdir}\"" >> "${config_file}" update_config "$BUILD_NAME" "$build_dir" "$config_file" ret=$? if [ $ret -eq 0 ]; then - if [ "$quiet" == "false" ]; then printf " $BUILD_NAME config created.\n"; fi + if [ "$quiet" == "false" ]; then echo " $BUILD_NAME config created."; fi return 0 else # Does this ever happen? - if [ "$quiet" == "false" ]; then printf "$BUILD_NAME config creation FAILED!\nLog excerpt:\n"; fi - tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log + if [ "$quiet" == "false" ]; then printf "%s config creation FAILED!\nLog excerpt:\n" "$BUILD_NAME"; fi + tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" return 1 fi } @@ -212,6 +215,7 @@ function update_config local build_dir=$2 local config_file=$3 + local PAYLOAD local defconfig_file defconfig_file=${build_dir}/config.$(echo "${BUILD_NAME}" | tr '[:upper:]' '[:lower:]').default @@ -222,14 +226,15 @@ function update_config # the script returns an absolute path to the payload binary. if [ -f "$payloads/payload.sh" ]; then - local PAYLOAD=$(sh "$payloads/payload.sh" "$BUILD_NAME") - if [ $? -gt 0 ]; then + PAYLOAD=$(sh "$payloads/payload.sh" "$BUILD_NAME") + local PAYLOAD_OK=$? + if [ $PAYLOAD_OK -gt 0 ]; then echo "problem with payload" exit 1 fi if [ "$quiet" == "false" ]; then printf "Using payload %s\n" "$PAYLOAD"; fi elif [ "$payloads" = "none" ]; then - local PAYLOAD=none + PAYLOAD=none fi if [ "$PAYLOAD" = "none" ]; then @@ -257,9 +262,11 @@ function update_config if [ "$quiet" == "false" ]; then echo " $MAINBOARD ($customizing)"; fi echo "$configoptions" >> "${config_file}" - # shellcheck disable=SC2086 - $MAKE olddefconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" - if [ $? -eq 0 ]; then + # shellcheck disable=SC2086 + $MAKE olddefconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" ; \ + CONFIG_OK=$? + if [ $CONFIG_OK -eq 0 ]; then + # shellcheck disable=SC2086 $MAKE savedefconfig $silent DEFCONFIG="${defconfig_file}" DOTCONFIG="${config_file}" obj="${build_dir}" objutil="$TARGET/sharedutils" &> "${build_dir}/config.log" return $? else @@ -267,6 +274,7 @@ function update_config fi } +# shellcheck disable=SC2129 function create_buildenv { local BUILD_NAME=$1 @@ -280,22 +288,22 @@ function create_buildenv cp "$config_file" "$new_config_file" update_config "$BUILD_NAME" "$build_dir" "$new_config_file" fi - ret=$? + local ret=$? # Allow simple "make" in the target directory local MAKEFILE=$TARGET/${BUILD_NAME}/Makefile - echo "# autogenerated" > $MAKEFILE - echo "TOP=$ROOT" >> $MAKEFILE - echo "BUILD=$TARGET" >> $MAKEFILE - echo "OBJ=\$(BUILD)/${MAINBOARD}" >> $MAKEFILE - echo "OBJUTIL=\$(BUILD)/sharedutils" >> $MAKEFILE - echo "all:" >> $MAKEFILE - echo " @cp -a config.h config.h.bak" >> $MAKEFILE - echo " @cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE - echo " @tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> $MAKEFILE - echo " @cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> $MAKEFILE - echo " @rm config.h.bak config.new config.old" >> $MAKEFILE - echo " @cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE + echo "# autogenerated" > "$MAKEFILE" + echo "TOP=$ROOT" >> "$MAKEFILE" + echo "BUILD=$TARGET" >> "$MAKEFILE" + echo "OBJ=\$(BUILD)/${MAINBOARD}" >> "$MAKEFILE" + echo "OBJUTIL=\$(BUILD)/sharedutils" >> "$MAKEFILE" + echo "all:" >> "$MAKEFILE" + echo " @cp -a config.h config.h.bak" >> "$MAKEFILE" + echo " @cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> "$MAKEFILE" + echo " @tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> "$MAKEFILE" + echo " @cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> "$MAKEFILE" + echo " @rm config.h.bak config.new config.old" >> "$MAKEFILE" + echo " @cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> "$MAKEFILE" return $ret } @@ -322,41 +330,41 @@ function compile_target { local BUILD_NAME=$1 - if [ "$quiet" == "false" ]; then printf " Compiling $MAINBOARD image$cpuconfig...\n"; fi + if [ "$quiet" == "false" ]; then echo " Compiling $MAINBOARD image$cpuconfig..."; fi CURR=$( pwd ) #stime=`perl -e 'print time();' 2>/dev/null || date +%s` - eval $BUILDPREFIX $MAKE $silent DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \ - &> ${build_dir}/make.log - ret=$? - cp .xcompile ${build_dir}/xcompile.build - cd ${build_dir} - - etime=`perl -e 'print time();' 2>/dev/null || date +%s` - duration=$(( $etime - $stime )) + # shellcheck disable=SC2086 + eval $BUILDPREFIX $MAKE $silent DOTCONFIG="${build_dir}/config.build" obj="${build_dir}" objutil="$TARGET/sharedutils" \ + &> "${build_dir}/make.log" ; \ + MAKE_FAILED=$? + cp .xcompile "${build_dir}/xcompile.build" + cd "${build_dir}" || return $? + + etime=$(perl -e 'print time();' 2>/dev/null || date +%s) + duration=$(( etime - stime )) junit " <testcase classname='board${testclass/#/.}' name='$BUILD_NAME' time='$duration' >" - if [ $ret -eq 0 ]; then + if [ $MAKE_FAILED -eq 0 ]; then junit "<system-out>" junitfile make.log junit "</system-out>" printf "ok\n" > compile.status - printf "$BUILD_NAME built successfully. (took ${duration}s)\n" + printf "%s built successfully. (took %ss)\n" "$BUILD_NAME" "${duration}" else - ret=1 junit "<failure type='BuildFailed'>" junitfile make.log junit "</failure>" printf "failed\n" > compile.status - printf "$BUILD_NAME build FAILED after ${duration}s!\nLog excerpt:\n" + printf "%s build FAILED after %ss!\nLog excerpt:\n" "$BUILD_NAME" "${duration}" tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log failed=1 fi - cd $CURR - if [ $clean_work = "true" ]; then - rm -rf ${build_dir} + cd "$CURR" || return $? + if [ "$clean_work" = "true" ]; then + rm -rf "${build_dir}" fi - return $ret + return $MAKE_FAILED } function build_config @@ -365,11 +373,13 @@ function build_config local build_dir=$2 local BUILD_NAME=$3 local config_file=$4 + local board_srcdir + local ret - local board_srcdir=$(mainboard_directory "${MAINBOARD}") + board_srcdir=$(mainboard_directory "${MAINBOARD}") - if [ "$(cat "${build_dir}/compile.status" 2>/dev/null)" = "ok" -a \ - "$buildall" = "false" ]; then + if [ "$(cat "${build_dir}/compile.status" 2>/dev/null)" = "ok" ] && \ + [ "$buildall" = "false" ]; then echo "Skipping $BUILD_NAME; (already successful)" return fi @@ -389,7 +399,7 @@ function build_config if [ "$quiet" == "false" ]; then echo "Building $BUILD_NAME"; fi mkdir -p "$TARGET/${BUILD_NAME}" "$TARGET/abuild" - ABSPATH="$(cd "$TARGET/abuild"; pwd)" + ABSPATH="$(cd "$TARGET/abuild" && pwd)" XMLFILE="$ABSPATH/${BUILD_NAME}.xml" rm -f "${XMLFILE}" @@ -409,7 +419,7 @@ function build_config junitfile "$build_dir/config.log" junit "</failure>" printf "failed\n" > compile.status - printf "$BUILD_NAME build configuration FAILED!\nLog excerpt:\n" + printf "%s build configuration FAILED!\nLog excerpt:\n" "$BUILD_NAME" tail -n $CONTEXT "$build_dir/config.log" 2> /dev/null || tail -$CONTEXT "$build_dir/config.log" junit "</testcase>" @@ -417,25 +427,26 @@ function build_config fi - required_arches=`egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" $TARGET/${BUILD_NAME}/config.build | \ - sed "s,^CONFIG_ARCH_[^_]*_$[^=]*$=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z '` - missing_arches=`printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -` + required_arches=$(egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" "$TARGET/${BUILD_NAME}/config.build" | \ + sed "s,^CONFIG_ARCH_[^_]*_$[^=]*$=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z ') + # shellcheck disable=SC2016,SC2059 + missing_arches=$(printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -) if [ -n "$missing_arches" ]; then - printf "skipping $BUILD_NAME because we're missing compilers for ($missing_arches)\n" + printf "skipping %s because we're missing compilers for (%s)\n" "$BUILD_NAME" "$missing_arches" return fi - if [ $? -eq 0 -a $configureonly -eq 0 ]; then + if [ $BUILDENV_CREATED -eq 0 ] && [ $configureonly -eq 0 ]; then BUILDPREFIX= if [ "$scanbuild" = "true" ]; then scanbuild_out=$TARGET/${BUILD_NAME}-scanbuild - rm -rf ${scanbuild_out} + rm -rf "${scanbuild_out}" BUILDPREFIX="scan-build -o ${scanbuild_out}tmp" fi - compile_target ${BUILD_NAME} + compile_target "${BUILD_NAME}" if [ "$scanbuild" = "true" ]; then - mv ${scanbuild_out}tmp/* ${scanbuild_out} - rmdir ${scanbuild_out}tmp + mv "${scanbuild_out}"tmp/* "${scanbuild_out}" + rmdir "${scanbuild_out}tmp" fi fi @@ -446,11 +457,12 @@ function build_config function build_target { local MAINBOARD=$1 - local MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]') + local MAINBOARD_LC + MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]') # look for config files in the config directory that match the boardname if [ -n "$( find "$configdir" -maxdepth 1 -name "config.${MAINBOARD_LC}*" -print -quit )" ]; then - for config in "$configdir"/config."${MAINBOARD_LC}"*; do + for config in "$configdir/config.${MAINBOARD_LC}"*; do BUILD_NAME="${config##*/}" BUILD_NAME="${BUILD_NAME##config.}" BUILD_NAME=$(echo "${BUILD_NAME}" | tr '[:lower:]' '[:upper:]') @@ -485,7 +497,7 @@ function remove_target fi echo "Removing build dir for $BUILD_NAME..." - rm -rf "$TARGET/${BUILD_NAME}" + rm -rf "${TARGET:?}/${BUILD_NAME}" return } @@ -555,8 +567,8 @@ buildall=false verbose=false test -f util/sconfig/sconfig.l && ROOT=$( pwd ) -test -f ../util/sconfig/sconfig.l && ROOT=$( cd ..; pwd ) -test "$ROOT" = "" && ROOT=$( cd ../..; pwd ) +test -f ../util/sconfig/sconfig.l && ROOT=$( cd .. && pwd ) +test "$ROOT" = "" && ROOT=$( cd ../.. && pwd ) # Look if we have getopt. If not, build it. export PATH=$PATH:util/abuild @@ -566,18 +578,22 @@ getopt - > /dev/null 2>/dev/null || gcc -o util/abuild/getopt util/abuild/getopt cmdline="$* -c 1" # parse parameters.. try to find out whether we're running GNU getopt -getoptbrand="`getopt -V`" +getoptbrand="$(getopt -V)" + +# shellcheck disable=SC2086 if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=`getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@"` || exit 1 + args=$(getopt -l version,verbose,quiet,help,all,target:,payloads:,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs,clang,clean,outdir:,chromeos,xmlfile:,kconfig:,dir: -o Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: -- "$@") || exit 1 eval set -- $args + retval=$? else # Detected non-GNU getopt - args=`getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: $*` + args=$(getopt Vvqhat:p:c:sJCl:rP:uyBLzo:xX:K:d: "$@") set -- $args + retval=$? fi -if [ $? != 0 ]; then +if [ $retval != 0 ]; then myhelp exit 1 fi @@ -590,7 +606,7 @@ configoptions="" unset testclass while true ; do case "$1" in - -J|--junit) shift; mode=junit; rm -f $XMLFILE ;; + -J|--junit) shift; mode=junit; rm -f "$XMLFILE" ;; -t|--target) shift; target="$1"; shift;; -a|--all) shift; buildall=true;; -d|--dir) shift; configdir="$1"; shift;; @@ -605,7 +621,7 @@ while true ; do cpus=$1 test "$MAKEFLAGS" == "-j max" && export MAKEFLAGS="-j" && cpuconfig=" in parallel" test "$1" == "1" && cpuconfig=" on 1 cpu" - expr "$1" : '-\?[0-9]\+$' > /dev/null && test 0$1 -gt 1 && cpuconfig=" on $1 cpus in parallel" + expr "$1" : '-\?[0-9]\+$' > /dev/null && test "0$1" -gt 1 && cpuconfig=" on $1 cpus in parallel" shift;; -s|--silent) shift; silent="-s";; --scan-build) shift @@ -653,7 +669,7 @@ while true ; do ;; -X|--xmlfile) shift; XMLFILE=$1; REAL_XMLFILE=$1; shift;; -K|--kconfig) shift - testclass=="$(basename $1 | tr '.' '_' )" + testclass="$(basename "$1" | tr '.' '_' )" customizing="${customizing}, $1 config" configoptions="$(cat "$1")${configoptions}\n" shift;; @@ -663,12 +679,12 @@ while true ; do esac done -if [ -z "$TARGET" -o "$TARGET" = "/" ]; then +if [ -z "$TARGET" ] || [ "$TARGET" = "/" ]; then echo "Please specify a valid, non-root build directory." exit 1 fi -customizing=`echo $customizing |cut -c3-` +customizing=$(echo "$customizing" | cut -c3-) if [ "$customizing" = "" ]; then customizing="default configuration" fi @@ -692,44 +708,48 @@ build_targets() { local targets=${*-$(get_mainboards)} for MAINBOARD in $targets; do - build_target ${MAINBOARD} + build_target "${MAINBOARD}" done } else build_targets() { + local ABSPATH + local stime + local etime + local targets=${*-$(get_mainboards)} # seed shared utils - TMPCFG=`mktemp` - printf "$configoptions" > $TMPCFG - $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils allnoconfig - printf "$configoptions" >> $TMPCFG - yes "" 2>/dev/null | $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils oldconfig 2>/dev/null |head > /dev/null + TMPCFG=$(mktemp) + printf "%s" "$configoptions" > "$TMPCFG" + $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" allnoconfig + printf "%s" "$configoptions" >> "$TMPCFG" + yes "" 2>/dev/null | $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" oldconfig 2>/dev/null |head > /dev/null BUILDPREFIX= if [ "$scanbuild" = "true" ]; then scanbuild_out=$TARGET/sharedutils-scanbuild - rm -rf ${scanbuild_out} + rm -rf "${scanbuild_out}" BUILDPREFIX="scan-build -o ${scanbuild_out}tmp" fi - mkdir -p $TARGET/abuild - local ABSPATH=`cd $TARGET/abuild; pwd` - local XMLFILE=$ABSPATH/__util.xml - rm -f ${XMLFILE} - local stime=`perl -e 'print time();' 2>/dev/null || date +%s` - $BUILDPREFIX $MAKE -j $cpus DOTCONFIG=$TMPCFG obj=$TARGET/temp objutil=$TARGET/sharedutils tools > $TARGET/sharedutils/make.log 2>&1 + mkdir -p "$TARGET/abuild" + ABSPATH="$(cd "$TARGET/abuild" && pwd)" + local XMLFILE="$ABSPATH/__util.xml" + rm -f "${XMLFILE}" + stime=$(perl -e 'print time();' 2>/dev/null || date +%s) + $BUILDPREFIX $MAKE -j "$cpus" DOTCONFIG="$TMPCFG" obj="$TARGET/temp" objutil="$TARGET/sharedutils" tools > "$TARGET/sharedutils/make.log" 2>&1 local ret=$? - local etime=`perl -e 'print time();' 2>/dev/null || date +%s` - local duration=$(( $etime - $stime )) + etime=$(perl -e 'print time();' 2>/dev/null || date +%s) + local duration=$(( etime - stime )) junit " <testcase classname='util' name='all' time='$duration' >" if [ $ret -eq 0 ]; then junit "<system-out>" - junitfile $TARGET/sharedutils/make.log + junitfile "$TARGET/sharedutils/make.log" junit "</system-out>" junit "</testcase>" else junit "<failure type='BuildFailed'>" - junitfile $TARGET/sharedutils/make.log + junitfile "$TARGET/sharedutils/make.log" junit "</failure>" junit "</testcase>" return @@ -739,11 +759,12 @@ build_targets() fi if [ "$scanbuild" = "true" ]; then - mv ${scanbuild_out}tmp/* ${scanbuild_out} - rmdir ${scanbuild_out}tmp + mv "${scanbuild_out}tmp/"* "${scanbuild_out}" + rmdir "${scanbuild_out}tmp" fi - rm -rf $TARGET/temp $TMPCFG - echo $targets | xargs -P ${cpus:-0} -n 1 $0 $cmdline -t + rm -rf "$TARGET/temp" "$TMPCFG" + # shellcheck disable=SC2086 + echo $targets | xargs -P ${cpus:-0} -n 1 "$0" $cmdline -t } fi @@ -756,33 +777,33 @@ junit '<testsuite>' if [ "$target" != "" ]; then # build a single board - MAINBOARD=$(normalize_target ${target}) + MAINBOARD=$(normalize_target "${target}") if [ -z "${MAINBOARD}" ]; then - printf "No such target: $target\n" + printf "No such target: %s\n" "$target" exit 1 fi - build_srcdir=$(mainboard_directory ${MAINBOARD}) - if [ "$(echo ${MAINBOARD} | wc -w)" -gt 1 ]; then - build_targets ${MAINBOARD} - elif [ ! -r $ROOT/src/mainboard/${build_srcdir} ]; then - printf "No such target: ${MAINBOARD}\n" + build_srcdir="$(mainboard_directory "${MAINBOARD}")" + if [ "$(echo "${MAINBOARD}" | wc -w)" -gt 1 ]; then + build_targets "${MAINBOARD}" + elif [ ! -r "$ROOT/src/mainboard/${build_srcdir}" ]; then + echo "No such target: ${MAINBOARD}" exit 1 else - build_target ${MAINBOARD} + build_target "${MAINBOARD}" test "$mode" != "text" && \ - test -f $TARGET/abuild/${MAINBOARD}.xml && \ - cat $TARGET/abuild/${MAINBOARD}.xml >> $REAL_XMLFILE + test -f "$TARGET/abuild/${MAINBOARD}.xml" && \ + cat "$TARGET/abuild/${MAINBOARD}.xml" >> "$REAL_XMLFILE" XMLFILE=$REAL_XMLFILE fi else build_targets - rm -f $REAL_XMLFILE - XMLFILE=$REAL_XMLFILE + rm -f "$REAL_XMLFILE" + XMLFILE="$REAL_XMLFILE" junit '<?xml version="1.0" encoding="utf-8"?>' junit '<testsuite>' if [ "$mode" != "text" ]; then for xmlfile in $TARGET/abuild/*_*.xml; do - cat $xmlfile >> $REAL_XMLFILE + cat "$xmlfile" >> "$REAL_XMLFILE" done fi XMLFILE=$REAL_XMLFILE

1 0

Patch merged into coreboot/master: google/eve: Add ASL code to describe SPI FPC1020 controller
by gerrit＠coreboot.org 08 Dec '16

08 Dec '16

the following patch was just integrated into master: commit 57dcf55538e192b65f568eb7452043634fc49fce Author: Duncan Laurie <dlaurie(a)chromium.org> Date: Thu Dec 8 10:48:06 2016 -0800 google/eve: Add ASL code to describe SPI FPC1020 controller There is ongoing work to link SPI bus and devices in to the devicetree so this can be generated, but for now put in the raw ASL code to describe this controller so it can be used by the factory. BUG=chrome-os-partner:55538 TEST=successfully load fpc1020 kernel module on eve board Change-Id: I6641664e60fcf2c0bad4b3506c77513b26d7be2e Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org> Reviewed-on: https://review.coreboot.org/17776 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See https://review.coreboot.org/17776 for details. -gerrit

1 0

Patch merged into coreboot/master: soc/intel/apollolake: Move privilege drop to later stage
by gerrit＠coreboot.org 08 Dec '16

08 Dec '16

the following patch was just integrated into master: commit a697c19640527b67c4a25150ad8d01340d434a69 Author: Andrey Petrov <andrey.petrov(a)intel.com> Date: Wed Dec 7 10:47:46 2016 -0800 soc/intel/apollolake: Move privilege drop to later stage Previously privilege drop was happening "too early" and that caused some PMC IPC programming (performed in FSP) to fail because sideband was already locked out. This change set moves privilege drop to later stage, after last FSP notify call. BRANCH=reef BUG=chrome-os-partner:60657 TEST=iotools rdmsr X 0x121, make sure they can't be read. Also dmesg|grep -i IPC to make sure there are no errors related Change-Id: Ia3a774aee5fbf92805a5c69093bfbd3d7682c3a7 Signed-off-by: Andrey Petrov <andrey.petrov(a)intel.com> Reviewed-on: https://review.coreboot.org/17769 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See https://review.coreboot.org/17769 for details. -gerrit

1 0

Patch merged into coreboot/master: cpu/x86: allow AP callbacks after MP init
by gerrit＠coreboot.org 08 Dec '16

08 Dec '16

the following patch was just integrated into master: commit b21e362e93993a8879906cf3fa56586b84226920 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed Dec 7 00:32:19 2016 -0600 cpu/x86: allow AP callbacks after MP init There are circumstances where the APs need to run a piece of code later in the boot flow. The current MP init just parks the APs after MP init is completed so there's not an opportunity to target running a piece of code on all the APs at a later time. Therefore, provide an option, PARALLEL_MP_AP_WORK, that allows the APs to perform callbacks. BUG=chrome-os-partner:60657 BRANCH=reef Change-Id: I849ecfdd6641dd9424943e246317cd1996ef1ba6 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: https://review.coreboot.org/17745 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh <furquan(a)google.com> Reviewed-by: Lijian Zhao <lijian.zhao(a)intel.com> See https://review.coreboot.org/17745 for details. -gerrit

1 0

Patch merged into coreboot/master: bootstate: add arch specific hook at coreboot exit
by gerrit＠coreboot.org 08 Dec '16

08 Dec '16

the following patch was just integrated into master: commit 16bd2676ce1dcec342de19640c45bd7216ba70f1 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed Dec 7 11:58:20 2016 -0600 bootstate: add arch specific hook at coreboot exit The bootstate machine allows one to schedule work at the boundaries of each state. However, there are no priorities by design. As such if there are things that need to be performed that are interdependent between callbacks there's no way to do that aside from explicitly putting the call in one of the callbacks. This situation arises around BS_OS_RESUME, BS_PAYLOAD_LOAD, and BS_PAYLOAD_BOOT as those are the states where coreboot is about to exit. As such, provide an architecture specific hook at these key places so that one is guaranteed any work done in arch_bootstate_coreboot_exit() is after all callbacks in the state machine. BUG=chrome-os-partner:60657 BRANCH=reef Change-Id: Icb4afb341ab15af0670501b9d21799e564fb32c6 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: https://review.coreboot.org/17767 Tested-by: build bot (Jenkins) Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Reviewed-by: Andrey Petrov <andrey.petrov(a)intel.com> Reviewed-by: Furquan Shaikh <furquan(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See https://review.coreboot.org/17767 for details. -gerrit

1 0

Patch set updated for coreboot: google/eve: Add ASL code to describe SPI FPC1020 controller
by Duncan Laurie 08 Dec '16

08 Dec '16

Duncan Laurie (dlaurie(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17776 -gerrit commit d7d95b9f50a032e75cf3a45a951c240eeafd77e9 Author: Duncan Laurie <dlaurie(a)chromium.org> Date: Thu Dec 8 10:48:06 2016 -0800 google/eve: Add ASL code to describe SPI FPC1020 controller There is ongoing work to link SPI bus and devices in to the devicetree so this can be generated, but for now put in the raw ASL code to describe this controller so it can be used by the factory. BUG=chrome-os-partner:55538 TEST=successfully load fpc1020 kernel module on eve board Change-Id: I6641664e60fcf2c0bad4b3506c77513b26d7be2e Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org> --- src/mainboard/google/eve/acpi/mainboard.asl | 49 +++++++++++++++++++++++++++++ src/mainboard/google/eve/dsdt.asl | 3 ++ 2 files changed, 52 insertions(+) diff --git a/src/mainboard/google/eve/acpi/mainboard.asl b/src/mainboard/google/eve/acpi/mainboard.asl new file mode 100644 index 0000000..a55308f --- /dev/null +++ b/src/mainboard/google/eve/acpi/mainboard.asl @@ -0,0 +1,49 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +Scope (\_SB.PCI0.SPI1) +{ + Device (FPC) + { + Name (_HID, "PRP0001") + Name (_UID, 1) + Name (_CRS, ResourceTemplate () + { + SpiSerialBus ( + 0, // DeviceSelection (CS0) + PolarityLow, // DeviceSelectionPolarity + FourWireMode, // WireMode + 8, // DataBitLength + ControllerInitiated, // SlaveMode + 1000000, // ConnectionSpeed (1MHz) + ClockPolarityLow, // ClockPolarity + ClockPhaseFirst, // ClockPhase + "\\_SB.PCI0.SPI1", // ResourceSource + 0, // ResourceSourceIndex + ResourceConsumer, // ResourceUsage + ) + Interrupt (ResourceConsumer, Edge, ActiveLow) { 0x50 } + }) + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { + "compatible", + Package () { "fpc,fpc1020" } + }, + } + }) + } +} diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl index 2882d50..22b92f3 100644 --- a/src/mainboard/google/eve/dsdt.asl +++ b/src/mainboard/google/eve/dsdt.asl @@ -67,4 +67,7 @@ DefinitionBlock( { #include "acpi/dptf.asl" } + + /* ACPI code for EC functions */ + #include "acpi/mainboard.asl" }

1 0

Patch set updated for coreboot: Makefile.inc: Update what-jenkins-does target
by Martin Roth 08 Dec '16

08 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17014 -gerrit commit 77eb6e3fe1a6b559b1082e068974302560d3892d Author: Martin Roth <martinroth(a)google.com> Date: Wed Oct 12 14:40:26 2016 -0600 Makefile.inc: Update what-jenkins-does target - Update the junit.xml target to make it less util specific - Add builds of coreboot internal payloads: nvramcui and coreinfo Change-Id: I97fda909065659ab7fa4c8ee00d936d97b255bf7 Signed-off-by: Martin Roth <martinroth(a)google.com> --- Makefile.inc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index a193158..c5ce30f 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1019,18 +1019,18 @@ PHONY+=check-ramstage-overlaps endif junit.xml: - echo "Building $(UTIL)" + echo "Building $(BLD)" echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp - echo "<testcase classname='$(UTIL)' name='$(UTIL)'>" >> $@.tmp - -$(MAKE) -j $(CPUS) -C "util/$(UTIL)" clean distclean > $@.tmp.2 2>&1 - $(MAKE) -j $(CPUS) -C "util/$(UTIL)" $(MAKETARGET) >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \ + echo "<testcase classname='$(BLD)' name='$(BLD)'>" >> $@.tmp + -$(MAKE) -j $(CPUS) -C "$(BLD_DIR)$(BLD)" clean distclean > $@.tmp.2 2>&1 + $(MAKE) -j $(CPUS) -C "$(BLD_DIR)$(BLD)" $(MAKETARGET) >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \ cat $@.tmp.2; \ if [ "$$type" = "failure" ]; then \ echo "<failure type='buildFailed'>" >> $@.tmp; \ - echo "Building $(UTIL) Failed"; \ + echo "Building $(BLD) Failed"; \ else \ echo "<$$type>" >> $@.tmp; \ - echo "Building $(UTIL) Succeeded"; \ + echo "Building $(BLD) Succeeded"; \ fi; \ echo '<![CDATA[' >> $@.tmp; \ cat $@.tmp.2 >> $@.tmp; \ @@ -1038,7 +1038,7 @@ junit.xml: rm -f $@.tmp.2 echo "</testcase>" >> $@.tmp echo "</testsuite>" >> $@.tmp - mv $@.tmp "util/$(UTIL)/$@" + mv $@.tmp "$(BLD_DIR)$(BLD)/$@" echo TOOLLIST= \ @@ -1057,5 +1057,7 @@ what-jenkins-does: util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) (cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml) - $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) UTIL="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; ) - $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) UTIL="romcc" MFLAGS= MAKEFLAGS= MAKETARGET=test junit.xml + $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=util/ BLD="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; ) + $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/ BLD=nvramcui MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml + $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/ BLD=coreinfo MFLAGS= MAKEFLAGS= MAKETARGET=defaultbuild junit.xml + $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=util/ BLD=romcc MFLAGS= MAKEFLAGS= MAKETARGET=test junit.xml

1 0

Patch set updated for coreboot: nb/intel/gm45: Use lapic udelay in SMM
by Martin Roth 08 Dec '16

08 Dec '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17330 -gerrit commit 97678f63eb5e19f6fda88dac0709c045d946dae4 Author: Martin Roth <martinroth(a)google.com> Date: Tue Nov 8 16:49:52 2016 -0700 nb/intel/gm45: Use lapic udelay in SMM This is a follow-on patch to commit 10141c30 - (nb/intel/gm45: Use LAPIC udelay instead of custom version) which removed the custom udelay from everywhere except SMM. This patch removes it from SMM as well, and gets rid of the gm45/delay.c file. Needs to be tested: R400, T400, or T500 Change-Id: I7970bb5205f4aa10b38172ab5b9f8bcd6766c4e7 Signed-off-by: Martin Roth <martinroth(a)google.com> --- src/northbridge/intel/gm45/Makefile.inc | 2 +- src/northbridge/intel/gm45/delay.c | 86 --------------------------------- 2 files changed, 1 insertion(+), 87 deletions(-) diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc index ac5810b..fdf0012 100644 --- a/src/northbridge/intel/gm45/Makefile.inc +++ b/src/northbridge/intel/gm45/Makefile.inc @@ -34,6 +34,6 @@ ramstage-y += ram_calc.c ramstage-y += northbridge.c ramstage-y += gma.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += delay.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += ../../../cpu/x86/lapic/apic_timer.c endif diff --git a/src/northbridge/intel/gm45/delay.c b/src/northbridge/intel/gm45/delay.c deleted file mode 100644 index 328c751..0000000 --- a/src/northbridge/intel/gm45/delay.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2008 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <stdint.h> -#include <cpu/x86/tsc.h> -#include <cpu/x86/msr.h> -#include <cpu/intel/speedstep.h> -#include "delay.h" - -/** - * Intel Core(tm) CPUs always run the TSC at the maximum possible CPU clock - */ -static void _udelay(const u32 us, const u32 numerator, const int total) -{ - u32 dword; - tsc_t tsc, tsc1, tscd; - msr_t msr; - u32 fsb = 0, divisor; - u32 d; /* ticks per us */ - - msr = rdmsr(MSR_FSB_FREQ); - switch (msr.lo & 0x07) { - case 5: - fsb = 400; - break; - case 1: - fsb = 533; - break; - case 3: - fsb = 667; - break; - case 2: - fsb = 800; - break; - case 0: - fsb = 1067; - break; - case 4: - fsb = 1333; - break; - case 6: - fsb = 1600; - break; - } - - msr = rdmsr(0x198); - divisor = (msr.hi >> 8) & 0x1f; - - d = ((fsb * divisor) / numerator) / 4; /* CPU clock is always a quarter. */ - - multiply_to_tsc(&tscd, us, d); - - if (!total) { - tsc1 = rdtsc(); - dword = tsc1.lo + tscd.lo; - if ((dword < tsc1.lo) || (dword < tscd.lo)) { - tsc1.hi++; - } - tsc1.lo = dword; - tsc1.hi += tscd.hi; - } else { - tsc1 = tscd; - } - - do { - tsc = rdtsc(); - } while ((tsc.hi < tsc1.hi) - || ((tsc.hi == tsc1.hi) && (tsc.lo < tsc1.lo))); -} - -void udelay(const u32 us) -{ - _udelay(us, 1, 0); -}

1 0

New patch to review for coreboot: google/eve: Add ASL code to describe SPI FPC1020 controller
by Duncan Laurie 08 Dec '16

08 Dec '16

Duncan Laurie (dlaurie(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17776 -gerrit commit c39fafa63941ebf6f2a4804f1446b9fca7eeae8f Author: Duncan Laurie <dlaurie(a)chromium.org> Date: Thu Dec 8 10:48:06 2016 -0800 google/eve: Add ASL code to describe SPI FPC1020 controller There is ongoing work to link SPI bus and devices in to the devicetree so this can be generated, but for now put in the raw ASL code to describe this controller so it can be used by the factory. BUG=chrome-os-partner:55538 TEST=successfully load fpc1020 kernel module on eve board Change-Id: I6641664e60fcf2c0bad4b3506c77513b26d7be2e Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org> --- src/mainboard/google/eve/acpi/mainboard.asl | 40 +++++++++++++++++++++++++++++ src/mainboard/google/eve/dsdt.asl | 3 +++ 2 files changed, 43 insertions(+) diff --git a/src/mainboard/google/eve/acpi/mainboard.asl b/src/mainboard/google/eve/acpi/mainboard.asl new file mode 100644 index 0000000..55a99b6 --- /dev/null +++ b/src/mainboard/google/eve/acpi/mainboard.asl @@ -0,0 +1,40 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +Scope (\_SB.PCI0.SPI1) +{ + Device (FPC) + { + Name (_HID, "FPC1020") + Name (_UID, 1) + Name (_CRS, ResourceTemplate () + { + SpiSerialBus ( + 0, // DeviceSelection (CS0) + PolarityLow, // DeviceSelectionPolarity + FourWireMode, // WireMode + 8, // DataBitLength + ControllerInitiated, // SlaveMode + 1000000, // ConnectionSpeed (1MHz) + ClockPolarityLow, // ClockPolarity + ClockPhaseFirst, // ClockPhase + "\\_SB.PCI0.SPI1", // ResourceSource + 0, // ResourceSourceIndex + ResourceConsumer, // ResourceUsage + ) + Interrupt (ResourceConsumer, Edge, ActiveLow) { 0x50 } + }) + } +} diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl index 2882d50..22b92f3 100644 --- a/src/mainboard/google/eve/dsdt.asl +++ b/src/mainboard/google/eve/dsdt.asl @@ -67,4 +67,7 @@ DefinitionBlock( { #include "acpi/dptf.asl" } + + /* ACPI code for EC functions */ + #include "acpi/mainboard.asl" }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2016