December 2017 - flashrom-gerrit

Change in flashrom[master]: Fix the documentation and DOS port
by Nico Huber (Code Review) Dec. 30, 2017

Dec. 30, 2017

Hello Rudolf Marek, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/23039 to look at the new patch set (#2). Change subject: Fix the documentation and DOS port ...................................................................... Fix the documentation and DOS port Update the DOS cross-compile documentation, and workaround issue with valloc() with the latest DJGPP. Change-Id: I909c5635aec5076440d2fde73d943f8ad10b8051 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- M README M physmap.c 2 files changed, 53 insertions(+), 25 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/23039/2 -- To view, visit https://review.coreboot.org/23039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I909c5635aec5076440d2fde73d943f8ad10b8051 Gerrit-Change-Number: 23039 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Rudolf Marek <r.marek(a)assembler.cz> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: Fix the documentation and DOS port
by Nico Huber (Code Review) Dec. 29, 2017

Dec. 29, 2017

Nico Huber has posted comments on this change. ( https://review.coreboot.org/23039 ) Change subject: Fix the documentation and DOS port ...................................................................... Patch Set 1: (1 comment) https://review.coreboot.org/#/c/23039/1/physmap.c File physmap.c: https://review.coreboot.org/#/c/23039/1/physmap.c@66 PS1, Line 66: (pagesize - 1)) & ~(pagesize - 1)); Just remembered, we have a weird 112 character limit now, so this might fit one line. -- To view, visit https://review.coreboot.org/23039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I909c5635aec5076440d2fde73d943f8ad10b8051 Gerrit-Change-Number: 23039 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Rudolf Marek <r.marek(a)assembler.cz> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 29 Dec 2017 21:49:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

Change in flashrom[master]: Fix the documentation and DOS port
by Nico Huber (Code Review) Dec. 29, 2017

Dec. 29, 2017

Nico Huber has posted comments on this change. ( https://review.coreboot.org/23039 ) Change subject: Fix the documentation and DOS port ...................................................................... Patch Set 1: Code-Review+1 (3 comments) Code looks good, some nits in the README. https://review.coreboot.org/#/c/23039/1/README File README: https://review.coreboot.org/#/c/23039/1/README@109 PS1, Line 109: containing This reads odd, maybe just replace /containing/and/ (you need the sources + the libraries in a lib/ dir but not both in one dir). https://review.coreboot.org/#/c/23039/1/README@114 PS1, Line 114: be extra Add `an`, i.e. "There will be an extra" https://review.coreboot.org/#/c/23039/1/README@133 PS1, Line 133: If you like can compress the resulting executable with UPX: "If you like, you can..." -- To view, visit https://review.coreboot.org/23039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I909c5635aec5076440d2fde73d943f8ad10b8051 Gerrit-Change-Number: 23039 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Rudolf Marek <r.marek(a)assembler.cz> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 29 Dec 2017 21:47:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: manibuilder: Add DJGPP target
by build bot (Jenkins) (Code Review) Dec. 29, 2017

Dec. 29, 2017

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23042 ) Change subject: manibuilder: Add DJGPP target ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/980/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/840/ : SUCCESS -- To view, visit https://review.coreboot.org/23042 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id3b85685f39fb5fdd6e21fca7ffa3f5d4a4ba51d Gerrit-Change-Number: 23042 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 29 Dec 2017 21:21:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: manibuilder: Add DJGPP target
by Nico Huber (Code Review) Dec. 29, 2017

Dec. 29, 2017

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/23042 Change subject: manibuilder: Add DJGPP target ...................................................................... manibuilder: Add DJGPP target New target is called `djgpp:latest`. It will likely only work on an x86 hosts because of the underlying DJGPP Docker image. Change-Id: Id3b85685f39fb5fdd6e21fca7ffa3f5d4a4ba51d Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- A util/manibuilder/Dockerfile.djgpp M util/manibuilder/Makefile M util/manibuilder/Makefile.targets 3 files changed, 44 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/42/23042/1 diff --git a/util/manibuilder/Dockerfile.djgpp b/util/manibuilder/Dockerfile.djgpp new file mode 100644 index 0000000..c0be794 --- /dev/null +++ b/util/manibuilder/Dockerfile.djgpp @@ -0,0 +1,29 @@ +FROM anibali/djgpp:latest + +USER root +RUN \ + userdel appuser && \ + useradd -p locked -m mani && \ + zypper -q install -y tar make git ccache + +USER mani +RUN cd && \ + mkdir .ccache && chown mani:users .ccache && \ + git clone https://review.coreboot.org/flashrom.git && \ + git clone https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git && \ + cd pciutils && \ + git checkout v3.5.6 && \ + curl https://flashrom.org/images/6/6a/Pciutils-3.5.6.patch.gz | zcat | git apply && \ + make ZLIB=no DNS=no HOST=i386-djgpp-djgpp \ + CROSS_COMPILE=i586-pc-msdosdjgpp- \ + PREFIX=/ DESTDIR=$PWD/../ \ + STRIP="--strip-program=i586-pc-msdosdjgpp-strip -s" \ + install install-lib && \ + cd ../ && \ + curl https://flashrom.org/images/3/3d/Libgetopt.tar.gz | zcat | tar x && \ + cd libgetopt && \ + make && cp libgetopt.a ../lib/ && cp getopt.h ../include/ + +ENV DEVSHELL /bin/bash +COPY mani-wrapper.sh /home/mani/ +ENTRYPOINT ["/bin/sh", "/home/mani/mani-wrapper.sh"] diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile index a5cdeef..5ad75ee 100644 --- a/util/manibuilder/Makefile +++ b/util/manibuilder/Makefile @@ -38,12 +38,19 @@ $(foreach tag,$(MULTIARCH_TAGS), \ $(eval $(call build_template,$(tag),multiarch))) +djgpp\:latest-build: %-build: Dockerfile.djgpp mani-wrapper.sh + $(QUIET_SETUP)docker build . -f $< -t mani/$* + $(addsuffix -check-build,$(ALL_TAGS)): %-check-build: $(QUIET_SETUP)\ [ $$(docker image ls -q mani/$*) ] \ || $(MAKE) $*-build $(if $(QUIET_SETUP),>/dev/null 2>/dev/null) $(filter centos%,$(MULTIARCH_TAGS)) anita\:sparc: CC=cc +djgpp\:latest: CC=ccache i586-pc-msdosdjgpp-gcc +djgpp\:latest: STRIP=i586-pc-msdosdjgpp-strip +djgpp\:latest: LIBS_BASE=../ +djgpp\:latest: TARGET=strip $(ANITA_TAGS): MAKECMD=gmake $(ALL_TAGS): export QUIET_SETUP=$(QUIET_TEST) $(ALL_TAGS): %: %-check-build @@ -55,7 +62,10 @@ --name mani_$(call ident,$*) mani/$* \ "git fetch origin $${TEST_REVISION:-master} && \ git checkout FETCH_HEAD && \ - $(MAKECMD) clean && $(MAKECMD) -j$${CPUS:-1} CC='$(CC)'" \ + $(MAKECMD) clean && $(MAKECMD) -j$${CPUS:-1} CC='$(CC)' \ + $(if $(STRIP),STRIP='$(STRIP)') \ + $(if $(LIBS_BASE),LIBS_BASE='$(LIBS_BASE)') \ + $(TARGET)" \ $(if $(QUIET_TEST),>/dev/null 2>&1) || echo $*: $$? $(addsuffix -shell,$(ALL_TAGS)): %-shell: %-check-build diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index a2cedce..1be2176 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -17,7 +17,9 @@ $(foreach v,v3.7 v3.6, \ alpine\:$(a)-$(v))) \ -ALL_TAGS := $(ANITA_TAGS) $(MULTIARCH_TAGS) +OTHER_TAGS := djgpp\:latest + +ALL_TAGS := $(ANITA_TAGS) $(MULTIARCH_TAGS) $(OTHER_TAGS) arch_filter = $(sort \ $(foreach arch,$(1), \ @@ -39,6 +41,7 @@ DEFAULT_TAGS := \ anita\:amd64 \ anita\:i386 \ + djgpp\:latest \ fedora\:25-x86_64 \ fedora\:25-ppc64le \ fedora\:25-aarch64 \ -- To view, visit https://review.coreboot.org/23042 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id3b85685f39fb5fdd6e21fca7ffa3f5d4a4ba51d Gerrit-Change-Number: 23042 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[master]: Fix the documentation and DOS port
by build bot (Jenkins) (Code Review) Dec. 29, 2017

Dec. 29, 2017

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23039 ) Change subject: Fix the documentation and DOS port ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/979/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/839/ : SUCCESS -- To view, visit https://review.coreboot.org/23039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I909c5635aec5076440d2fde73d943f8ad10b8051 Gerrit-Change-Number: 23039 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Rudolf Marek <r.marek(a)assembler.cz> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 29 Dec 2017 15:59:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: Fix the documentation and DOS port
by Nico Huber (Code Review) Dec. 29, 2017

Dec. 29, 2017

Hello Rudolf Marek, I'd like you to do a code review. Please visit https://review.coreboot.org/23039 to review the following change. Change subject: Fix the documentation and DOS port ...................................................................... Fix the documentation and DOS port Update the DOS cross-compile documentation, and workaround issue with valloc() with the latest DJGPP. Change-Id: I909c5635aec5076440d2fde73d943f8ad10b8051 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- M README M physmap.c 2 files changed, 53 insertions(+), 25 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/23039/1 diff --git a/README b/README index 449103d..bfa4554 100644 --- a/README +++ b/README @@ -97,30 +97,47 @@ Get packages of the DJGPP cross compiler and install them: djgpp-filesystem djgpp-gcc djgpp-cpp djgpp-runtime djgpp-binutils As an alternative, the DJGPP web site offers packages for download as well: - djcross-binutils-2.19.1-10ap.i386.rpm - djcross-gcc-4.3.2-8ap.i686.rpm - djcrx-2.04pre_20090725-13ap.i386.rpm + djcross-binutils-2.29.1-1ap.x86_64.rpm + djcross-gcc-7.2.0-1ap.x86_64.rpm + djcrx-2.05-5.x86_64.rpm The cross toolchain packages for your distribution may have slightly different names (look for packages named *djgpp*). - You will need the following library source trees containing their compiled - static libraries either in the parent directory of the flashrom source or - specify the base folder on compile time with the LIBS_BASE parameter. - The default as described above is equal to calling - 'make djgpp-dos LIBS_BASE=..' + Alternatively, you could use a script to build it from scratch: + https://github.com/andrewwutw/build-djgpp - To get and build said libraries... + You will need the libpci and libgetopt library source trees containing + their compiled static libraries and header files installed in some + directory say libpci-libgetopt/, which will be later specified with + LIBS_BASE parameter during flashrom compilation. Easiest way to + handle it is to put pciutils, libgetopt and flashrom directories + in one subdirectory. There will be extra subdirectory libpci-libgetopt + created, which will contain compiled libpci and libgetopt. + Download pciutils 3.1.5 and apply http://flashrom.org/File:Pciutils.patch.gz - Compile pciutils, see README.DJGPP for instructions. - Download and compile http://flashrom.org/File:Libgetopt.tar.gz + Compile pciutils, using following command line: + + make ZLIB=no DNS=no HOST=i386-djgpp-djgpp CROSS_COMPILE=i586-pc-msdosdjgpp- \ + PREFIX=/ DESTDIR=$PWD/../libpci-libgetopt \ + STRIP="--strip-program=i586-pc-msdosdjgpp-strip -s" install install-lib + + Download and compile with 'make' http://flashrom.org/File:Libgetopt.tar.gz + + Copy the libgetopt.a to ../libpci-libgetopt/lib and + getopt.h to ../libpci-libgetopt/include + Enter the flashrom directory. - Run either (change settings where appropriate) - make CC=i586-pc-msdosdjgpp-gcc STRIP=i586-pc-msdosdjgpp-strip - or (above settings hardcoded) - make djgpp-dos + + make CC=i586-pc-msdosdjgpp-gcc STRIP=i586-pc-msdosdjgpp-strip LIBS_BASE=../libpci-libgetopt/ strip + + If you like can compress the resulting executable with UPX: + + upx -9 flashrom.exe + To run flashrom.exe, download http://flashrom.org/File:Csdpmi7b.zip and unpack CWSDPMI.EXE into the current directory or one in PATH. + To cross-compile on Linux for Windows: Get packages of the MinGW cross compiler and install them: diff --git a/physmap.c b/physmap.c index a261ccd..3338b62 100644 --- a/physmap.c +++ b/physmap.c @@ -38,29 +38,40 @@ #ifdef __DJGPP__ #include <dpmi.h> +#include <malloc.h> #include <sys/nearptr.h> +#define ONE_MEGABYTE (1024 * 1024) #define MEM_DEV "dpmi" -static void *realmem_map; +static void *realmem_map_aligned; static void *map_first_meg(uintptr_t phys_addr, size_t len) { - if (realmem_map) - return realmem_map + phys_addr; + void *realmem_map; + size_t pagesize; - realmem_map = valloc(1024 * 1024); + if (realmem_map_aligned) + return realmem_map_aligned + phys_addr; + + /* valloc() from DJGPP 2.05 does not work properly */ + pagesize = getpagesize(); + + realmem_map = malloc(ONE_MEGABYTE + pagesize); if (!realmem_map) return ERROR_PTR; - if (__djgpp_map_physical_memory(realmem_map, (1024 * 1024), 0)) { + realmem_map_aligned = (void *)(((size_t) realmem_map + + (pagesize - 1)) & ~(pagesize - 1)); + + if (__djgpp_map_physical_memory(realmem_map_aligned, ONE_MEGABYTE, 0)) { free(realmem_map); - realmem_map = NULL; + realmem_map_aligned = NULL; return ERROR_PTR; } - return realmem_map + phys_addr; + return realmem_map_aligned + phys_addr; } static void *sys_physmap(uintptr_t phys_addr, size_t len) @@ -72,7 +83,7 @@ if (!__djgpp_nearptr_enable()) return ERROR_PTR; - if ((phys_addr + len - 1) < (1024 * 1024)) { + if ((phys_addr + len - 1) < ONE_MEGABYTE) { /* We need to use another method to map first 1MB. */ return map_first_meg(phys_addr, len); } @@ -97,8 +108,8 @@ /* There is no known way to unmap the first 1 MB. The DPMI server will * do this for us on exit. */ - if ((virt_addr >= realmem_map) && - ((virt_addr + len) <= (realmem_map + (1024 * 1024)))) { + if ((virt_addr >= realmem_map_aligned) && + ((virt_addr + len) <= (realmem_map_aligned + ONE_MEGABYTE))) { return; } -- To view, visit https://review.coreboot.org/23039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I909c5635aec5076440d2fde73d943f8ad10b8051 Gerrit-Change-Number: 23039 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Rudolf Marek <r.marek(a)assembler.cz>

1 0

Change in flashrom[master]: chipset_enable: VX900 as tested
by Paul Menzel (Code Review) Dec. 28, 2017

Dec. 28, 2017

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/23030 ) Change subject: chipset_enable: VX900 as tested ...................................................................... Patch Set 1: (1 comment) https://review.coreboot.org/#/c/23030/1//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/23030/1//COMMIT_MSG@7 PS1, Line 7: chipset_enable: VX900 as tested > Tag/Mark VX900 as tested -- To view, visit https://review.coreboot.org/23030 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I190253b0c1920747b710ed7155e78191cce139eb Gerrit-Change-Number: 23030 Gerrit-PatchSet: 1 Gerrit-Owner: Lubomir Rintel <lkundrak(a)v3.sk> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 28 Dec 2017 19:51:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

Change in flashrom[master]: chipset_enable: VX900 as tested
by build bot (Jenkins) (Code Review) Dec. 28, 2017

Dec. 28, 2017

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23030 ) Change subject: chipset_enable: VX900 as tested ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/978/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/838/ : SUCCESS -- To view, visit https://review.coreboot.org/23030 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I190253b0c1920747b710ed7155e78191cce139eb Gerrit-Change-Number: 23030 Gerrit-PatchSet: 1 Gerrit-Owner: Lubomir Rintel <lkundrak(a)v3.sk> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 28 Dec 2017 19:33:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: vt_vx: check whether the chipset's MMIO range is configured
by build bot (Jenkins) (Code Review) Dec. 28, 2017

Dec. 28, 2017

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23029 ) Change subject: vt_vx: check whether the chipset's MMIO range is configured ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/977/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/837/ : SUCCESS -- To view, visit https://review.coreboot.org/23029 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3a1ba695153e854e0979ae634f8ed97e6b6293 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 1 Gerrit-Owner: Lubomir Rintel <lkundrak(a)v3.sk> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 28 Dec 2017 19:33:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0