coreboot-gerrit February 2014

coreboot-gerrit@coreboot.org

1 participants
1135 discussions

New patch to review for coreboot: 802956f boardstatus/towiki: Skip OVERRIDE_FANCTL
by Vladimir Serbinenko 05 Feb '14

05 Feb '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5123 -gerrit commit 802956f3d7061af397ac2602b664bc12424b3466 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Wed Feb 5 12:20:58 2014 +0100 boardstatus/towiki: Skip OVERRIDE_FANCTL Change-Id: I4c5f69db198c8aa4757c82856fb04aa5ee16879f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/board_status/to-wiki/towiki.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh index 8ab3b78..46cc3c2 100755 --- a/util/board_status/to-wiki/towiki.sh +++ b/util/board_status/to-wiki/towiki.sh @@ -218,7 +218,7 @@ EOF southbridge="$(sed -n "/[[:space:]]*select SOUTHBRIDGE_/ s,[[:space:]]*select SOUTHBRIDGE_$[^ ]*$.*$,\1,p" "$vendor_board_dir/Kconfig"|grep -v SKIP_ISA_DMA_INIT)" southbridge_nice="$(echo "$southbridge"|sed 's,_, ,g;s,INTEL,Intel®,g')" - superio="$(sed -n "/[[:space:]]*select SUPERIO_/ s,[[:space:]]*select SUPERIO_,,p" "$vendor_board_dir/Kconfig")" + superio="$(sed -n "/[[:space:]]*select SUPERIO_/ s,[[:space:]]*select SUPERIO_,,p" "$vendor_board_dir/Kconfig"|grep -v OVERRIDE_FANCTL)" superio_nice="$(echo "$superio"|sed 's,_, ,g;s,WINBOND,Winbond™,g;s,ITE,ITE™,g;s,SMSC,SMSC®,g')" cpu="$(sed -n "/ select CPU_/ s, select CPU_,,p" "$vendor_board_dir/Kconfig"|grep -v "AMD_AGESA_FAMILY")" case "$cpu" in

1 0

New patch to review for coreboot: ebfee55 boardstatus/towiki: Skip comments after options.
by Vladimir Serbinenko 05 Feb '14

05 Feb '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5122 -gerrit commit ebfee55aaaaf727b6a273387b30ac92ef69d96ac Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Wed Feb 5 12:20:24 2014 +0100 boardstatus/towiki: Skip comments after options. Change-Id: Id1213f4a44cd3a7a698b761d4942707d7dc1dee6 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/board_status/to-wiki/towiki.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh index b7dab03..8ab3b78 100755 --- a/util/board_status/to-wiki/towiki.sh +++ b/util/board_status/to-wiki/towiki.sh @@ -216,7 +216,7 @@ EOF northbridge="$(sed -n "/^[[:space:]]*select NORTHBRIDGE_/ s,^[[:space:]]*select NORTHBRIDGE_,,p" "$vendor_board_dir/Kconfig")" northbridge_nice="$(echo "$northbridge"|sed 's,AMD_AGESA_FAMILY$[0-9a-fA-F]*$$.*$,AMD Family \1h\2 (AGESA),g;s,AMD_FAMILY$[0-9a-fA-F]*$,AMD Family \1h,g;s,AMD_AMDFAM$[0-9a-fA-F]*$,AMD Family \1h,g;s,_, ,g;s,INTEL,Intel®,g;')" - southbridge="$(sed -n "/[[:space:]]*select SOUTHBRIDGE_/ s,[[:space:]]*select SOUTHBRIDGE_,,p" "$vendor_board_dir/Kconfig"|grep -v SKIP_ISA_DMA_INIT)" + southbridge="$(sed -n "/[[:space:]]*select SOUTHBRIDGE_/ s,[[:space:]]*select SOUTHBRIDGE_$[^ ]*$.*$,\1,p" "$vendor_board_dir/Kconfig"|grep -v SKIP_ISA_DMA_INIT)" southbridge_nice="$(echo "$southbridge"|sed 's,_, ,g;s,INTEL,Intel®,g')" superio="$(sed -n "/[[:space:]]*select SUPERIO_/ s,[[:space:]]*select SUPERIO_,,p" "$vendor_board_dir/Kconfig")" superio_nice="$(echo "$superio"|sed 's,_, ,g;s,WINBOND,Winbond™,g;s,ITE,ITE™,g;s,SMSC,SMSC®,g')"

