coreboot-gerrit January 2016

coreboot-gerrit@coreboot.org

1 participants
2471 discussions

Patch set updated for coreboot: soc/braswell/acpi: Fix CID1 offset in comment
by Hannah Williams 27 Jan '16

27 Jan '16

Hannah Williams (hannah.williams(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13483 -gerrit commit 70ddcc10a40980d5b3a53a11f1eeaa7118fbcaab Author: Hannah Williams <hannah.williams(a)intel.com> Date: Tue Jan 26 15:40:24 2016 -0800 soc/braswell/acpi: Fix CID1 offset in comment Signed-off-by: Hannah Williams <hannah.williams(a)intel.com> Change-Id: I9fd2ebba985362fe8068c10390bb014cf9015ac5 --- src/soc/intel/braswell/acpi/globalnvs.asl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index e7fb2ce..5c8a75f 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/acpi/globalnvs.asl @@ -51,7 +51,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) PM1I, 32, /* 0x15 - System Wake Source - PM1 Index */ GPEI, 32, /* 0x19 - GPE Wake Source */ BDID, 8, /* 0x1d - Board ID */ - CID1, 16, /* 0x1A - Wifi Domain Type */ + CID1, 16, /* 0x1e - Wifi Domain Type */ /* Device Config */ Offset (0x20),

1 0

Patch set updated for coreboot: util/crossgcc: Add ability to build host tools/libs
by Nico Huber 27 Jan '16

27 Jan '16

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13471 -gerrit commit d84fb90c7dffd23203f8b3b03cc3937143df184f Author: Nico Huber <nico.huber(a)secunet.com> Date: Tue Jan 26 16:09:31 2016 +0100 util/crossgcc: Add ability to build host tools/libs We currently mix builds of host tools and libraries with builds of our target toolchain. To end this, add the option to prefix a package name with `host-` to build it only once for the host. Details: o Resulting files will be installed into xgcc-host/ instead of xgcc/. o .success files moved into the destination dir. That way we can tell that a package has been built even if the package build directory was removed. Change-Id: I52a7245714a040d11f6e1ac8bdbff8057bb7f0a1 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- util/crossgcc/buildgcc | 88 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 19 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 138558a..d3a3cec 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -23,10 +23,12 @@ CROSSGCC_VERSION="1.33" # default settings PACKAGE=GCC +HOSTDIR=$(pwd)/xgcc-host TARGETDIR=$(pwd)/xgcc TARGETARCH=i386-elf LANGUAGES=c DESTDIR= +CLEANHOST=0 SAVETEMPS=0 SKIPPYTHON=1 @@ -94,6 +96,43 @@ NC='\033[0m' # No Color UNAME=$(uname | grep -iq cygwin && echo Cygwin || uname) HALT_FOR_TOOLS=0 +is_host_package() +{ + echo $1 | grep -q '^host-' >/dev/null 2>&1 +} + +package_name() +{ + echo $1 | sed -e 's/^host-//' +} + +build_dir() +{ + if is_host_package $1; then + echo build-$1 + else + echo build-${TARGETARCH}-$2 + fi +} + +install_dir() +{ + if is_host_package $1; then + echo $HOSTDIR + else + echo $TARGETDIR + fi +} + +success_file() +{ + if is_host_package $1; then + echo .$2.success + else + echo .$2-$TARGETARCH.success + fi +} + normalize_dirs() { mkdir -p $DESTDIR$TARGETDIR/lib @@ -200,7 +239,7 @@ download_showing_percentage() { } download() { - package=$1 + package=$(package_name $1) archive="$(eval echo \$$package"_ARCHIVE")" FILE=$(basename $archive) @@ -225,7 +264,7 @@ download() { } unpack_and_patch() { - package=$1 + package=$(package_name $1) archive="$(eval echo \$$package"_ARCHIVE")" dir="$(eval echo \$$package"_DIR")" test -d ${dir} && test -f ${dir}/.unpack_success || ( @@ -260,29 +299,31 @@ is_package_enabled() } build() { - package=$1 + pkgspec=$1 + package=$(package_name $pkgspec) fn_exists build_$package || return version="$(eval echo \$$package"_VERSION")" - BUILDDIR=build-${TARGETARCH}-$package + SUCCESS=$(success_file $pkgspec $package) + BUILDDIR=$(build_dir $pkgspec $package) + INSTALLDIR=$(install_dir $pkgspec) mkdir -p ${BUILDDIR} - is_package_enabled "$package" && \ - if [ -f ${BUILDDIR}/.success ]; then - printf "Skipping $package as it is already built\n" + is_package_enabled "$pkgspec" && \ + if [ -f ${INSTALLDIR}/${SUCCESS} ]; then + printf "Skipping $pkgspec as it is already built\n" else - printf "Building $package $version ... " + printf "Building $pkgspec $version ... " DIR=$PWD cd ${BUILDDIR} rm -f .failed - build_${package} > build.log 2>&1 - cd $DIR/${BUILDDIR} - if [ ! -f .failed ]; then touch .success; fi - cd .. - - if [ -r "${BUILDDIR}/.failed" ]; then + build_${package} $pkgspec > build.log 2>&1 + cd $DIR + if [ ! -f ${BUILDDIR}/.failed ]; then + touch ${INSTALLDIR}/${SUCCESS}; + else printf "${RED}failed${NC}. Check ${BUILDDIR}/build.log.\n" exit 1 fi @@ -293,9 +334,13 @@ build() { cleanup() { printf "Cleaning up temporary files... " - for package in $PACKAGES; do - rm -rf build-${TARGETARCH}-$package $(eval echo \$$package"_DIR") + for pkgspec in $PACKAGES; do + package=$(package_name $pkgspec) + rm -rf $(build_dir $pkgspec $package) $(eval echo \$$package"_DIR") done + if [ $CLEANHOST = 1 ]; then + rm -rf $DESTDIR$HOSTDIR + fi rm -f getopt printf "${green}ok${NC}\n" } @@ -310,6 +355,7 @@ myhelp() printf " [-V|--version] print version number and exit\n" printf " [-h|--help] print this help and exit\n" printf " [-c|--clean] remove temporary files before build\n" + printf " [-r|--cleanhost] remove temporary files for host libs and tools\n" printf " [-t|--savetemps] don't remove temporary files after build\n" printf " [-y|--ccache] Use ccache when building cross compiler\n" printf " [-j|--jobs <num>] run <num> jobs in parallel in make\n" @@ -562,8 +608,12 @@ while true ; do -V|--version) shift; myversion; exit 0;; -h|--help) shift; myhelp; exit 0;; -c|--clean) shift; clean=1;; + -r|--cleanhost) shift; CLEANHOST=1;; -t|--savetemps) shift; SAVETEMPS=1;; - -d|--directory) shift; TARGETDIR="$1"; shift;; + -d|--directory) shift + TARGETDIR="$(echo $1 | sed -e 's,/*$,,')" + HOSTDIR="$TARGETDIR-host" + shift;; -p|--platform) shift; TARGETARCH="$1"; shift;; -l|--languages) shift; LANGUAGES="$1"; shift;; -D|--destdir) shift; DESTDIR="$1"; shift;; @@ -702,8 +752,8 @@ fi # Prepare target directory for building GCC # (dependencies must be in the PATH) -mkdir -p $DESTDIR$TARGETDIR/bin -export PATH=$DESTDIR$TARGETDIR/bin:$PATH +mkdir -p $DESTDIR$HOSTDIR/bin $DESTDIR$TARGETDIR/bin +export PATH=$DESTDIR$HOSTDIR/bin:$DESTDIR$TARGETDIR/bin:$PATH # Download, unpack, patch and build all packages

1 0

Patch set updated for coreboot: util/crossgcc: Add option to bootstrap a host gcc
by Nico Huber 27 Jan '16

27 Jan '16

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13473 -gerrit commit 1b971c27cffab985b7a39967df9b672c6f66af00 Author: Nico Huber <nico.huber(a)secunet.com> Date: Tue Jan 26 16:10:17 2016 +0100 util/crossgcc: Add option to bootstrap a host gcc Bootstrapping gcc is the recommended way if your host gcc's version doesn't match the gcc version you're going to build. While a build with an outdated host gcc usually succeeds, an outdated gnat seems to be a bigger issue. Change-Id: Icb47d3e9dbafc55737fbc3ce62a084fb9d5f359a Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- util/crossgcc/Makefile | 3 ++- util/crossgcc/buildgcc | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile index 79e0c3c..4f5d919 100644 --- a/util/crossgcc/Makefile +++ b/util/crossgcc/Makefile @@ -25,7 +25,8 @@ build_tools: build_gcc build_iasl build_gdb build_gcc: bash ./buildgcc -p $(BUILD_PLATFORM) $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) \ - $(if $(BUILD_LANGUAGES),-l $(BUILD_LANGUAGES)) + $(if $(BUILD_LANGUAGES),-l $(BUILD_LANGUAGES)) \ + $(if $(BUILD_BOOTSTRAP),-b) \ build_gdb: ifeq ($(SKIP_GDB),) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index c621f4f..69be3fd 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -19,7 +19,7 @@ cd $(dirname $0) CROSSGCC_DATE="January 26th, 2016" -CROSSGCC_VERSION="1.35" +CROSSGCC_VERSION="1.36" # default settings PACKAGE=GCC @@ -31,6 +31,7 @@ DESTDIR= CLEANHOST=0 SAVETEMPS=0 SKIPPYTHON=1 +BOOTSTRAP=0 # GCC toolchain version numbers GMP_VERSION=6.1.0 @@ -367,6 +368,8 @@ myhelp() printf " [-P|--package <package>] Build a specific package: GCC, CLANG, IASL, GDB\n" printf " (defaults to $PACKAGE)\n" printf "GCC specific options:\n" + printf " [-b|--bootstrap] bootstrap the host compiler before building\n" + printf " the cross compiler\n" printf " [-p|--platform <platform>] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" printf " [-l|--languages <languages>] comma separated list of target languages\n" @@ -467,8 +470,24 @@ build_BINUTILS() { $MAKE install DESTDIR=$DESTDIR || touch .failed } +build_host_GCC() { + CC="$CC" CFLAGS_FOR_TARGET="-O2" BOOT_CFLAGS="-O2" \ + ../gcc-${GCC_VERSION}/configure \ + --prefix=$HOSTDIR --libexecdir=$HOSTDIR/lib \ + --enable-bootstrap \ + --disable-werror --disable-nls \ + --disable-libssp --disable-libquadmath \ + ${GCC_OPTIONS} --enable-languages="${LANGUAGES}" \ + --with-gmp=$DESTDIR$HOSTDIR --with-mpfr=$DESTDIR$HOSTDIR \ + --with-mpc=$DESTDIR$HOSTDIR --with-libelf=$DESTDIR$HOSTDIR \ + --with-pkgversion="coreboot toolchain host bootstrap v$CROSSGCC_VERSION $CROSSGCC_DATE" \ + && \ + $MAKE $JOBS CFLAGS_FOR_BUILD="-O2" BOOT_CFLAGS="-O2" bootstrap && \ + $MAKE install DESTDIR=$DESTDIR && \ + ln -s gcc $DESTDIR$2/bin/cc || touch .failed +} -build_GCC() { +build_target_GCC() { # GCC does not honor HOSTCFLAGS at all. CFLAGS are used for # both target and host object files. # There's a work-around called CFLAGS_FOR_BUILD and CFLAGS_FOR_TARGET @@ -495,6 +514,14 @@ build_GCC() { fi } +build_GCC() { + if is_host_package $1; then + build_host_GCC $@ + else + build_target_GCC $@ + fi +} + build_EXPAT() { CC="$CC" CFLAGS="$HOSTCFLAGS" ../${EXPAT_DIR}/configure --disable-shared \ --prefix=$HOSTDIR --target=${TARGETARCH} || touch .failed @@ -614,6 +641,7 @@ while true ; do TARGETDIR="$(echo $1 | sed -e 's,/*$,,')" HOSTDIR="$TARGETDIR-host" shift;; + -b|--bootstrap) shift; BOOTSTRAP=1;; -p|--platform) shift; TARGETARCH="$1"; shift;; -l|--languages) shift; LANGUAGES="$1"; shift;; -D|--destdir) shift; DESTDIR="$1"; shift;; @@ -656,7 +684,11 @@ case "$PACKAGE" in GCC|gcc) echo "Target architecture is now $TARGETARCH" NAME="${TARGETARCH} cross GCC" - PACKAGES="host-GMP host-MPFR host-MPC host-LIBELF BINUTILS GCC" + if [ $BOOTSTRAP -eq 1 ]; then + PACKAGES="host-GMP host-MPFR host-MPC host-LIBELF host-GCC BINUTILS GCC" + else + PACKAGES="host-GMP host-MPFR host-MPC host-LIBELF BINUTILS GCC" + fi ;; GDB|gdb) NAME="${TARGETARCH} cross GDB"

