coreboot-gerrit March 2016

coreboot-gerrit@coreboot.org

1 participants
1119 discussions

Patch set updated for coreboot: payloads: Add a target to print payload git urls and directories
by Martin Roth 21 Mar '16

21 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14132 -gerrit commit 99f3409746899afa7f141d40db12e0bbc865ad38 Author: Martin Roth <martinroth(a)google.com> Date: Wed Mar 16 12:42:05 2016 -0600 payloads: Add a target to print payload git urls and directories Being able to fetch this list will allow the jenkins builder to securely fetch the external payloads so we can start testing payload builds. Change-Id: I777229216b2f11f0f427cd5f8cfa003da4171a77 Signed-off-by: Martin Roth <martinroth(a)google.com> --- payloads/Makefile.inc | 5 ++++- payloads/external/FILO/Makefile | 10 ++++++++-- payloads/external/GRUB2/Makefile | 10 ++++++++-- payloads/external/Memtest86Plus/Makefile | 5 ++++- payloads/external/SeaBIOS/Makefile | 10 ++++++++-- payloads/external/U-Boot/Makefile | 5 ++++- payloads/external/depthcharge/Makefile | 5 ++++- 7 files changed, 40 insertions(+), 10 deletions(-) diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 44d1d77..c969c9e 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -34,4 +34,7 @@ clean-payloads: distclean-payloads: $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) distclean; ) -.PHONY: clean-payloads distclean-payloads +print-repo-info-payloads: + -$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) + +.PHONY: clean-payloads distclean-payloads print-repo-info-payloads diff --git a/payloads/external/FILO/Makefile b/payloads/external/FILO/Makefile index 6a96a22..13d3e8f 100644 --- a/payloads/external/FILO/Makefile +++ b/payloads/external/FILO/Makefile @@ -3,6 +3,9 @@ NAME-$(CONFIG_FILO_MASTER)=MASTER TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646 NAME-$(CONFIG_FILO_STABLE)=STABLE +project_git_repo=http://review.coreboot.org/p/filo.git +project_dir=filo + unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG unexport KCONFIG_DEPENDENCIES @@ -15,7 +18,7 @@ all: filo checkout: echo " GIT FILO $(NAME-y)" test -d filo || \ - git clone http://review.coreboot.org/p/filo.git + git clone $(project_git_repo) $(project_dir) cd filo && \ git checkout master && \ git remote update && \ @@ -46,4 +49,7 @@ clean: distclean: rm -rf filo -.PHONY: checkout config filo clean distclean +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config filo clean distclean print-repo-info diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile index 11630c8..5d53922 100644 --- a/payloads/external/GRUB2/Makefile +++ b/payloads/external/GRUB2/Makefile @@ -1,6 +1,9 @@ TAG-$(CONFIG_GRUB2_MASTER)= NAME-$(CONFIG_GRUB2_MASTER)=HEAD +project_git_repo=git://git.sv.gnu.org/grub.git +project_dir=grub2 + unexport KCONFIG_AUTOCONFIG unexport CFLAGS unexport CPPFLAGS @@ -22,7 +25,7 @@ all: grub2 checkout: echo " GIT GRUB2 $(NAME-y)" test -d grub2 || \ - git clone git://git.sv.gnu.org/grub.git grub2 + git clone $(project_git_repo) $(project_dir) cd grub2 && \ git checkout master && \ git pull; \ @@ -50,4 +53,7 @@ clean: distclean: rm -rf grub2 -.PHONY: checkout config grub2 clean distclean +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config grub2 clean distclean print-repo-info diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile index ee79032..db8a51d 100644 --- a/payloads/external/Memtest86Plus/Makefile +++ b/payloads/external/Memtest86Plus/Makefile @@ -39,4 +39,7 @@ clean: distclean: rm -rf $(project_dir) -.PHONY: all build fetch clean distclean +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: all build fetch clean distclean print-repo-info diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile index 0ac04d7..862a679 100644 --- a/payloads/external/SeaBIOS/Makefile +++ b/payloads/external/SeaBIOS/Makefile @@ -2,6 +2,9 @@ TAG-$(CONFIG_SEABIOS_MASTER)=origin/master TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4 TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID) +project_git_repo=http://review.coreboot.org/p/seabios.git +project_dir=seabios + unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG unexport KCONFIG_DEPENDENCIES @@ -13,7 +16,7 @@ all: build seabios: echo " Cloning SeaBIOS from Git" - git clone http://review.coreboot.org/p/seabios.git seabios + git clone $(project_git_repo) $(project_dir) fetch: seabios ifeq ($(TAG-y),) @@ -71,4 +74,7 @@ clean: distclean: rm -rf seabios -.PHONY: checkout config build clean distclean clone fetch +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config build clean distclean clone fetch print-repo-info diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile index 255db29..67c60c1 100644 --- a/payloads/external/U-Boot/Makefile +++ b/payloads/external/U-Boot/Makefile @@ -79,4 +79,7 @@ clean: distclean: rm -rf $(project_dir) -.PHONY: config build clean distclean fetch +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: config build clean distclean fetch print-repo-info diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index 4e76687..cf2d0a1 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -68,4 +68,7 @@ clean: distclean: rm -rf $(project_dir) -.PHONY: checkout config build clean distclean clone fetch +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config build clean distclean clone fetch print-repo-info