1 0

Patch set updated for coreboot: cb1aea4 boardstatus/to-wiki.sh: Accept Kconfig with non-tab separators.
by Vladimir Serbinenko 05 Feb '14

05 Feb '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5069 -gerrit commit cb1aea4b43c9864f8397d84d14e6d4077f19a7da Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Tue Jan 28 04:16:41 2014 +0100 boardstatus/to-wiki.sh: Accept Kconfig with non-tab separators. Change-Id: I3812c6bd6fb11d9e98ef60afb205782f2b1f0e44 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/board_status/to-wiki/towiki.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh index a9fb520..b7dab03 100755 --- a/util/board_status/to-wiki/towiki.sh +++ b/util/board_status/to-wiki/towiki.sh @@ -216,9 +216,9 @@ EOF northbridge="$(sed -n "/^[[:space:]]*select NORTHBRIDGE_/ s,^[[:space:]]*select NORTHBRIDGE_,,p" "$vendor_board_dir/Kconfig")" northbridge_nice="$(echo "$northbridge"|sed 's,AMD_AGESA_FAMILY$[0-9a-fA-F]*$$.*$,AMD Family \1h\2 (AGESA),g;s,AMD_FAMILY$[0-9a-fA-F]*$,AMD Family \1h,g;s,AMD_AMDFAM$[0-9a-fA-F]*$,AMD Family \1h,g;s,_, ,g;s,INTEL,Intel®,g;')" - southbridge="$(sed -n "/ select SOUTHBRIDGE_/ s, select SOUTHBRIDGE_,,p" "$vendor_board_dir/Kconfig"|grep -v SKIP_ISA_DMA_INIT)" + southbridge="$(sed -n "/[[:space:]]*select SOUTHBRIDGE_/ s,[[:space:]]*select SOUTHBRIDGE_,,p" "$vendor_board_dir/Kconfig"|grep -v SKIP_ISA_DMA_INIT)" southbridge_nice="$(echo "$southbridge"|sed 's,_, ,g;s,INTEL,Intel®,g')" - superio="$(sed -n "/ select SUPERIO_/ s, select SUPERIO_,,p" "$vendor_board_dir/Kconfig")" + superio="$(sed -n "/[[:space:]]*select SUPERIO_/ s,[[:space:]]*select SUPERIO_,,p" "$vendor_board_dir/Kconfig")" superio_nice="$(echo "$superio"|sed 's,_, ,g;s,WINBOND,Winbond™,g;s,ITE,ITE™,g;s,SMSC,SMSC®,g')" cpu="$(sed -n "/ select CPU_/ s, select CPU_,,p" "$vendor_board_dir/Kconfig"|grep -v "AMD_AGESA_FAMILY")" case "$cpu" in

1 0

Patch set updated for coreboot: 5656915 adlink/lippert: Add Adlink names for devices with both names.
by Vladimir Serbinenko 05 Feb '14