1 0

Patch set updated for coreboot: util/crossgcc: Build gmp, mpfr, mpc, libelf, gdb and iasl for the host
by Nico Huber 27 Jan '16

27 Jan '16

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13472 -gerrit commit 19386a1f688243622ae03e08fbb0cf7b3cefda3b Author: Nico Huber <nico.huber(a)secunet.com> Date: Tue Jan 26 16:14:06 2016 +0100 util/crossgcc: Build gmp, mpfr, mpc, libelf, gdb and iasl for the host Change-Id: I731cfe230304ccafad3e1f0527592c6a382e2cb1 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- util/crossgcc/buildgcc | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d3a3cec..c621f4f 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -18,8 +18,8 @@ cd $(dirname $0) -CROSSGCC_DATE="November 25th, 2015" -CROSSGCC_VERSION="1.33" +CROSSGCC_DATE="January 26th, 2016" +CROSSGCC_VERSION="1.35" # default settings PACKAGE=GCC @@ -404,7 +404,7 @@ EOF } build_GMP() { - CC="$CC" CFLAGS="-Os" ../${GMP_DIR}/configure --disable-shared --enable-fat --prefix=$TARGETDIR $OPTIONS \ + CC="$CC" CFLAGS="-Os" ../${GMP_DIR}/configure --disable-shared --enable-fat --prefix=$HOSTDIR $OPTIONS \ || touch .failed $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed @@ -413,15 +413,15 @@ build_GMP() { # Now set CFLAGS to match GMP CFLAGS but strip out -pedantic # as GCC 4.6.x fails if it's there. - export HOSTCFLAGS=$(grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d\" -f2 |\ + export HOSTCFLAGS=$(grep __GMP_CFLAGS $DESTDIR$HOSTDIR/include/gmp.h |cut -d\" -f2 |\ sed s,-pedantic,,) } build_MPFR() { test $UNAME = "Darwin" && CFLAGS="$CFLAGS -force_cpusubtype_ALL" - CC="$CC" ../${MPFR_DIR}/configure --disable-shared --prefix=$TARGETDIR \ - --infodir=$TARGETDIR/info \ - --with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \ + CC="$CC" ../${MPFR_DIR}/configure --disable-shared --prefix=$HOSTDIR \ + --infodir=$HOSTDIR/info \ + --with-gmp=$DESTDIR$HOSTDIR CFLAGS="$HOSTCFLAGS" || \ touch .failed $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed @@ -430,14 +430,14 @@ build_MPFR() { # work around build problem of libgmp.la if [ "$DESTDIR" != "" ]; then - perl -pi -e "s,$DESTDIR,," $DESTDIR$TARGETDIR/libgmp.la + perl -pi -e "s,$DESTDIR,," $DESTDIR$HOSTDIR/libgmp.la fi } build_MPC() { - CC="$CC" ../${MPC_DIR}/configure --disable-shared --prefix=$TARGETDIR \ - --infodir=$TARGETDIR/info --with-mpfr=$DESTDIR$TARGETDIR \ - --with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \ + CC="$CC" ../${MPC_DIR}/configure --disable-shared --prefix=$HOSTDIR \ + --infodir=$HOSTDIR/info --with-mpfr=$DESTDIR$HOSTDIR \ + --with-gmp=$DESTDIR$HOSTDIR CFLAGS="$HOSTCFLAGS" || \ touch .failed $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed @@ -447,10 +447,10 @@ build_MPC() { build_LIBELF() { CC="$CC" CFLAGS="$HOSTCFLAGS" libelf_cv_elf_h_works=no \ - ../${LIBELF_DIR}/configure --disable-shared --prefix=$TARGETDIR \ - --infodir=$TARGETDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed + ../${LIBELF_DIR}/configure --disable-shared --prefix=$HOSTDIR \ + --infodir=$HOSTDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed $MAKE $JOBS || touch .failed - $MAKE install prefix=$DESTDIR$TARGETDIR || touch .failed + $MAKE install prefix=$DESTDIR$HOSTDIR || touch .failed normalize_dirs } @@ -482,8 +482,8 @@ build_GCC() { --disable-libssp --disable-bootstrap --disable-nls \ --disable-libquadmath --without-headers \ ${GCC_OPTIONS} --enable-languages="${LANGUAGES}" \ - --with-gmp=$DESTDIR$TARGETDIR --with-mpfr=$DESTDIR$TARGETDIR \ - --with-mpc=$DESTDIR$TARGETDIR --with-libelf=$DESTDIR$TARGETDIR \ + --with-gmp=$DESTDIR$HOSTDIR --with-mpfr=$DESTDIR$HOSTDIR \ + --with-mpc=$DESTDIR$HOSTDIR --with-libelf=$DESTDIR$HOSTDIR \ --with-pkgversion="coreboot toolchain v$CROSSGCC_VERSION $CROSSGCC_DATE" \ || touch .failed $MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" all-gcc || touch .failed @@ -497,7 +497,7 @@ build_GCC() { build_EXPAT() { CC="$CC" CFLAGS="$HOSTCFLAGS" ../${EXPAT_DIR}/configure --disable-shared \ - --prefix=$TARGETDIR --target=${TARGETARCH} || touch .failed + --prefix=$HOSTDIR --target=${TARGETARCH} || touch .failed $MAKE || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed @@ -505,7 +505,7 @@ build_EXPAT() { } build_PYTHON() { - CC="$CC" CFLAGS="$HOSTCFLAGS" ../${PYTHON_DIR}/configure --prefix=$TARGETDIR \ + CC="$CC" CFLAGS="$HOSTCFLAGS" ../${PYTHON_DIR}/configure --prefix=$HOSTDIR \ --target=${TARGETARCH} || touch .failed $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed @@ -514,14 +514,14 @@ build_PYTHON() { } build_GDB() { - export PYTHONHOME=$DESTDIR$TARGETDIR + export PYTHONHOME=$DESTDIR$HOSTDIR if [ $(uname) != "FreeBSD" -a $(uname) != "NetBSD" ]; then LIBDL="-ldl" fi - LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ + LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$HOSTDIR/lib \ -lpthread $LIBDL -lutil" \ - CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \ - ../${GDB_DIR}/configure --prefix=$TARGETDIR \ + CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$HOSTDIR/include" \ + ../${GDB_DIR}/configure --prefix=$HOSTDIR \ --target=${TARGETARCH} --disable-werror --disable-nls $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed @@ -536,8 +536,8 @@ build_IASL() { test $UNAME = "FreeBSD" && HOST="_FreeBSD" test $UNAME = "Cygwin" && HOST="_CYGWIN" HOST="$HOST" OPT_CFLAGS="-O -D_FORTIFY_SOURCE=2 -D COREBOOT_TOOLCHAIN_VERSION='\"coreboot toolchain v$CROSSGCC_VERSION $CROSSGCC_DATE\"' " CFLAGS="$CFLAGS" $MAKE CC="$CC" iasl || touch $RDIR/.failed - rm -f $DESTDIR$TARGETDIR/bin/iasl || touch $RDIR/.failed - cp bin/iasl $DESTDIR$TARGETDIR/bin || touch $RDIR/.failed + rm -f $DESTDIR$HOSTDIR/bin/iasl || touch $RDIR/.failed + cp bin/iasl $DESTDIR$HOSTDIR/bin || touch $RDIR/.failed } build_LLVM() { @@ -656,13 +656,13 @@ case "$PACKAGE" in GCC|gcc) echo "Target architecture is now $TARGETARCH" NAME="${TARGETARCH} cross GCC" - PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC" + PACKAGES="host-GMP host-MPFR host-MPC host-LIBELF BINUTILS GCC" ;; GDB|gdb) NAME="${TARGETARCH} cross GDB" - PACKAGES="GDB" + PACKAGES="host-GDB" if [ $SKIPPYTHON -eq 0 ]; then - PACKAGES="EXPAT PYTHON $PACKAGES" + PACKAGES="host-EXPAT host-PYTHON $PACKAGES" fi ;; CLANG|clang) @@ -672,7 +672,7 @@ case "$PACKAGE" in ;; IASL|iasl) NAME="IASL ACPI compiler" - PACKAGES=IASL + PACKAGES="host-IASL" ;; *) printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL)${NC}\n\n";