1 0

Patch merged into coreboot/master: payloads/Makefile.inc: Clean up Makefile
by gerrit＠coreboot.org 21 Mar '16

21 Mar '16

the following patch was just integrated into master: commit e68a4385d4e8d9e247ac1f09d406fd2fb4e9b1de Author: Martin Roth <martinroth(a)google.com> Date: Wed Mar 16 10:45:35 2016 -0600 payloads/Makefile.inc: Clean up Makefile - Instead of adding each payload to each common target, create a list and loop through the list for all of the payloads - '.phony' doesn't work - the target needs to be uppercase '.PHONY' Change-Id: I4a7712c94d0f127c2fff8cb8fada4b8132a4ab3b Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/14131 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See https://review.coreboot.org/14131 for details. -gerrit

1 0

Patch merged into coreboot/master: payloads/external: Rename Makefile.inc to Makefile
by gerrit＠coreboot.org 21 Mar '16

21 Mar '16

the following patch was just integrated into master: commit c8ed34075b7785c91cfb1c8556357b2e70cf765d Author: Martin Roth <martinroth(a)google.com> Date: Wed Mar 16 10:39:30 2016 -0600 payloads/external: Rename Makefile.inc to Makefile These makefiles are not included by anything, so they shouldn't be named Makefile.inc. Also, having them all be named 'Makefile' makes some other consolidation work I'm doing much easier. Change-Id: I1234539ba6a0a6f47d2eb0c21de3da3607c6b8de Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/14130 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See https://review.coreboot.org/14130 for details. -gerrit

1 0

New patch to review for coreboot: buildgcc: Add check for missing libraries and test for zlib
by Martin Roth 21 Mar '16

21 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14147 -gerrit commit b86257b1bcc498f1dfa9aeae9659370b75517617 Author: Martin Roth <martinroth(a)google.com> Date: Sun Mar 20 20:39:04 2016 -0600 buildgcc: Add check for missing libraries and test for zlib - Add check_for_library routine to test for missing libraries. - Add a check for zlib. - Remove 'utility' text from please_install() routine since we can test for libraries or utilities now. - Remove incorrect 'solution' text from alternate install since I was updating that line. Change-Id: Id5ef28f8bde114cbf4e5a91fc119d42593ea6ab2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/crossgcc/buildgcc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 2b586c7..f4f1a57 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -126,9 +126,9 @@ please_install() *) solution="using your OS packaging system" ;; esac - printf "${RED}ERROR:${red} Missing tool: Please install \'$1\' utility. (eg $solution)${NC}\n" >&2 + printf "${RED}ERROR:${red} Missing tool: Please install \'$1\'. (eg $solution)${NC}\n" >&2 if [ -n "$2" ]; then - printf "${RED}ERROR:${red} or install \'$2\' utility. (eg $solution)${NC}\n" >&2 + printf "${RED}ERROR:${red} or install \'$2\'.${NC}\n" >&2 fi } @@ -188,6 +188,19 @@ searchtool() false } +# Run a compile check of the specified library option to see if it's installed +check_for_library() { + local LIBRARY_FLAGS=$1 + local LIBRARY_PACKAGES=$2 + local LIBTEST_FILE=.libtest + + echo "int main(int argc, char **argv) { (void) argc; (void) argv; return 0; }" > "${LIBTEST_FILE}.c" + + cc $CFLAGS $LIBRARY_FLAGS "${LIBTEST_FILE}.c" -o "${LIBTEST_FILE}" >/dev/null 2>&1 || \ + please_install "$LIBRARY_PACKAGES" + rm -rf "${LIBTEST_FILE}.c" "${LIBTEST_FILE}" +} + check_sum() { test -z "$CHECKSUM" || \ test "$(cat sum/$1.cksum 2>/dev/null | sed -e 's@.*$[0-9a-f]\{40,\}$.*@\1@')" = \ @@ -690,6 +703,8 @@ searchtool clang "LLVM" "" "g++" > /dev/null searchtool wget > /dev/null searchtool bzip2 "bzip2," > /dev/null +check_for_library "-lz" "zlib (zlib1g-dev or zlib-devel)" + if [ "$HALT_FOR_TOOLS" -ne 0 ]; then exit 1 fi