05 Feb '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4744 -gerrit commit 5656915f8c7e846a7f62cfc680699f92e6fbcf6e Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Jan 19 05:34:14 2014 +0100 adlink/lippert: Add Adlink names for devices with both names. Change-Id: I6a3f089309a2610986545e4e45e35569ea2772ed Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/mainboard/adlink/Kconfig | 13 +++++++++++++ src/mainboard/adlink/cexpress-gfr/Kconfig | 10 ++++++++++ src/mainboard/adlink/cexpress-gfr/board_info.txt | 8 ++++++++ src/mainboard/adlink/coremodule2-gf/Kconfig | 10 ++++++++++ src/mainboard/adlink/coremodule2-gf/board_info.txt | 7 +++++++ src/mainboard/lippert/Kconfig | 9 +++++++-- src/mainboard/lippert/frontrunner-af/Kconfig | 6 +++++- src/mainboard/lippert/toucan-af/Kconfig | 6 +++++- 8 files changed, 65 insertions(+), 4 deletions(-) diff --git a/src/mainboard/adlink/Kconfig b/src/mainboard/adlink/Kconfig index f71d6a9..635a763 100644 --- a/src/mainboard/adlink/Kconfig +++ b/src/mainboard/adlink/Kconfig @@ -3,8 +3,21 @@ if VENDOR_ADLINK comment "see under vendor LiPPERT" # any further boards will then be ADLINK +choice + prompt "Mainboard model" + +config BOARD_ADLINK_COREMODULE2_GF + bool "CoreModule2-GF aka LiPPPERT FrontRunner-AF" +config BOARD_ADLINK_CEXPRESS_GFR + bool "cExpress-GFR (+W83627DHG SIO) aka LiPPERT Toucan-AF" + +endchoice + config MAINBOARD_VENDOR string default "ADLINK" +source "src/mainboard/adlink/cexpress-gfr/Kconfig" +source "src/mainboard/adlink/coremodule2-gf/Kconfig" + endif # VENDOR_ADLINK diff --git a/src/mainboard/adlink/cexpress-gfr/Kconfig b/src/mainboard/adlink/cexpress-gfr/Kconfig new file mode 100644 index 0000000..ad670d1 --- /dev/null +++ b/src/mainboard/adlink/cexpress-gfr/Kconfig @@ -0,0 +1,10 @@ +if BOARD_ADLINK_CEXPRESS_GFR + +# Dummy for abuild +#select ARCH_X86 + +config MAINBOARD_PART_NUMBER + string + default "cExpress-GFR" + +endif diff --git a/src/mainboard/adlink/cexpress-gfr/board_info.txt b/src/mainboard/adlink/cexpress-gfr/board_info.txt new file mode 100644 index 0000000..7776aaa --- /dev/null +++ b/src/mainboard/adlink/cexpress-gfr/board_info.txt @@ -0,0 +1,8 @@ +Board name: cExpress-GFR (+W83627DHG SIO) +Category: half +Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1132 +ROM package: SOIC8 +ROM protocol: SPI +ROM socketed: n +Flashrom support: y +Clone of: lippert/toucan-af diff --git a/src/mainboard/adlink/coremodule2-gf/Kconfig b/src/mainboard/adlink/coremodule2-gf/Kconfig new file mode 100644 index 0000000..8513062 --- /dev/null +++ b/src/mainboard/adlink/coremodule2-gf/Kconfig @@ -0,0 +1,10 @@ +if BOARD_ADLINK_COREMODULE2_GF + +# Dummy for abuild +#select ARCH_X86 + +config MAINBOARD_PART_NUMBER + string + default "CoreModule2-GF" + +endif diff --git a/src/mainboard/adlink/coremodule2-gf/board_info.txt b/src/mainboard/adlink/coremodule2-gf/board_info.txt new file mode 100644 index 0000000..6bf07f8 --- /dev/null +++ b/src/mainboard/adlink/coremodule2-gf/board_info.txt @@ -0,0 +1,7 @@ +Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1283 +Category: half +ROM package: SOIC8 +ROM protocol: SPI +ROM socketed: n +Flashrom support: y +Clone of: lippert/frontrunner-af diff --git a/src/mainboard/lippert/Kconfig b/src/mainboard/lippert/Kconfig index 5d69aae..afb2370 100644 --- a/src/mainboard/lippert/Kconfig +++ b/src/mainboard/lippert/Kconfig @@ -23,15 +23,20 @@ config BOARD_LIPPERT_TOUCAN_AF endchoice source "src/mainboard/lippert/frontrunner/Kconfig" -source "src/mainboard/lippert/frontrunner-af/Kconfig" source "src/mainboard/lippert/hurricane-lx/Kconfig" source "src/mainboard/lippert/literunner-lx/Kconfig" source "src/mainboard/lippert/roadrunner-lx/Kconfig" source "src/mainboard/lippert/spacerunner-lx/Kconfig" -source "src/mainboard/lippert/toucan-af/Kconfig" config MAINBOARD_VENDOR string default "LiPPERT" endif # VENDOR_LIPPERT + +if VENDOR_LIPPERT || VENDOR_ADLINK + +source "src/mainboard/lippert/frontrunner-af/Kconfig" +source "src/mainboard/lippert/toucan-af/Kconfig" + +endif diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig index a0dbaf9..c4e540f 100644 --- a/src/mainboard/lippert/frontrunner-af/Kconfig +++ b/src/mainboard/lippert/frontrunner-af/Kconfig @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -if BOARD_LIPPERT_FRONTRUNNER_AF +if BOARD_LIPPERT_FRONTRUNNER_AF || BOARD_ADLINK_COREMODULE2_GF config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -50,10 +50,14 @@ config APIC_ID_OFFSET hex default 0x0 +if BOARD_LIPPERT_FRONTRUNNER_AF + config MAINBOARD_PART_NUMBER string default "FrontRunner-AF" +endif + config HW_MEM_HOLE_SIZEK hex default 0x200000 diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index 904c7c8..6acc43a 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -if BOARD_LIPPERT_TOUCAN_AF +if BOARD_LIPPERT_TOUCAN_AF || BOARD_ADLINK_CEXPRESS_GFR config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -52,10 +52,14 @@ config APIC_ID_OFFSET hex default 0x0 +if BOARD_LIPPERT_TOUCAN_AF + config MAINBOARD_PART_NUMBER string default "Toucan-AF" +endif + config HW_MEM_HOLE_SIZEK hex default 0x200000