1 0

New patch to review for coreboot: soc/braswell/acpi: Remove GPEI from global nvs
by Hannah Williams 27 Jan '16

27 Jan '16

Hannah Williams (hannah.williams(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13483 -gerrit commit 40c90314f6ac3cb707ca9ac378d90b1a0843e9a2 Author: Hannah Williams <hannah.williams(a)intel.com> Date: Tue Jan 26 15:40:24 2016 -0800 soc/braswell/acpi: Remove GPEI from global nvs GPEI is not used Signed-off-by: Hannah Williams <hannah.williams(a)intel.com> Change-Id: I9fd2ebba985362fe8068c10390bb014cf9015ac5 --- src/soc/intel/braswell/acpi/globalnvs.asl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index e7fb2ce..a5ac087 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/acpi/globalnvs.asl @@ -49,8 +49,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) TLVL, 8, /* 0x13 - Throttle Level */ PPCM, 8, /* 0x14 - Maximum P-state usable by OS */ PM1I, 32, /* 0x15 - System Wake Source - PM1 Index */ - GPEI, 32, /* 0x19 - GPE Wake Source */ - BDID, 8, /* 0x1d - Board ID */ + BDID, 8, /* 0x19 - Board ID */ CID1, 16, /* 0x1A - Wifi Domain Type */ /* Device Config */

1 0

New patch to review for coreboot: util/cbfstool: add 'compact' command
by Aaron Durbin 27 Jan '16

27 Jan '16

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13479 -gerrit commit 95b7a687ff5cdfd7157076d880f92427ee5467e1 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Jan 26 17:08:56 2016 -0600 util/cbfstool: add 'compact' command While assembling CBFS images within the RW slots on Chrome OS machines the current approach is to 'cbfstool copy' from the RO CBFS to each RW CBFS. Additional fixups are required such as removing unneeded files from the RW CBFS (e.g. verstage) as well as removing and adding back files with the proper arguments (FSP relocation as well as romstage XIP relocation). This ends up leaving holes in the RW CBFS. To speed up RW CBFS slot hashing it's beneficial to pack all non-empty files together at the beginning of the CBFS. Therefore, provide the 'compact' command which bubbles all the empty entries to the end of the CBFS. Before: Name Offset Type Size cmos_layout.bin 0x0 cmos_layout 1164 dmic-2ch-48khz-16b.bin 0x500 raw 2920 dmic-2ch-48khz-32b.bin 0x10c0 raw 2920 nau88l25-2ch-48khz-24b.bin 0x1c80 raw 84 ssm4567-render-2ch-48khz-24b.bin 0x1d40 raw 84 ssm4567-capture-4ch-48khz-32b.bin 0x1e00 raw 84 vbt.bin 0x1ec0 optionrom 4096 spd.bin 0x2f00 spd 1536 config 0x3540 raw 6839 revision 0x5040 raw 606 font.bin 0x5300 raw 1919 (57892 after LZMA decompression) vbgfx.bin 0x5ac0 raw 13048 (936784 after LZMA decompression) locales 0x8e00 raw 2 locale_en.bin 0x8e40 raw 10742 (180754 after LZMA decompression) u-boot.dtb 0xb880 mrc_cache 4081 (empty) 0xc8c0 null 44532 fallback/ramstage 0x17740 stage 86597 (empty) 0x2c9c0 null 54052 fallback/payload 0x39d80 payload 74309 cpu_microcode_blob.bin 0x4c000 microcode 94208 (empty) 0x63080 null 3657496 After: Name Offset Type Size cmos_layout.bin 0x0 cmos_layout 1164 dmic-2ch-48khz-16b.bin 0x500 raw 2920 dmic-2ch-48khz-32b.bin 0x10c0 raw 2920 nau88l25-2ch-48khz-24b.bin 0x1c80 raw 84 ssm4567-render-2ch-48khz-24b.bin 0x1d40 raw 84 ssm4567-capture-4ch-48khz-32b.bin 0x1e00 raw 84 vbt.bin 0x1ec0 optionrom 4096 spd.bin 0x2f00 spd 1536 config 0x3540 raw 6839 revision 0x5040 raw 606 font.bin 0x5300 raw 1919 (57892 after LZMA decompression) vbgfx.bin 0x5ac0 raw 13048 (936784 after LZMA decompression) locales 0x8e00 raw 2 locale_en.bin 0x8e40 raw 10742 (180754 after LZMA decompression) u-boot.dtb 0xb880 mrc_cache 4081 fallback/ramstage 0xc8c0 stage 86597 fallback/payload 0x21b40 payload 74309 cpu_microcode_blob.bin 0x33dc0 microcode 94208 (empty) 0x4ae40 null 3756376 Change-Id: I8311172d71a2ccfccab384f8286cf9f21a17dec9 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- util/cbfstool/cbfs_image.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 4 +++ util/cbfstool/cbfstool.c | 10 ++++++ 3 files changed, 97 insertions(+) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 8425095..325b4b8 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -440,6 +440,89 @@ int cbfs_copy_instance(struct cbfs_image *image, struct buffer *dst) return 0; } +static size_t cbfs_file_entry_size(const struct cbfs_file *f) +{ + return ntohl(f->offset) + ntohl(f->len); +} + +int cbfs_compact_instance(struct cbfs_image *image) +{ + assert(image); + + struct cbfs_file *prev; + struct cbfs_file *cur; + + /* The prev entry will always be an empty entry. */ + prev = NULL; + + /* + * Note: this function does not honor alignment or fixed location files. + * It's behavior is akin to cbfs_copy_instance() in that it expects + * the caller to understand the ramifications of compacting a + * fragmented CBFS image. + */ + + for (cur = cbfs_find_first_entry(image); + cur && cbfs_is_valid_entry(image, cur); + cur = cbfs_find_next_entry(image, cur)) { + size_t prev_size; + size_t cur_size; + void *empty_file_and_data; + uint32_t type = htonl(cur->type); + + /* Current entry is empty. Kepp track of it. */ + if ((type == htonl(CBFS_COMPONENT_NULL)) || + (type == htonl(CBFS_COMPONENT_DELETED))) { + prev = cur; + continue; + } + + /* Need to ensure the previous entry is an empty one. */ + if (prev == NULL) + continue; + + /* At this point prev is an empty entry. Put the non-empty + * file in prev's location. Then add a new emptry entry. This + * essentialy bubbles empty entries to the end. */ + + prev_size = cbfs_file_entry_size(prev); + cur_size = cbfs_file_entry_size(cur); + + /* Save empty file contents temporarily. */ + empty_file_and_data = malloc(prev_size); + assert(empty_file_and_data); + memcpy(empty_file_and_data, prev, prev_size); + + /* Copy the non-empty file over the empty file. */ + memcpy(prev, cur, cur_size); + + /* + * Get location of next file to copy in the empty one. Note + * that since prev was overwritten with the non-empty file + * it needs to be used to obtain the new current (which is + * the empty file). + */ + cur = cbfs_find_next_entry(image, prev); + + memcpy(cur, empty_file_and_data, prev_size); + + free(empty_file_and_data); + + /* Merge any potential empty entries together. */ + cbfs_walk(image, cbfs_merge_empty_entry, NULL); + + /* + * Since current switched to an empty file keep track of it. + * Even if any empty files were merged the empty entry still + * starts at previously calculated location. + */ + prev = cur; + } + + + return 0; +} + int cbfs_image_delete(struct cbfs_image *image) { if (image == NULL) diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 38510d2..0d7877a 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -76,6 +76,10 @@ int cbfs_image_from_buffer(struct cbfs_image *out, struct buffer *in, * Will not succeed on new-style images without a master header. */ int cbfs_copy_instance(struct cbfs_image *image, struct buffer *dst); +/* Compact a fragmented CBFS image by placing all the non-empty files at the + * beginning of the image. Returns 0 on success, otherwise non-zero. */ +int cbfs_compact_instance(struct cbfs_image *image); + /* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */ int cbfs_image_delete(struct cbfs_image *image); diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 13a9956..af68385 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -1054,6 +1054,15 @@ static int cbfs_copy(void) return cbfs_copy_instance(&src_image, param.image_region); } +static int cbfs_compact(void) +{ + struct cbfs_image image; + if (cbfs_image_from_buffer(&image, param.image_region, + param.headeroffset)) + return 1; + return cbfs_compact_instance(&image); +} + static const struct command commands[] = { {"add", "H:r:f:n:t:c:b:a:vA:gh?", cbfs_add, true, true}, {"add-flat-binary", "H:r:f:n:l:e:c:b:vA:gh?", cbfs_add_flat_binary, @@ -1064,6 +1073,7 @@ static const struct command commands[] = { true, true}, {"add-int", "H:r:i:n:b:vgh?", cbfs_add_integer, true, true}, {"add-master-header", "H:r:vh?", cbfs_add_master_header, true, true}, + {"compact", "r:h?", cbfs_compact, true, true}, {"copy", "r:R:h?", cbfs_copy, true, true}, {"create", "M:r:s:B:b:H:o:m:vh?", cbfs_create, true, true}, {"hashcbfs", "r:R:A:vh?", cbfs_hash, true, true},

1 0

Patch set updated for coreboot: util/cbfstool: add machine parseable print
by Aaron Durbin 27 Jan '16

27 Jan '16

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13475 -gerrit commit 490d26b67de224c5a7e3e4734e0f34e7d94480c4 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Jan 26 15:35:34 2016 -0600 util/cbfstool: add machine parseable print In order to more easily process the output of 'cbfstool print' with other tools provide a -k option which spits out the tab-separated header and fields: Name Offset Type Metadata Size Data Size Total Size ALIGN_UP(Offset + Total Size, 64) would be the start of the next entry. Also, one can analzye the overhead and offsets of each file more easily. Example output (note: tabs aren't in here): $ ./coreboot-builds/sharedutils/cbfstool/cbfstool test.serial.bin print -r FW_MAIN_A -k Performing operation on 'FW_MAIN_A' region... Name Offset Type Metadata Size Data Size Total Size cmos_layout.bin 0x0 cmos_layout 0x38 0x48c 0x4c4 dmic-2ch-48khz-16b.bin 0x500 raw 0x48 0xb68 0xbb0 dmic-2ch-48khz-32b.bin 0x10c0 raw 0x48 0xb68 0xbb0 nau88l25-2ch-48khz-24b.bin 0x1c80 raw 0x48 0x54 0x9c ssm4567-render-2ch-48khz-24b.bin 0x1d40 raw 0x58 0x54 0xac ssm4567-capture-4ch-48khz-32b.bin 0x1e00 raw 0x58 0x54 0xac vbt.bin 0x1ec0 optionrom 0x38 0x1000 0x1038 spd.bin 0x2f00 spd 0x38 0x600 0x638 config 0x3540 raw 0x38 0x1ab7 0x1aef revision 0x5040 raw 0x38 0x25e 0x296 font.bin 0x5300 raw 0x38 0x77f 0x7b7 vbgfx.bin 0x5ac0 raw 0x38 0x32f8 0x3330 locales 0x8e00 raw 0x28 0x2 0x2a locale_en.bin 0x8e40 raw 0x38 0x29f6 0x2a2e u-boot.dtb 0xb880 mrc_cache 0x38 0xff1 0x1029 (empty) 0xc8c0 null 0x64 0xadf4 0xae58 fallback/ramstage 0x17740 stage 0x38 0x15245 0x1527d (empty) 0x2c9c0 null 0x64 0xd324 0xd388 fallback/payload 0x39d80 payload 0x38 0x12245 0x1227d cpu_microcode_blob.bin 0x4c000 microcode 0x60 0x17000 0x17060 (empty) 0x63080 null 0x28 0x37cf18 0x37cf40 Change-Id: I1c5f8c1b5f2f980033d6c954c9840299c6268431 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- util/cbfstool/cbfs_image.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 1 + util/cbfstool/cbfstool.c | 13 ++++++++--- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 2d7a6f0..8425095 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -1075,6 +1075,41 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, return 0; } +static int cbfs_print_parseable_entry_info(struct cbfs_image *image, + struct cbfs_file *entry, void *arg) +{ + FILE *fp = (FILE *)arg; + const char *name; + const char *type; + size_t offset; + size_t metadata_size; + size_t data_size; + const char *sep = "\t"; + + if (!cbfs_is_valid_entry(image, entry)) { + ERROR("cbfs_print_entry_info: Invalid entry at 0x%x\n", + cbfs_get_entry_addr(image, entry)); + return -1; + } + + name = entry->filename; + if (*name == '\0') + name = "(empty)"; + type = get_cbfs_entry_type_name(ntohl(entry->type)), + metadata_size = ntohl(entry->offset); + data_size = ntohl(entry->len); + offset = cbfs_get_entry_addr(image, entry); + + fprintf(fp, "%s%s", name, sep); + fprintf(fp, "0x%zx%s", offset, sep); + fprintf(fp, "%s%s", type, sep); + fprintf(fp, "0x%zx%s", metadata_size, sep); + fprintf(fp, "0x%zx%s", data_size, sep); + fprintf(fp, "0x%zx\n", metadata_size + data_size); + + return 0; +} + int cbfs_print_directory(struct cbfs_image *image) { if (cbfs_is_legacy_cbfs(image)) @@ -1084,6 +1119,26 @@ int cbfs_print_directory(struct cbfs_image *image) return 0; } +int cbfs_print_parseable_directory(struct cbfs_image *image) +{ + int i; + const char *header[] = { + "Name", + "Offset", + "Type", + "Metadata Size", + "Data Size", + "Total Size", + }; + const char *sep = "\t"; + + for (i = 0; i < ARRAY_SIZE(header); i++) + fprintf(stdout, "%s%s", header[i], sep); + fprintf(stdout, "\n"); + cbfs_walk(image, cbfs_print_parseable_entry_info, stdout); + return 0; +} + int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, unused void *arg) { diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 00adcc8..38510d2 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -158,6 +158,7 @@ int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry); /* Print CBFS component information. */ int cbfs_print_directory(struct cbfs_image *image); +int cbfs_print_parseable_directory(struct cbfs_image *image); int cbfs_print_header_info(struct cbfs_image *image); int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, void *arg); diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 23787d8..13a9956 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -75,6 +75,7 @@ static struct param { bool show_immutable; bool stage_xip; bool autogen_attr; + bool machine_parseable; int fit_empty_entries; enum comp_algo compression; enum vb2_hash_algorithm hash; @@ -838,8 +839,10 @@ static int cbfs_print(void) if (cbfs_image_from_buffer(&image, param.image_region, param.headeroffset)) return 1; - cbfs_print_directory(&image); - return 0; + if (param.machine_parseable) + return cbfs_print_parseable_directory(&image); + else + return cbfs_print_directory(&image); } /* Forward declared so there aren't type collisions with cbfstool proper @@ -1066,7 +1069,7 @@ static const struct command commands[] = { {"hashcbfs", "r:R:A:vh?", cbfs_hash, true, true}, {"extract", "H:r:m:n:f:vh?", cbfs_extract, true, false}, {"layout", "wvh?", cbfs_layout, false, false}, - {"print", "H:r:vh?", cbfs_print, true, false}, + {"print", "H:r:vkh?", cbfs_print, true, false}, {"read", "r:f:vh?", cbfs_read, true, false}, {"remove", "H:r:n:vh?", cbfs_remove, true, true}, {"update-fit", "H:r:n:x:vh?", cbfs_update_fit, true, true}, @@ -1105,6 +1108,7 @@ static struct option long_options[] = { {"with-readonly", no_argument, 0, 'w' }, {"xip", no_argument, 0, 'y' }, {"gen-attribute", no_argument, 0, 'g' }, + {"mach-parseable",no_argument, 0, 'k' }, {NULL, 0, 0, 0 } }; @@ -1407,6 +1411,9 @@ int main(int argc, char **argv) case 'g': param.autogen_attr = true; break; + case 'k': + param.machine_parseable = true; + break; case 'h': case '?': usage(argv[0]);

1 0

Patch set updated for coreboot: intel/apollolake_rvp: Add PCIe CLKREQ mapping to devicetree
by Alexandru Gagniuc 27 Jan '16

27 Jan '16

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13408 -gerrit commit 2d2f8209aa25d9a72d1d9863e08c64ba3e8d3f2f Author: Zhao, Lijian <lijian.zhao(a)intel.com> Date: Fri Jan 15 10:49:29 2016 -0800 intel/apollolake_rvp: Add PCIe CLKREQ mapping to devicetree Change-Id: I50fa18e44984f82a4612525c82fc05ebf68209a2 Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc(a)intel.com> --- src/mainboard/intel/apollolake_rvp/devicetree.cb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mainboard/intel/apollolake_rvp/devicetree.cb b/src/mainboard/intel/apollolake_rvp/devicetree.cb index 639d293..5376a99 100755 --- a/src/mainboard/intel/apollolake_rvp/devicetree.cb +++ b/src/mainboard/intel/apollolake_rvp/devicetree.cb @@ -1,5 +1,12 @@ chip soc/intel/apollolake + register "pcie_rp0_clkreq_pin" = "2" # PCIe slot 2 + register "pcie_rp1_clkreq_pin" = "3" # Wifi+BT M2 slot + register "pcie_rp2_clkreq_pin" = "0" # PCIe slot 1 + register "pcie_rp3_clkreq_pin" = "CLKREQ_DISABLED" + register "pcie_rp4_clkreq_pin" = "CLKREQ_DISABLED" + register "pcie_rp5_clkreq_pin" = "CLKREQ_DISABLED" + device cpu_cluster 0 on device lapic 0 on end end

1 0

Patch set updated for coreboot: intel/apollolake_rvp: Take PCI-express devices out of reset
by Alexandru Gagniuc 27 Jan '16

27 Jan '16

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13409 -gerrit commit e02a488b47b4da011fdf0cd75df58ebc9fef7318 Author: Alexandru Gagniuc <alexandrux.gagniuc(a)intel.com> Date: Fri Jan 15 14:52:20 2016 -0800 intel/apollolake_rvp: Take PCI-express devices out of reset The reset signals for PCIe links are connected to GPIOs. Those need to manually be set to the proper level before PCIe links will work. Change-Id: I4fbf3d02516fbc651dda709b41bbab120372bee9 Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc(a)intel.com> --- src/mainboard/intel/apollolake_rvp/mainboard.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/mainboard/intel/apollolake_rvp/mainboard.c b/src/mainboard/intel/apollolake_rvp/mainboard.c index dc7bc1e..c11a080 100644 --- a/src/mainboard/intel/apollolake_rvp/mainboard.c +++ b/src/mainboard/intel/apollolake_rvp/mainboard.c @@ -14,10 +14,19 @@ #include <soc/gpio.h> /* TODO: Move GPIO config to its own file once we get more GPIOs in the list */ +/* + * GPIOs: + * A tilde (~) before the name means that the signal uses inverted logic. + * PCIE RST signals route to the PWRGOOD(PCIe slot) or PERST0(M2 slot) inputs. + */ static const struct pad_config aplk_rvp_gpios[] = { + PAD_CFG_GPO(GPIO_13, 1, DEEP), /* ~PCIE_SLOT2_RST_N */ + PAD_CFG_GPO(GPIO_15, 1, DEEP), /* ~WIFI_RST_GPIO_N */ PAD_CFG_GPO(GPIO_22, 1, DEEP), /* SATA Direct power */ + PAD_CFG_GPO(GPIO_37, 1, DEEP), /* ~LAN_RST_N */ PAD_CFG_NF(GPIO_46, NATIVE, DEEP, NF1), /* UART2 RX*/ PAD_CFG_NF(GPIO_47, NATIVE, DEEP, NF1), /* UART2 TX*/ + PAD_CFG_GPO(GPIO_152, 1, DEEP), /* ~PCIE_SLOT1_RST_N */ PAD_CFG_NF(GPIO_193, NATIVE, DEEP, NF1), /* PANEL0_VDDEN */ PAD_CFG_NF(GPIO_194, NATIVE, DEEP, NF1), /* PANEL0_BKLTEN */ PAD_CFG_NF(GPIO_195, NATIVE, DEEP, NF1), /* PANEL0_BKLTCTL */

1 0

Patch set updated for coreboot: intel/apollolake_rvp: Provide stubs needed for CHROMEOS builds
by Alexandru Gagniuc 27 Jan '16

27 Jan '16

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13401 -gerrit commit 36a9b64405e35a06df753dbb4ac174ca9c178782 Author: Zhao, Lijian <lijian.zhao(a)intel.com> Date: Thu Jan 7 16:22:55 2016 -0800 intel/apollolake_rvp: Provide stubs needed for CHROMEOS builds Add mecessary stubs for required for CONFIG_CHROMEOS. Without those, the coreboot build will break. Note that MAINBOARD_HAS_CHROMEOS is not enabled at this time due to missing dependencies in the soc/. Change-Id: Ie4a1ce812e8fc8dc974fc55a7180a5ea433f146e Signed-off-by: Zhao, Lijian <lijian.zhao(a)intel.com> Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc(a)intel.com> --- src/mainboard/intel/apollolake_rvp/Makefile.inc | 4 +++ src/mainboard/intel/apollolake_rvp/chromeos.c | 35 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/mainboard/intel/apollolake_rvp/Makefile.inc b/src/mainboard/intel/apollolake_rvp/Makefile.inc index f3c87b2..52de59b 100755 --- a/src/mainboard/intel/apollolake_rvp/Makefile.inc +++ b/src/mainboard/intel/apollolake_rvp/Makefile.inc @@ -1 +1,5 @@ + +romstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c + ramstage-y += mainboard.c diff --git a/src/mainboard/intel/apollolake_rvp/chromeos.c b/src/mainboard/intel/apollolake_rvp/chromeos.c new file mode 100644 index 0000000..bef4210 --- /dev/null +++ b/src/mainboard/intel/apollolake_rvp/chromeos.c @@ -0,0 +1,35 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2015 Intel Corp. + * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) + * + * 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; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <vendorcode/google/chromeos/chromeos.h> + +int get_lid_switch(void) +{ + /* Default to force open */ + return 1; +} + +/* The dev-switch is virtual */ +int get_developer_mode_switch(void) +{ + return 0; +} + +int get_recovery_mode_switch(void) +{ + return 0; +} + +int get_write_protect_state(void) +{ + return 0; +}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2016