1 0

New patch to review for coreboot: buildgcc: support pigz and lbzip2 decpmpressors if installed.
by Martin Roth 21 Mar '16

21 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14146 -gerrit commit 4c401016623a0befb9d048c9ad7e3fb6d9e8df54 Author: Martin Roth <martinroth(a)google.com> Date: Sun Mar 20 12:38:48 2016 -0600 buildgcc: support pigz and lbzip2 decpmpressors if installed. These are multi-threaded decompressors for .gz and .bz2 compressed files. If they're installed, use them to decompress, if they're not, use the standard single-threaded decompressors. Change-Id: I397740817e6b234a43b62075899964bdab14f121 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/crossgcc/buildgcc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 2e7505b..2b586c7 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -243,10 +243,13 @@ unpack_and_patch() { printf " * $(basename $archive)\n" FLAGS=zxf suffix=$(echo $archive | sed 's,.*\.,,') - test "$suffix" = "gz" && FLAGS=zxf - test "$suffix" = "bz2" && FLAGS=jxf - test "$suffix" = "xz" && FLAGS="--xz -xf" - test "$suffix" = "lzma" && FLAGS="--lzma -xf" + if [ "$suffix" = "gz" ] && [ -n "$PIGZ" ]; then FLAGS="-I pigz -xf" + elif [ "$suffix" = "gz" ]; then FLAGS=zxf + elif [ "$suffix" = "bz2" ] && [ -n "$LBZIP2" ]; then FLAGS="-I lbzip2 -xf" + elif [ "$suffix" = "bz2" ]; then FLAGS=jxf + elif [ "$suffix" = "xz" ]; then FLAGS="--xz -xf" + elif [ "$suffix" = "lzma" ]; then FLAGS="--lzma -xf" + fi $TAR $FLAGS tarballs/$(basename $archive) for patch in patches/${dir}_*.patch; do test -r $patch || continue @@ -675,6 +678,8 @@ MAKE=$(searchtool make) || exit $? SHA1SUM=$(searchtool sha1sum) SHA512SUM=$(searchtool sha512sum) CHECKSUM=$SHA1SUM +LBZIP2=$(searchtool lbzip2 "" nofail) +PIGZ=$(searchtool pigz "" nofail) searchtool m4 > /dev/null searchtool bison > /dev/null

1 0

New patch to review for coreboot: buildgcc: Fix help text formatting
by Martin Roth 21 Mar '16

21 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14145 -gerrit commit 0977e8aa6906ef48029dcf81156eea0cbc8f3d7c Author: Martin Roth <martinroth(a)google.com> Date: Sun Mar 20 12:03:20 2016 -0600 buildgcc: Fix help text formatting Add a newline after the supported version text. Move $TARGETDIR left so that longer paths print better. Change-Id: If520e1b8657a526dee27763aee62cb78777d020d Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/crossgcc/buildgcc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index f88c09c..2e7505b 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -326,9 +326,9 @@ myhelp() printf " [--nocolor] don't print color codes in output\n" printf " [--urls] print the urls for all packages\n" printf " [-j|--jobs <num>] run <num> jobs in parallel in make\n" - printf " [-s]--supported <tool> print supported version of a tool" + printf " [-s]--supported <tool> print supported version of a tool\n" printf " [-d|--directory <target dir>] target directory to install cross compiler to\n" - printf " (defaults to $TARGETDIR)\n\n" + printf " (defaults to $TARGETDIR)\n\n" printf " [-D|--destdir <dest dir>] destination directory to install cross compiler to\n" printf " (for RPM builds, default unset)\n" printf " [-P|--package <package>] Build a specific package: GCC, CLANG, IASL, GDB\n"

1 0

Patch set updated for coreboot: nb/amd/amdmct/mct_ddr3: Ensure BlockRxDqsLock does not remain set
by Timothy Pearson 20 Mar '16

20 Mar '16

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14144 -gerrit commit ceb3b527d7bc7566f2cee41b9e9b7e946f1b1977 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sun Mar 20 14:21:53 2016 -0500 nb/amd/amdmct/mct_ddr3: Ensure BlockRxDqsLock does not remain set Under certain conditions (training abort) BlockRxDqsLock could remain set in violation of the BKDG. Ensure BlockRxDqsLock is reset to 0 after a lane training abort. Change-Id: I1a49a24d02b2b7cacae074794ec274a424a9e66b --- src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c index 15b5ea4..5d75fb0 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c @@ -1725,6 +1725,12 @@ static void TrainDQSReceiverEnCyc_D_Fam15(struct MCTStatStruc *pMCTstat, "Training for receiver %d on DCT %d aborted\n", __func__, lane, Receiver, dct); } + + /* Restore BlockRxDqsLock setting to normal operation in preparation for retraining */ + dword = Get_NB32_index_wait_DCT(dev, dct, index_reg, 0x0d0f0030 | (lane << 8)); + dword &= ~(0x1 << 8); /* BlockRxDqsLock = 0 */ + Set_NB32_index_wait_DCT(dev, dct, index_reg, 0x0d0f0030 | (lane << 8), dword); + break; }