1 0

Patch set updated for coreboot: 82c85cf smbios: Remove leading whitespaces in CPU name.
by Vladimir Serbinenko 05 Feb '14

05 Feb '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4750 -gerrit commit 82c85cfd834fc9ecc4fdbb49200e080c45a27c4c Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Jan 19 15:33:00 2014 +0100 smbios: Remove leading whitespaces in CPU name. Change-Id: I7d20936e59271157f05948dae514150d5dee4c87 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/smbios.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 65bf538..b9373d4 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -99,6 +99,7 @@ static int smbios_processor_name(char *start) { char tmp[49] = "Unknown Processor Name"; u32 *_tmp = (u32 *)tmp; + char *ptr; struct cpuid_result res; int i; @@ -115,7 +116,10 @@ static int smbios_processor_name(char *start) tmp[48] = 0; } } - return smbios_add_string(start, tmp); + + for (ptr = tmp; *ptr == ' '; ptr++); + + return smbios_add_string(start, ptr); } static int smbios_write_type0(unsigned long *current, int handle)

1 0

Patch set updated for coreboot: 7242af8 payloads/external/SeaBIOS/Makefile.inc: Upgrade stable from 1.7.2.2 to 1.7.4
by Paul Menzel 05 Feb '14

05 Feb '14

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5093 -gerrit commit 7242af8d2e55252096535ad9e760e3700ace6cd1 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sun Feb 2 11:23:26 2014 +0100 payloads/external/SeaBIOS/Makefile.inc: Upgrade stable from 1.7.2.2 to 1.7.4 On Monday, 12/23/2013, 12:34 -0500 Kevin O'Connor wrote: > The 1.7.4 version of SeaBIOS has now been released. For more > information on the release, please see: > > http://seabios.org/Releases > > > New in this release: > > * Support for obtaining ACPI tables directly from QEMU. > * Initial support for XHCI USB controllers (initially for QEMU only). > * Support for booting from "pvscsi" devices on QEMU. > * Enhanced floppy driver - improved support for real hardware. > * coreboot cbmem console support. > * Optional support for using the 9-segment instead of the e-segment > for local variables. > * Improved internal timer code and accuracy. > * SeaVGABIOS improvements > * Better support for legacy X.org releases with incomplete x86emu > emulation. > * Support for using an internal stack to reduce caller's stack > usage. > * Back port of new "bochs dispi" interface video modes. > * Several bug fixes and code cleanups > * Source code separated out into additional hardware and firmware > directories. > * Update to latest version of Kconfig > > > For information on obtaining SeaBIOS, please see: > > http://seabios.org/Download Successfully tested on the Asus M2V-MX SE. ----- [ SeaBIOS rel-1.7.4-0-g96917a8-20140201_152655-my-asus-m2v-mx_se ] ----- Found coreboot cbmem console @ 7dec0400 Found mainboard ASUS M2V-MX SE Change-Id: I675a50532735b4921a664e4b24d98be17b9a1002 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- payloads/external/SeaBIOS/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 84f1515..23b064c 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -1,5 +1,5 @@ TAG-$(CONFIG_SEABIOS_MASTER)=origin/master -TAG-$(CONFIG_SEABIOS_STABLE)=88cb66ea542906ffff8a80ef397b9e3adbb33116 +TAG-$(CONFIG_SEABIOS_STABLE)=96917a8ed761f017fc8c72ba3b9181fbac03ac59 unexport KCONFIG_AUTOCONFIG

1 0

Patch set updated for coreboot: 3cfb0d8 payloads/external/SeaBIOS/Makefile.inc: Upgrade stable from 1.7.2.2 to 1.7.4
by Paul Menzel 05 Feb '14

05 Feb '14

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5093 -gerrit commit 3cfb0d8978632fad0883bc10cf1e6e205960560a Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sun Feb 2 11:23:26 2014 +0100 payloads/external/SeaBIOS/Makefile.inc: Upgrade stable from 1.7.2.2 to 1.7.4 On Monday, 12/23/2013, 12:34 -0500 Kevin O'Connor wrote: > The 1.7.4 version of SeaBIOS has now been released. For more > information on the release, please see: > > http://seabios.org/Releases > > > New in this release: > > * Support for obtaining ACPI tables directly from QEMU. > * Initial support for XHCI USB controllers (initially for QEMU only). > * Support for booting from "pvscsi" devices on QEMU. > * Enhanced floppy driver - improved support for real hardware. > * coreboot cbmem console support. > * Optional support for using the 9-segment instead of the e-segment > for local variables. > * Improved internal timer code and accuracy. > * SeaVGABIOS improvements > * Better support for legacy X.org releases with incomplete x86emu > emulation. > * Support for using an internal stack to reduce caller's stack > usage. > * Back port of new "bochs dispi" interface video modes. > * Several bug fixes and code cleanups > * Source code separated out into additional hardware and firmware > directories. > * Update to latest version of Kconfig > > > For information on obtaining SeaBIOS, please see: > > http://seabios.org/Download Successfully tested on the Asus M2V-MX SE. ----- [ SeaBIOS rel-1.7.4-0-g96917a8-20140201_152655-my-asrock-e350m1 ] ----- Found coreboot cbmem console @ 7dec0400 Found mainboard ASUS M2V-MX SE Change-Id: I675a50532735b4921a664e4b24d98be17b9a1002 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- payloads/external/SeaBIOS/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 84f1515..23b064c 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -1,5 +1,5 @@ TAG-$(CONFIG_SEABIOS_MASTER)=origin/master -TAG-$(CONFIG_SEABIOS_STABLE)=88cb66ea542906ffff8a80ef397b9e3adbb33116 +TAG-$(CONFIG_SEABIOS_STABLE)=96917a8ed761f017fc8c72ba3b9181fbac03ac59 unexport KCONFIG_AUTOCONFIG

1 0

New patch to review for coreboot: 24c524b NOTFORMERGE: cbfstool: Deserialize CBFS master header when reading image
by Alexandru Gagniuc 05 Feb '14