1 0

New patch to review for coreboot: nb/amd/amdmct/mct_ddr3: Ensure BlockRxDqsLock does not remain set
by Timothy Pearson 20 Mar '16

20 Mar '16

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14144 -gerrit commit 37a93eb7576a76f070501bda8c1ca646b8d6ee3c Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sun Mar 20 14:21:53 2016 -0500 nb/amd/amdmct/mct_ddr3: Ensure BlockRxDqsLock does not remain set Under certain conditions (training abort) BlockRxDqsLock could remain set in violation of the BKDG. Ensure BlockRxDqsLock is reset to 0 after a lane training abort. Change-Id: I1a49a24d02b2b7cacae074794ec274a424a9e66b --- src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c index 15b5ea4..5697a6e 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c @@ -1725,6 +1725,11 @@ static void TrainDQSReceiverEnCyc_D_Fam15(struct MCTStatStruc *pMCTstat, "Training for receiver %d on DCT %d aborted\n", __func__, lane, Receiver, dct); } + + /* Restore BlockRxDqsLock to normal operation */ + dword = Get_NB32_index_wait_DCT(dev, dct, index_reg, 0x0d0f0030 | (lane << 8)); + dword &= ~(0x1 << 8); /* BlockRxDqsLock = 0 */ + Set_NB32_index_wait_DCT(dev, dct, index_reg, 0x0d0f0030 | (lane << 8), dword); break; }

1 0

New patch to review for coreboot: gpio: Add support for extended binary number system
by David Hendricks 19 Mar '16

19 Mar '16

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14143 -gerrit commit a759a4e137679da3a11587e3334b98443436d73d Author: David Hendricks <dhendrix(a)chromium.org> Date: Fri Mar 18 20:23:05 2016 -0700 gpio: Add support for extended binary number system This adds yet another number system which logically extends the binary representation to allow floating/high-Z values to count in the result. A 'Z' value at position N will yield a value of 0 at position N and a value of 1 at position (1 << N << num_gpio). For example: 000Z => 0b1_0000 100Z => 0b1_1000 BRANCH=none BUG=none TEST=stubbed out and tested for a 3-wide raw value, see comments in gerrit for the full table. Change-Id: I121e0cac9fa84fcbb261d1d84dcb20cfd49e5518 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- src/include/gpio.h | 13 +++++++++++++ src/lib/gpio.c | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/include/gpio.h b/src/include/gpio.h index ea03a23..3b22154 100644 --- a/src/include/gpio.h +++ b/src/include/gpio.h @@ -41,6 +41,19 @@ int gpio_base2_value(gpio_t gpio[], int num_gpio); /* * Read the value presented by the set of GPIOs, when each pin is interpreted + * as a base-2 digit (LOW = 0, HIGH = 1). If a pin is in its Z/floating state + * the value becomes (1 << pin_num << num_gpio). + * + * Caveat: This scheme makes the number space discontinuous. The advantage is + * that it's simple to compute and translate to/from hex. + * + * gpio[]: pin positions to read. gpio[0] is less significant than gpio[1]. + * num_gpio: number of pins to read. + */ +int gpio_base2_ext_value(gpio_t gpio[], int num_gpio); + +/* + * Read the value presented by the set of GPIOs, when each pin is interpreted * as a base-3 digit (LOW = 0, HIGH = 1, Z/floating = 2). * Example: X1 = Z, X2 = 1 -> gpio_base3_value({GPIO(X1), GPIO(X2)}) = 5 * BASE3() from <base3.h> can generate numbers to compare the result to. diff --git a/src/lib/gpio.c b/src/lib/gpio.c index 5147cfe..cfe1786 100644 --- a/src/lib/gpio.c +++ b/src/lib/gpio.c @@ -35,6 +35,25 @@ int gpio_base2_value(gpio_t gpio[], int num_gpio) return result; } +int gpio_base2_ext_value(gpio_t gpio[], int num_gpio) +{ + static const char tristate_char[] = {[0] = '0', [1] = '1', [2] = 'Z'}; + int temp, index, result = 0; + + for (index = num_gpio - 1; index >= 0; --index) { + temp = gpio_get(gpio[index]); + printk(BIOS_DEBUG, "%c ", tristate_char[temp]); + + if (temp == 2) /* Z-state */ + result += (1 << index << num_gpio); + else + result += temp * (1 << index); + } + + printk(BIOS_DEBUG, "= 0x%x (extended binary number system)\n", result); + return result; +} + int gpio_base3_value(gpio_t gpio[], int num_gpio) { /*

1 0

Patch set updated for coreboot: lib/rmodule: export parameters in struct rmod_stage_load
by Aaron Durbin 19 Mar '16

19 Mar '16

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14139 -gerrit commit 3e4e099b0859b9f298d888e27ce1fc8685231926 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Thu Mar 17 23:13:34 2016 -0500 lib/rmodule: export parameters in struct rmod_stage_load In order for a caller to utilize an rmodule's parameters section after calling rmodule_stage_load() export the rmodule's parameter pointer in struct rmod_stage_load. Change-Id: I9cd51652cf8cdb3fae773256989851638aa1a60f Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/include/rmodule.h | 1 + src/lib/rmodule.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/include/rmodule.h b/src/include/rmodule.h index a2612d1..c0c062c 100644 --- a/src/include/rmodule.h +++ b/src/include/rmodule.h @@ -55,6 +55,7 @@ struct prog; struct rmod_stage_load { uint32_t cbmem_id; struct prog *prog; + void *params; }; /* Both of the following functions return 0 on success, -1 on error. */ diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c index 585fb5f..9825e6a 100644 --- a/src/lib/rmodule.c +++ b/src/lib/rmodule.c @@ -296,5 +296,8 @@ int rmodule_stage_load(struct rmod_stage_load *rsl) rmodule_memory_size(&rmod_stage)); prog_set_entry(rsl->prog, rmodule_entry(&rmod_stage), NULL); + /* Allow caller to pick up parameters, if available. */ + rsl->params = rmodule_parameters(&rmod_stage); + return 0; }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2016