05 Feb '14

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5121 -gerrit commit 24c524bfd13606462fe209361b48c3bec75d8e91 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Wed Feb 5 01:10:08 2014 -0600 NOTFORMERGE: cbfstool: Deserialize CBFS master header when reading image Rather than using [hn]to[nh] whenever accessing a member of the CBFS header, deserialize the header when opening the CBFS image. The header is no longer a pointer to the CBFS buffer, but a separate struct, a copy of the original header in a host-friendly format. This kills more of the ntohl usage Change-Id: I5f8a5818b9d5a2d1152b1906249c4a5847d02bac Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- util/cbfstool/cbfs_image.c | 85 ++++++++++++++++++++++++++++++---------------- util/cbfstool/cbfs_image.h | 2 ++ util/cbfstool/cbfstool.c | 2 +- 3 files changed, 58 insertions(+), 31 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index dddd480..6ecffd1 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -113,7 +113,7 @@ static int cbfs_calculate_file_header_size(const char *name) align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); } -static int cbfs_fix_legacy_size(struct cbfs_image *image) +static int cbfs_fix_legacy_size(struct cbfs_image *image, char *hdr_loc) { // A bug in old cbfstool may produce extra few bytes (by alignment) and // cause cbfstool to overwrite things after free space -- which is @@ -125,12 +125,11 @@ static int cbfs_fix_legacy_size(struct cbfs_image *image) entry = cbfs_find_next_entry(image, entry)) { last = entry; } - if ((char *)first < (char *)image->header && - (char *)entry > (char *)image->header) { + if ((char *)first < (char *)hdr_loc && + (char *)entry > (char *)hdr_loc) { WARN("CBFS image was created with old cbfstool with size bug. " "Fixing size in last entry...\n"); - last->len = htonl(ntohl(last->len) - - ntohl(image->header->align)); + last->len = htonl(ntohl(last->len) - image->header->align); DEBUG("Last entry has been changed from 0x%x to 0x%x.\n", cbfs_get_entry_addr(image, entry), cbfs_get_entry_addr(image, @@ -154,6 +153,23 @@ void cbfs_put_header(void *dest, const struct cbfs_header *header) xdr_be.put32(&outheader, header->offset); xdr_be.put32(&outheader, header->architecture); } + +void cbfs_get_header(struct cbfs_header *header, const void *src) +{ + struct buffer outheader; + + outheader.data = (void *)src; /* We're not modifying the data */ + outheader.size = 0; + + header->magic = xdr_be.get32(&outheader); + header->version = xdr_be.get32(&outheader); + header->romsize = xdr_be.get32(&outheader); + header->bootblocksize = xdr_be.get32(&outheader); + header->align = xdr_be.get32(&outheader); + header->offset = xdr_be.get32(&outheader); + header->architecture = xdr_be.get32(&outheader); +} + int cbfs_image_create(struct cbfs_image *image, uint32_t myarch, size_t size, @@ -167,6 +183,7 @@ int cbfs_image_create(struct cbfs_image *image, struct cbfs_file *entry; uint32_t cbfs_len; size_t entry_header_len; + void *header_loc; DEBUG("cbfs_image_create: bootblock=0x%x+0x%zx, " "header=0x%x+0x%zx, entries_offset=0x%x\n", @@ -175,7 +192,8 @@ int cbfs_image_create(struct cbfs_image *image, if (buffer_create(&image->buffer, size, "(new)") != 0) return -1; - image->header = NULL; + if ((image->header = malloc(sizeof(*image->header))) == NULL) + return -1; memset(image->buffer.data, CBFS_CONTENT_DEFAULT_VALUE, size); // Adjust legcay top-aligned address to ROM offset. @@ -214,15 +232,16 @@ int cbfs_image_create(struct cbfs_image *image, header_offset, sizeof(header), size); return -1; } - image->header = (struct cbfs_header *)(image->buffer.data + header_offset); - header.magic = CBFS_HEADER_MAGIC; - header.version = CBFS_HEADER_VERSION; - header.romsize = size; - header.bootblocksize = bootblock->size; - header.align = align; - header.offset = entries_offset; - header.architecture = myarch; - cbfs_put_header(image->header, &header); + image->header->magic = CBFS_HEADER_MAGIC; + image->header->version = CBFS_HEADER_VERSION; + image->header->romsize = size; + image->header->bootblocksize = bootblock->size; + image->header->align = align; + image->header->offset = entries_offset; + image->header->architecture = myarch; + + header_loc = (image->buffer.data + header_offset); + cbfs_put_header(header_loc, image->header); // Prepare entries if (align_up(entries_offset, align) != entries_offset) { @@ -252,18 +271,24 @@ int cbfs_image_create(struct cbfs_image *image, int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { + void *header_loc; + if (buffer_from_file(&image->buffer, filename) != 0) return -1; DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name, image->buffer.size); - image->header = cbfs_find_header(image->buffer.data, - image->buffer.size); - if (!image->header) { + header_loc = cbfs_find_header(image->buffer.data, image->buffer.size); + if (!header_loc) { ERROR("%s does not have CBFS master header.\n", filename); cbfs_image_delete(image); return -1; } - cbfs_fix_legacy_size(image); + + if ((image->header = malloc(sizeof(*image->header))) == NULL) + return -1; + + cbfs_get_header(image->header, header_loc); + cbfs_fix_legacy_size(image, header_loc); return 0; } @@ -296,7 +321,7 @@ static int cbfs_add_entry_at(struct cbfs_image *image, uint32_t header_size = cbfs_calculate_file_header_size(name), min_entry_size = cbfs_calculate_file_header_size(""); uint32_t len, target; - uint32_t align = ntohl(image->header->align); + uint32_t align = image->header->align; target = content_offset - header_size; if (target % align) @@ -372,7 +397,7 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, if (IS_TOP_ALIGNED_ADDRESS(content_offset)) { // legacy cbfstool takes top-aligned address. - uint32_t theromsize = ntohl(image->header->romsize); + uint32_t theromsize = image->header->romsize; INFO("Converting top-aligned address 0x%x to offset: 0x%x\n", content_offset, content_offset + theromsize); content_offset += theromsize; @@ -546,10 +571,10 @@ int cbfs_print_header_info(struct cbfs_image *image) "alignment: %d bytes\n\n", basename(name), image->buffer.size / 1024, - ntohl(image->header->bootblocksize), - ntohl(image->header->romsize), - ntohl(image->header->offset), - ntohl(image->header->align)); + image->header->bootblocksize, + image->header->romsize, + image->header->offset, + image->header->align); free(name); return 0; } @@ -779,14 +804,14 @@ struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) { assert(image && image->header); return (struct cbfs_file *)(image->buffer.data + - ntohl(image->header->offset)); + image->header->offset); } struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image, struct cbfs_file *entry) { uint32_t addr = cbfs_get_entry_addr(image, entry); - int align = ntohl(image->header->align); + int align = image->header->align; assert(entry && cbfs_is_valid_entry(image, entry)); addr += ntohl(entry->offset) + ntohl(entry->len); addr = align_up(addr, align); @@ -850,7 +875,7 @@ int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, /* Default values: allow fitting anywhere in ROM. */ if (!page_size) - page_size = ntohl(image->header->romsize); + page_size = image->header->romsize; if (!align) align = 1; @@ -858,9 +883,9 @@ int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, ERROR("Input file size (%d) greater than page size (%d).\n", size, page_size); - if (page_size % ntohl(image->header->align)) + if (page_size % image->header->align) WARN("%s: Page size (%#x) not aligned with CBFS image (%#x).\n", - __func__, page_size, ntohl(image->header->align)); + __func__, page_size, image->header->align); /* TODO Old cbfstool always assume input is a stage file (and adding * sizeof(cbfs_stage) for header. We should fix that by adding "-t" diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 8ea4e47..0a05eb2 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -34,6 +34,8 @@ struct cbfs_image { /* Given a pointer, serialize the header from host-native byte format * to cbfs format, i.e. big-endian. */ void cbfs_put_header(void *dest, const struct cbfs_header *header); +/* Or deserialize into host-native format */ +void cbfs_get_header(struct cbfs_header *header, const void *src); /* Creates an empty CBFS image by given size, and description to its content * (bootblock, align, header location, starting offset of CBFS entries. diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 1d93981..792dd91 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -436,7 +436,7 @@ static int cbfs_locate(void) } if (param.top_aligned) - address = address - ntohl(image.header->romsize); + address = address - image.header->romsize; cbfs_image_delete(&image); printf("0x%x\n", address);

1 0

Patch merged into coreboot/master: 5f53409 Add an xdr function for the cbfs_file header
by gerrit＠coreboot.org 05 Feb '14

05 Feb '14

the following patch was just integrated into master: commit 5f53409fe35a68d9e43c9f8d96f352b2e4642b7a Author: Ronald G. Minnich <rminnich(a)google.com> Date: Tue Feb 4 17:35:44 2014 -0800 Add an xdr function for the cbfs_file header And use it in fit.c and remove one more use of htonl. Change-Id: Ibf18dcc0a7f08d75c2374115de0db7a4bf64ec1e Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> See http://review.coreboot.org/5120 for details. -gerrit

1 0

Patch set updated for coreboot: 5f53409 Add an xdr function for the cbfs_file header
by Alexandru Gagniuc 05 Feb '14

05 Feb '14

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5120 -gerrit commit 5f53409fe35a68d9e43c9f8d96f352b2e4642b7a Author: Ronald G. Minnich <rminnich(a)google.com> Date: Tue Feb 4 17:35:44 2014 -0800 Add an xdr function for the cbfs_file header And use it in fit.c and remove one more use of htonl. Change-Id: Ibf18dcc0a7f08d75c2374115de0db7a4bf64ec1e Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> --- util/cbfstool/cbfs.h | 3 +++ util/cbfstool/common.c | 9 +++++++++ util/cbfstool/common.h | 1 + util/cbfstool/fit.c | 19 +++++++++++++++---- util/cbfstool/xdr.c | 9 +++++++++ 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 527c867..1839646 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -126,6 +126,9 @@ uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value); const char *get_cbfs_entry_type_name(uint32_t type); uint32_t get_cbfs_compression(const char *name, uint32_t unknown); +/* common.c */ +void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file); + /* elfheaders.c */ int elf_headers(const struct buffer *pinput, diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 98d9517..f594e84 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -103,6 +103,15 @@ void buffer_delete(struct buffer *buffer) { buffer->size = 0; } +void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file) +{ + bgets(buf, &file->magic, sizeof(file->magic)); + file->len = xdr_be.get32(buf); + file->type = xdr_be.get32(buf); + file->checksum = xdr_be.get32(buf); + file->offset = xdr_be.get32(buf); +} + static struct { uint32_t arch; const char *name; diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 5bcbcbe..5d3b900 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -110,5 +110,6 @@ struct xdr { /* xdr.c */ extern struct xdr xdr_le, xdr_be; +int bgets(struct buffer *input, void *output, size_t len); #endif diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c index a368dad..84f0bff 100644 --- a/util/cbfstool/fit.c +++ b/util/cbfstool/fit.c @@ -188,17 +188,28 @@ static void add_microcodde_entries(struct cbfs_image *image, } } +static int fit_header(void *ptr, uint32_t *current_offset, uint32_t *file_length) +{ + struct buffer buf; + struct cbfs_file header; + buf.data = ptr; + buf.size = sizeof(header); + cbfs_file_get_header(&buf, &header); + *current_offset = header.offset; + *file_length = header.len; + return 0; +} + static int parse_microcode_blob(struct cbfs_image *image, struct cbfs_file *mcode_file, struct microcode_entry *mcus, int *total_mcus) { int num_mcus; - int current_offset; - int file_length; + uint32_t current_offset; + uint32_t file_length; current_offset = (int)((char *)mcode_file - image->buffer.data); - current_offset += ntohl(mcode_file->offset); - file_length = ntohl(mcode_file->len); + fit_header(mcode_file, &current_offset, &file_length); num_mcus = 0; while (file_length > sizeof(struct microcode_header)) diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c index d779675..ddc282e 100644 --- a/util/cbfstool/xdr.c +++ b/util/cbfstool/xdr.c @@ -25,6 +25,15 @@ #include <stdint.h> #include "common.h" +int bgets(struct buffer *input, void *output, size_t len) +{ + len = input->size < len ? input->size : len; + memmove(output, input->data, len); + input->data += len; + input->size -= len; + return len; +} + /* The assumption in all this code is that we're given a pointer to enough data. * Hence, we do not check for underflow. */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2014