coreboot-gerrit August 2014

coreboot-gerrit@coreboot.org

1 participants
1011 discussions

Patch merged into coreboot/master: 47b8075 superio/smsc/sio1036: Fix hardcoded TTY0 base addr and .c include
by gerrit＠coreboot.org 23 Aug '14

23 Aug '14

the following patch was just integrated into master: commit 47b8075bb14de4dad4cfd2c2f42482e04644b28d Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sat Aug 2 20:08:35 2014 +1000 superio/smsc/sio1036: Fix hardcoded TTY0 base addr and .c include Compile romstage component as link-time symbols. Pass CONFIG_TTY0_BASE as argument instead of hard coding and playing funny business with the pre-processor. Fix board to match. Change-Id: If6d0d5389bd4e7765bb6056cf488c94fd45915c2 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/6463 Tested-by: build bot (Jenkins) Reviewed-by: Vladimir Serbinenko <phcoder(a)gmail.com> See http://review.coreboot.org/6463 for details. -gerrit

1 0

Patch set updated for coreboot: a3fc867 coreboot_table: Export mainboard id.
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6738 -gerrit commit a3fc8672f2f414b2c338091ed0c036d8cc938ad7 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri Aug 22 23:16:14 2014 +0200 coreboot_table: Export mainboard id. Change-Id: I45f36bef2f2fcabfe13a539fb4736a82995d57d4 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/include/boot/coreboot_tables.h | 3 +++ src/lib/coreboot_table.c | 21 +++++++++++++++++++++ src/mainboard/apple/macbook21/mainboard.c | 24 ++++++++++++++++++++++++ src/mainboard/artecgroup/dbe61/mainboard.c | 13 +++++++++++++ src/mainboard/asus/a8n_e/mainboard.c | 13 +++++++++++++ src/mainboard/iei/juki-511p/mainboard.c | 13 +++++++++++++ src/mainboard/jetway/j7f2/mainboard.c | 15 +++++++++++++++ src/mainboard/pcengines/alix2d/mainboard.c | 15 +++++++++++++++ src/mainboard/via/epia-m/mainboard.c | 15 +++++++++++++++ 9 files changed, 132 insertions(+) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index db3c508..7fe2cc1 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -134,6 +134,7 @@ struct lb_mainboard { #define LB_TAG_COMPILER 0x000b #define LB_TAG_LINKER 0x000c #define LB_TAG_ASSEMBLER 0x000d +#define LB_TAG_MAINBOARD_ID 0x0025 struct lb_string { uint32_t tag; uint32_t size; @@ -336,6 +337,8 @@ void lb_add_console(uint16_t consoletype, void *data); /* Define this in mainboard.c to add board-specific table entries. */ void lb_board(struct lb_header *header); +const char *__attribute__((weak)) lb_mainboard_id(void); + struct lb_record *lb_new_record(struct lb_header *header); #endif /* COREBOOT_TABLES_H */ diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index 9f9c453..2e78032 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -298,6 +298,26 @@ static void lb_strings(struct lb_header *header) } +/* Override if you have clones. Return value has to match board_info.txt + directory. */ +const char *__attribute__((weak)) lb_mainboard_id(void) +{ + return CONFIG_MAINBOARD_DIR; +} + +static void lb_record_mainboard_id(struct lb_header *header) +{ + struct lb_string *rec; + size_t len; + const char *mobo; + rec = (struct lb_string *)lb_new_record(header); + mobo = lb_mainboard_id(); + len = strlen(mobo); + rec->tag = LB_TAG_MAINBOARD_ID; + rec->size = (sizeof(*rec) + len + 1 + 3) & ~3; + memcpy(rec->string, mobo, len+1); +} + void __attribute__((weak)) lb_board(struct lb_header *header) { /* NOOP */ } static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header *next_header) @@ -409,6 +429,7 @@ unsigned long write_coreboot_table( /* Record our various random string information */ lb_strings(head); + lb_record_mainboard_id(head); /* Record our framebuffer */ lb_framebuffer(head); diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c index b537f78..832d4fd 100644 --- a/src/mainboard/apple/macbook21/mainboard.c +++ b/src/mainboard/apple/macbook21/mainboard.c @@ -35,6 +35,8 @@ #include <smbios.h> #include <x86emu/x86emu.h> #include <device/azalia_device.h> +#include <arch/cpu.h> +#include <boot/coreboot_tables.h> #include "hda_verb.h" #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT @@ -74,6 +76,28 @@ int get_cst_entries(acpi_cstate_t **entries) return 0; } +static int has_64bit(void) +{ + static int saved = -1; + if (saved == -1) + saved = (cpuid_edx(0x80000001) >> 29) & 1; + return saved; +} + +const char *smbios_mainboard_product_name(void) +{ + if (has_64bit()) + return "MacBook2,1"; + return "MacBook1,1"; +} + +const char *lb_mainboard_id(void) +{ + if (has_64bit()) + return "apple/macbook21"; + return "apple/macbook11"; +} + static void mainboard_init(device_t dev) { #if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c index 692d2ab..8d9a25a 100644 --- a/src/mainboard/artecgroup/dbe61/mainboard.c +++ b/src/mainboard/artecgroup/dbe61/mainboard.c @@ -26,6 +26,19 @@ #include <cpu/x86/msr.h> #include <cpu/amd/lxdef.h> #include "southbridge/amd/cs5536/cs5536.h" +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_ARTECGROUP_DBE61 + return "artecgroup/dbe61"; +#elif CONFIG_BOARD_LINUTOP_LINUTOP1 + return "linutop/linutop1"; +#else +#error "Unknown machine" +#endif +} static void init_gpio(void) { diff --git a/src/mainboard/asus/a8n_e/mainboard.c b/src/mainboard/asus/a8n_e/mainboard.c new file mode 100644 index 0000000..014d6b0 --- /dev/null +++ b/src/mainboard/asus/a8n_e/mainboard.c @@ -0,0 +1,13 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_ASUS_A8N_E + return "asus/a8n_e"; +#elif CONFIG_BOARD_ASUS_A8N_SLI + return "asus/a8n_sli"; +#else +#error "Unknown machine" +#endif +} diff --git a/src/mainboard/iei/juki-511p/mainboard.c b/src/mainboard/iei/juki-511p/mainboard.c new file mode 100644 index 0000000..72e3f54 --- /dev/null +++ b/src/mainboard/iei/juki-511p/mainboard.c @@ -0,0 +1,13 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_IEI_JUKI_511P + return "iei/juki-511p"; +#elif CONFIG_BOARD_IEI_ROCKY_512 + return "iei/rocky-512"; +#else +#error "Unknown machine" +#endif +} diff --git a/src/mainboard/jetway/j7f2/mainboard.c b/src/mainboard/jetway/j7f2/mainboard.c new file mode 100644 index 0000000..4aee352 --- /dev/null +++ b/src/mainboard/jetway/j7f2/mainboard.c @@ -0,0 +1,15 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_JETWAY_J7F2 + return "jetway/j7f2"; +#elif CONFIG_BOARD_JETWAY_J7F4K1G2E + return "jetway/j7f4k2g2e"; +#elif CONFIG_BOARD_JETWAY_J7F4K1G5D + return "jetway/j7f4k1g5d"; +#else +#error "Unknown machine" +#endif +} diff --git a/src/mainboard/pcengines/alix2d/mainboard.c b/src/mainboard/pcengines/alix2d/mainboard.c index 3cd08c8..862a86a 100644 --- a/src/mainboard/pcengines/alix2d/mainboard.c +++ b/src/mainboard/pcengines/alix2d/mainboard.c @@ -19,6 +19,21 @@ #include <console/console.h> #include <device/device.h> +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_PCENGINES_ALIX2C + return "pcengines/alix2c"; +#elif CONFIG_BOARD_PCENGINES_ALIX2D + return "pcengines/alix2d"; +#elif CONFIG_BOARD_PCENGINES_ALIX6 + return "pcengines/alix6"; +#else +#error "Unknown machine" +#endif +} static void init(struct device *dev) { diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c new file mode 100644 index 0000000..ed60e4c --- /dev/null +++ b/src/mainboard/via/epia-m/mainboard.c @@ -0,0 +1,15 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_VIA_EPIA_M + return "via/epia-m"; +#elif CONFIG_BOARD_VIA_EPIA_MII + return "via/epia-mii"; +#elif CONFIG_BOARD_VIA_EPIA_ML + return "via/epia-ml"; +#else +#error "Unknown machine" +#endif +}

1 0

New patch to review for coreboot: 22eb4b0 board_status: Use info exported by coreboot itself.
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6749 -gerrit commit 22eb4b0ce0e5212f011143dce44c233984a8f785 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sat Aug 23 01:11:56 2014 +0200 board_status: Use info exported by coreboot itself. It is more robust. board_status still uses rom from build/coreboot.rom. Change-Id: Ia2e2a3cdfa6ee2c404a9bd9c1a119755852c802f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/board_status/board_status.sh | 46 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index 0659d24..bff6627 100755 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -213,43 +213,41 @@ fi # If the user does not wish to upload, results will remain in /tmp. tmpdir=$(mktemp -d --tmpdir coreboot_board_status.XXXXXXXX) +if [ -n "$SERIAL_DEVICE" ]; then + get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/serial_console.txt" +fi + # Obtain board and revision info to form the directory structure: # <vendor>/<board>/<revision>/<timestamp> -cbfstool_cmd="build/cbfstool" -if test ! -x build/cbfstool; then - make -C util/cbfstool/ && cp util/cbfstool/cbfstool build/cbfstool -fi -test_cmd $LOCAL "$cbfstool_cmd" -$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt -$cbfstool_cmd build/coreboot.rom print > ${tmpdir}/cbfs.txt -mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" -vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }') +test_cmd $REMOTE "lbtdump" +cmd $REMOTE "lbtdump -m" "${tmpdir}/mainboard_id.txt" +mainboard_dir="$(cat "${tmpdir}/mainboard_id.txt")" +vendor="$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }')" mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }') - -getrevision="util/board_status/getrevision.sh" -test_cmd $LOCAL $getrevision -tagged_version=$($getrevision -T) -timestamp=$($getrevision -t) - +cmd $REMOTE "lbtdump -w" "${tmpdir}/tagged_version.txt" +tagged_version="$(cat "${tmpdir}/tagged_version.txt")" +cmd $REMOTE "lbtdump -t" "${tmpdir}/timestamp.txt" +timestamp="$(cat "${tmpdir}/timestamp.txt")" results="${vendor}/${mainboard}/${tagged_version}/${timestamp}" echo "Temporarily placing output in ${tmpdir}/${results}" mkdir -p "${tmpdir}/${results}" -mv "${tmpdir}/config.txt" "${tmpdir}/${results}" -mv "${tmpdir}/cbfs.txt" "${tmpdir}/${results}" +cbfstool_cmd="build/cbfstool" +if test ! -x build/cbfstool; then + make -C util/cbfstool/ && cp util/cbfstool/cbfstool build/cbfstool +fi +test_cmd $LOCAL "$cbfstool_cmd" +$cbfstool_cmd build/coreboot.rom extract -n config -f "${tmpdir}/${results}"/config.txt +$cbfstool_cmd build/coreboot.rom print > "${tmpdir}/${results}"/cbfs.txt +$cbfstool_cmd build/coreboot.rom extract -n revision -f "${tmpdir}/${results}"/revision.txt -touch ${tmpdir}/${results}/revision.txt -printf "Local revision: %s\n" "$($getrevision -l)" >> ${tmpdir}/${results}/revision.txt -printf "Tagged revision: %s\n" "${tagged_version}" >> ${tmpdir}/${results}/revision.txt -printf "Upstream revision: %s\n" $($getrevision -u) >> ${tmpdir}/${results}/revision.txt -printf "Upstream URL: %s\n" $($getrevision -U)>> ${tmpdir}/${results}/revision.txt -printf "Timestamp: %s\n" "$timestamp" >> ${tmpdir}/${results}/revision.txt if [ -n "$SERIAL_DEVICE" ]; then - get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/${results}/serial_console.txt" + mv "${tmpdir}/serial_console.txt" "${tmpdir}/${results}" fi + test_cmd $REMOTE "cbmem" cmd $REMOTE "cbmem -c" "${tmpdir}/${results}/coreboot_console.txt" cmd_nonfatal $REMOTE "cbmem -t" "${tmpdir}/${results}/coreboot_timestamps.txt"

1 0

New patch to review for coreboot: 182f59b lbtdump: Support version timestamp.
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6748 -gerrit commit 182f59b8ce3e890c5798c11bb7cd7a6ab18e4c35 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sat Aug 23 01:11:30 2014 +0200 lbtdump: Support version timestamp. Change-Id: Ie923134a538879fca33e66ca96ce480495ddef2f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/lbtdump/lbtdump.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/util/lbtdump/lbtdump.c b/util/lbtdump/lbtdump.c index cde1cc7..6069ac6 100644 --- a/util/lbtdump/lbtdump.c +++ b/util/lbtdump/lbtdump.c @@ -8,6 +8,7 @@ #include <errno.h> #include <sys/mman.h> #include <getopt.h> +#include <time.h> #include "../../src/include/boot/coreboot_tables.h" #define PRINT_ALL 0xffffffff @@ -194,6 +195,19 @@ void print_string(struct lb_record *ptr, unsigned long addr) printf("%.*s\n", max_size, rec->string); } +void print_timestamp(struct lb_record *ptr, unsigned long addr) +{ + struct lb_timestamp *rec; + time_t t; + struct tm *tt; + rec = (struct lb_timestamp *)ptr; + t = rec->timestamp; + tt = gmtime(&t); + printf("%04d-%02d-%02dT%02d:%02d:%02dZ\n", tt->tm_year + 1900, + tt->tm_mon + 1, tt->tm_mday, tt->tm_hour, + tt->tm_min, tt->tm_sec); +} + void print_option_table(struct lb_record *ptr, unsigned long addr) { struct lb_record *rec, *last; @@ -264,6 +278,7 @@ struct { { LB_TAG_HWRPB, "HWRPB", nop_print }, { LB_TAG_MAINBOARD, "Mainboard", print_mainboard }, { LB_TAG_VERSION, "Version", print_string }, + { LB_TAG_VERSION_TIMESTAMP, "Version timestamp", print_timestamp }, { LB_TAG_EXTRA_VERSION, "Extra Version", print_string }, { LB_TAG_BUILD, "Build", print_string }, { LB_TAG_COMPILE_TIME, "Compile Time", print_string }, @@ -368,6 +383,7 @@ static void print_usage(const char *name) printf("\n" " -m | --mainboard-id: print mainboard id\n" " -w | --coreboot-version: dump coreboot version\n" + " -t | --coreboot-version-timestamp: dump coreboot version timestamp\n" " -V | --verbose: verbose (debugging) output\n" " -h | --help: print this help\n" "\n"); @@ -385,11 +401,12 @@ int main(int argc, char **argv) static struct option long_options[] = { {"mainboard-id", 0, 0, 'm'}, {"coreboot-version", 0, 0, 'w'}, + {"coreboot-version-timestamp", 0, 0, 't'}, {"verbose", 0, 0, 'V'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "Vmwh?", + while ((opt = getopt_long(argc, argv, "Vtmwh?", long_options, &option_index)) != EOF) { switch (opt) { case 'm': @@ -398,6 +415,9 @@ int main(int argc, char **argv) case 'w': target = LB_TAG_VERSION; break; + case 't': + target = LB_TAG_VERSION_TIMESTAMP; + break; case 'V': verbose = 1; break;

1 0

New patch to review for coreboot: cb90c15 Export board-status info.
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6747 -gerrit commit cb90c1578ce03f524f136978c2e0de421b97bd46 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sat Aug 23 01:08:09 2014 +0200 Export board-status info. Rather than hunting version across compile tree in board_status, export it by coreboot itself. Change-Id: I7f055e6fc077134001ebdb11df7381bbdc71a1fc Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- Makefile.inc | 10 ++++++++++ src/include/boot/coreboot_tables.h | 8 ++++++++ src/include/version.h | 1 + src/lib/coreboot_table.c | 10 ++++++++++ src/lib/version.c | 1 + 5 files changed, 30 insertions(+) diff --git a/Makefile.inc b/Makefile.inc index d757c89..ef52704 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -239,6 +239,14 @@ $(obj)/build.h: .xcompile printf "#ifndef __BUILD_H\n" >> $(obj)/build.ht printf "#define __BUILD_H\n\n" >> $(obj)/build.ht printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" >> $(obj)/build.ht + if git update-index -q --refresh >/dev/null; ! git diff-index --quiet HEAD; then \ + printf "/* `LANG= TZ=UTC git log --date=local --pretty=format:%cd -1` UTC */\n" >> $(obj)/build.ht; \ + printf "#define COREBOOT_VERSION_TIMESTAMP `LANG= git log --pretty=format:%ct -1`\n" >> $(obj)/build.ht; \ + else \ + printf "/* `LANG= TZ=UTC date` */\n" >> $(obj)/build.ht; \ + printf "#define COREBOOT_VERSION_TIMESTAMP `LANG= date +%s`\n" >> $(obj)/build.ht; \ + fi + printf "#define COREBOOT_ORIGIN_GIT_REVISION \"`LANG= git log remotes/origin/master -1 --format=format:%h`\"\n" >> $(obj)/build.ht printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.ht printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.ht printf "#define COREBOOT_BUILD_YEAR_BCD 0x`LANG= date +"%y"`\n" >> $(obj)/build.ht @@ -521,6 +529,8 @@ ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) echo "# This image was built using git revision" `git rev-parse HEAD` > $(obj)/config.tmp ; \ sed -e '/^#/d' -e '/^ *$$/d' $(DOTCONFIG) >> $(obj)/config.tmp ; \ $(CBFSTOOL) $@.tmp add -f $(obj)/config.tmp -n config -t raw; rm -f $(obj)/config.tmp ; fi + @printf " REVISION build.h\n" + if [ -f $(obj)/build.h ]; then $(CBFSTOOL) $@.tmp add -f $(obj)/build.h -n revision -t raw; fi endif ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y) $(CBFSTOOL) $@.tmp add-stage -f $(VBOOT_STUB) -n $(CONFIG_CBFS_PREFIX)/vboot -c $(CBFS_COMPRESS_FLAG) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 7fe2cc1..1c2fc13 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -141,6 +141,14 @@ struct lb_string { uint8_t string[0]; }; +#define LB_TAG_VERSION_TIMESTAMP 0x0026 +struct lb_timestamp { + uint32_t tag; + uint32_t size; + uint32_t timestamp; +}; + + /* 0xe is taken by v3 */ #define LB_TAG_SERIAL 0x000f diff --git a/src/include/version.h b/src/include/version.h index 7290261..56dda5e 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -9,6 +9,7 @@ extern const char mainboard_part_number[]; extern const char coreboot_version[]; extern const char coreboot_extra_version[]; extern const char coreboot_build[]; +extern const unsigned int coreboot_version_timestamp; /* When coreboot was compiled */ extern const char coreboot_compile_time[]; diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index 2e78032..04eb6ad 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -318,6 +318,15 @@ static void lb_record_mainboard_id(struct lb_header *header) memcpy(rec->string, mobo, len+1); } +static void lb_record_version_timestamp(struct lb_header *header) +{ + struct lb_timestamp *rec; + rec = (struct lb_timestamp *)lb_new_record(header); + rec->tag = LB_TAG_VERSION_TIMESTAMP; + rec->size = sizeof(*rec); + rec->timestamp = coreboot_version_timestamp; +} + void __attribute__((weak)) lb_board(struct lb_header *header) { /* NOOP */ } static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header *next_header) @@ -430,6 +439,7 @@ unsigned long write_coreboot_table( /* Record our various random string information */ lb_strings(head); lb_record_mainboard_id(head); + lb_record_version_timestamp(head); /* Record our framebuffer */ lb_framebuffer(head); diff --git a/src/lib/version.c b/src/lib/version.c index 027aea1..c959bda 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -35,6 +35,7 @@ const char mainboard_part_number[] = CONFIG_MAINBOARD_PART_NUMBER; const char coreboot_version[] = COREBOOT_VERSION; const char coreboot_extra_version[] = COREBOOT_EXTRA_VERSION; const char coreboot_build[] = COREBOOT_BUILD; +const unsigned int coreboot_version_timestamp = COREBOOT_VERSION_TIMESTAMP; const char coreboot_compile_time[] = COREBOOT_COMPILE_TIME; const char coreboot_compile_by[] = COREBOOT_COMPILE_BY;

1 0

New patch to review for coreboot: bab8a40 board_status: Collect cbmem console even if serial is available since serial is probably broken.
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6746 -gerrit commit bab8a408d96540c3cc2c75f941917cb604925ff0 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri Aug 22 23:41:35 2014 +0200 board_status: Collect cbmem console even if serial is available since serial is probably broken. Change-Id: Ic7c90a99e3175138431cbfc4f91e70154265f452 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/board_status/board_status.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index 49d2c73..0659d24 100755 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -246,14 +246,14 @@ printf "Upstream revision: %s\n" $($getrevision -u) >> ${tmpdir}/${results}/revi printf "Upstream URL: %s\n" $($getrevision -U)>> ${tmpdir}/${results}/revision.txt printf "Timestamp: %s\n" "$timestamp" >> ${tmpdir}/${results}/revision.txt -if [ -z "$SERIAL_DEVICE" ]; then - test_cmd $REMOTE "cbmem" - cmd $REMOTE "cbmem -c" "${tmpdir}/${results}/coreboot_console.txt" - cmd_nonfatal $REMOTE "cbmem -t" "${tmpdir}/${results}/coreboot_timestamps.txt" -else - get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/${results}/coreboot_console.txt" +if [ -n "$SERIAL_DEVICE" ]; then + get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/${results}/serial_console.txt" fi +test_cmd $REMOTE "cbmem" +cmd $REMOTE "cbmem -c" "${tmpdir}/${results}/coreboot_console.txt" +cmd_nonfatal $REMOTE "cbmem -t" "${tmpdir}/${results}/coreboot_timestamps.txt" + cmd $REMOTE dmesg "${tmpdir}/${results}/kernel_log.txt" #

1 0

New patch to review for coreboot: 476cb33 lbtdump: Support mainboard-id
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6745 -gerrit commit 476cb330e0825b6a563c72f467f80c8ec6ca9492 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri Aug 22 23:39:25 2014 +0200 lbtdump: Support mainboard-id Change-Id: I291aa695aae2098d93cd6ca4e892a39e26e9c717 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/lbtdump/lbtdump.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/lbtdump/lbtdump.c b/util/lbtdump/lbtdump.c index 34d1165..cde1cc7 100644 --- a/util/lbtdump/lbtdump.c +++ b/util/lbtdump/lbtdump.c @@ -366,6 +366,7 @@ static void print_usage(const char *name) { printf("usage: %s [-mh?]\n", name); printf("\n" + " -m | --mainboard-id: print mainboard id\n" " -w | --coreboot-version: dump coreboot version\n" " -V | --verbose: verbose (debugging) output\n" " -h | --help: print this help\n" @@ -382,6 +383,7 @@ int main(int argc, char **argv) int opt, option_index = 0; static struct option long_options[] = { + {"mainboard-id", 0, 0, 'm'}, {"coreboot-version", 0, 0, 'w'}, {"verbose", 0, 0, 'V'}, {"help", 0, 0, 'h'}, @@ -390,6 +392,9 @@ int main(int argc, char **argv) while ((opt = getopt_long(argc, argv, "Vmwh?", long_options, &option_index)) != EOF) { switch (opt) { + case 'm': + target = LB_TAG_MAINBOARD_ID; + break; case 'w': target = LB_TAG_VERSION; break;

1 0

New patch to review for coreboot: adb002d lbtdump: Allow printing only relevant info
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6744 -gerrit commit adb002d651754f851a011004d8773dba056ec5f3 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri Aug 22 23:38:45 2014 +0200 lbtdump: Allow printing only relevant info Change-Id: I8d4c26cc01a112c8f9c7de09da4fa06cfa77a9ac Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/lbtdump/lbtdump.c | 79 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/util/lbtdump/lbtdump.c b/util/lbtdump/lbtdump.c index c5e4f28..34d1165 100644 --- a/util/lbtdump/lbtdump.c +++ b/util/lbtdump/lbtdump.c @@ -7,9 +7,14 @@ #include <string.h> #include <errno.h> #include <sys/mman.h> +#include <getopt.h> #include "../../src/include/boot/coreboot_tables.h" -uint64_t print_lb_records(struct lb_record *rec, struct lb_record *last, unsigned long addr); +#define PRINT_ALL 0xffffffff + +static int verbose = 0; + +uint64_t print_lb_records(struct lb_record *rec, struct lb_record *last, unsigned long addr, uint32_t target); unsigned long compute_checksum(void *addr, unsigned long length) { @@ -72,8 +77,9 @@ struct lb_header *find_lb_table(void *base, unsigned long start, unsigned long e struct lb_record *recs = (struct lb_record *)(((char*)base) + addr + sizeof(*head)); if (memcmp(head->signature, "LBIO", 4) != 0) continue; - fprintf(stdout, "Found candidate at: %08lx-%08lx\n", - addr, addr + head->table_bytes); + if (verbose) + fprintf(stdout, "Found candidate at: %08lx-%08lx\n", + addr, addr + head->table_bytes); if (head->header_bytes != sizeof(*head)) { fprintf(stderr, "Header bytes of %d are incorrect\n", head->header_bytes); @@ -94,7 +100,8 @@ struct lb_header *find_lb_table(void *base, unsigned long start, unsigned long e head->table_checksum); continue; } - fprintf(stdout, "Found coreboot table at: %08lx\n", addr); + if (verbose) + fprintf(stdout, "Found coreboot table at: %08lx\n", addr); return head; }; @@ -196,7 +203,7 @@ void print_option_table(struct lb_record *ptr, unsigned long addr) last = (struct lb_record *)(((char *)hdr) + hdr->size); printf("cmos option header record = type %d, size %d, header length %d\n", hdr->tag, hdr->size, hdr->header_length); - print_lb_records(rec, last, addr + hdr->header_length); + print_lb_records(rec, last, addr + hdr->header_length, PRINT_ALL); #if 0 { unsigned char *data = (unsigned char *)ptr; @@ -266,6 +273,7 @@ struct { { LB_TAG_COMPILER, "Compiler", print_string }, { LB_TAG_LINKER, "Linker", print_string }, { LB_TAG_ASSEMBLER, "Assembler", print_string }, + { LB_TAG_MAINBOARD_ID, "Mainboard ID", print_string }, { LB_TAG_CMOS_OPTION_TABLE, "CMOS option table", print_option_table }, { LB_TAG_OPTION, "Option", print_option }, { LB_TAG_OPTION_ENUM, "Option Enumeration", print_option_enumeration }, @@ -281,7 +289,7 @@ static struct lb_record *next_record(struct lb_record *rec) } uint64_t print_lb_records(struct lb_record *rec, struct lb_record *last, - unsigned long addr) + unsigned long addr, uint32_t target) { struct lb_record *next; int i; @@ -298,9 +306,10 @@ uint64_t print_lb_records(struct lb_record *rec, struct lb_record *last, break; } } - printf("lb_record #%d type %d @ 0x%08lx %s\n", - count, rec->tag, addr, lb_types[i].type_name); - if (lb_types[i].print) { + if (target == PRINT_ALL) + printf("lb_record #%d type %d @ 0x%08lx %s\n", + count, rec->tag, addr, lb_types[i].type_name); + if (lb_types[i].print && (target == PRINT_ALL || target == rec->tag)) { lb_types[i].print(rec, addr); } if (rec->tag == LB_TAG_FORWARD) @@ -326,7 +335,7 @@ static void *do_map(int fd, uint64_t addr, uint32_t len, void **mpaddr_out, size return ret + addr - mpaddr; } -uint64_t print_lb_table(int fd, uint64_t addr) +uint64_t print_lb_table(int fd, uint64_t addr, uint32_t target) { struct lb_record *rec, *last; struct lb_header *head; @@ -344,19 +353,59 @@ uint64_t print_lb_table(int fd, uint64_t addr) rec = (struct lb_record *)(((char *)head) + head->header_bytes); last = (struct lb_record *)(((char *)rec) + head->table_bytes); - printf("Coreboot header(%d) checksum: %04x table(%d) checksum: %04x entries: %d\n", - head->header_bytes, head->header_checksum, - head->table_bytes, head->table_checksum, head->table_entries); - forward = print_lb_records(rec, last, addr + head->header_bytes); + if (target == PRINT_ALL) + printf("Coreboot header(%d) checksum: %04x table(%d) checksum: %04x entries: %d\n", + head->header_bytes, head->header_checksum, + head->table_bytes, head->table_checksum, head->table_entries); + forward = print_lb_records(rec, last, addr + head->header_bytes, target); munmap (mp, mplen); return forward; } +static void print_usage(const char *name) +{ + printf("usage: %s [-mh?]\n", name); + printf("\n" + " -w | --coreboot-version: dump coreboot version\n" + " -V | --verbose: verbose (debugging) output\n" + " -h | --help: print this help\n" + "\n"); + exit(1); +} + int main(int argc, char **argv) { unsigned char *low_1MB; struct lb_header *lb_table; int fd; + uint32_t target = PRINT_ALL; + int opt, option_index = 0; + + static struct option long_options[] = { + {"coreboot-version", 0, 0, 'w'}, + {"verbose", 0, 0, 'V'}, + {"help", 0, 0, 'h'}, + {0, 0, 0, 0} + }; + while ((opt = getopt_long(argc, argv, "Vmwh?", + long_options, &option_index)) != EOF) { + switch (opt) { + case 'w': + target = LB_TAG_VERSION; + break; + case 'V': + verbose = 1; + break; + case 'h': + case '?': + default: + print_usage(argv[0]); + exit(0); + break; + } + } + + fd = open("/dev/mem", O_RDONLY); if (fd < 0) { fprintf(stderr, "Can not open /dev/mem\n"); @@ -378,7 +427,7 @@ int main(int argc, char **argv) addr = ((char *)lb_table) - ((char *)low_1MB); while (addr) - addr = print_lb_table(fd, addr); + addr = print_lb_table(fd, addr, target); } else { printf("lb_table not found\n");

1 0

Patch set updated for coreboot: 0b42957 coreboot_table: Export mainboard id.
by Vladimir Serbinenko 23 Aug '14

23 Aug '14

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6738 -gerrit commit 0b42957674e5f03641d23e60e133525623ca803f Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri Aug 22 23:16:14 2014 +0200 coreboot_table: Export mainboard id. Change-Id: I45f36bef2f2fcabfe13a539fb4736a82995d57d4 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/include/boot/coreboot_tables.h | 3 +++ src/lib/coreboot_table.c | 21 +++++++++++++++++++++ src/mainboard/apple/macbook21/mainboard.c | 24 ++++++++++++++++++++++++ src/mainboard/artecgroup/dbe61/mainboard.c | 13 +++++++++++++ src/mainboard/asus/a8n_e/mainboard.c | 13 +++++++++++++ src/mainboard/iei/juki-511p/mainboard.c | 13 +++++++++++++ src/mainboard/jetway/j7f2/mainboard.c | 15 +++++++++++++++ src/mainboard/lippert/hurricane-lx/mainboard.c | 1 + src/mainboard/pcengines/alix2d/mainboard.c | 15 +++++++++++++++ src/mainboard/via/epia-m/mainboard.c | 15 +++++++++++++++ 10 files changed, 133 insertions(+) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index db3c508..7fe2cc1 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -134,6 +134,7 @@ struct lb_mainboard { #define LB_TAG_COMPILER 0x000b #define LB_TAG_LINKER 0x000c #define LB_TAG_ASSEMBLER 0x000d +#define LB_TAG_MAINBOARD_ID 0x0025 struct lb_string { uint32_t tag; uint32_t size; @@ -336,6 +337,8 @@ void lb_add_console(uint16_t consoletype, void *data); /* Define this in mainboard.c to add board-specific table entries. */ void lb_board(struct lb_header *header); +const char *__attribute__((weak)) lb_mainboard_id(void); + struct lb_record *lb_new_record(struct lb_header *header); #endif /* COREBOOT_TABLES_H */ diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index 9f9c453..2e78032 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -298,6 +298,26 @@ static void lb_strings(struct lb_header *header) } +/* Override if you have clones. Return value has to match board_info.txt + directory. */ +const char *__attribute__((weak)) lb_mainboard_id(void) +{ + return CONFIG_MAINBOARD_DIR; +} + +static void lb_record_mainboard_id(struct lb_header *header) +{ + struct lb_string *rec; + size_t len; + const char *mobo; + rec = (struct lb_string *)lb_new_record(header); + mobo = lb_mainboard_id(); + len = strlen(mobo); + rec->tag = LB_TAG_MAINBOARD_ID; + rec->size = (sizeof(*rec) + len + 1 + 3) & ~3; + memcpy(rec->string, mobo, len+1); +} + void __attribute__((weak)) lb_board(struct lb_header *header) { /* NOOP */ } static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header *next_header) @@ -409,6 +429,7 @@ unsigned long write_coreboot_table( /* Record our various random string information */ lb_strings(head); + lb_record_mainboard_id(head); /* Record our framebuffer */ lb_framebuffer(head); diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c index b537f78..832d4fd 100644 --- a/src/mainboard/apple/macbook21/mainboard.c +++ b/src/mainboard/apple/macbook21/mainboard.c @@ -35,6 +35,8 @@ #include <smbios.h> #include <x86emu/x86emu.h> #include <device/azalia_device.h> +#include <arch/cpu.h> +#include <boot/coreboot_tables.h> #include "hda_verb.h" #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT @@ -74,6 +76,28 @@ int get_cst_entries(acpi_cstate_t **entries) return 0; } +static int has_64bit(void) +{ + static int saved = -1; + if (saved == -1) + saved = (cpuid_edx(0x80000001) >> 29) & 1; + return saved; +} + +const char *smbios_mainboard_product_name(void) +{ + if (has_64bit()) + return "MacBook2,1"; + return "MacBook1,1"; +} + +const char *lb_mainboard_id(void) +{ + if (has_64bit()) + return "apple/macbook21"; + return "apple/macbook11"; +} + static void mainboard_init(device_t dev) { #if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c index 692d2ab..8d9a25a 100644 --- a/src/mainboard/artecgroup/dbe61/mainboard.c +++ b/src/mainboard/artecgroup/dbe61/mainboard.c @@ -26,6 +26,19 @@ #include <cpu/x86/msr.h> #include <cpu/amd/lxdef.h> #include "southbridge/amd/cs5536/cs5536.h" +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_ARTECGROUP_DBE61 + return "artecgroup/dbe61"; +#elif CONFIG_BOARD_LINUTOP_LINUTOP1 + return "linutop/linutop1"; +#else +#error "Unknown machine" +#endif +} static void init_gpio(void) { diff --git a/src/mainboard/asus/a8n_e/mainboard.c b/src/mainboard/asus/a8n_e/mainboard.c new file mode 100644 index 0000000..014d6b0 --- /dev/null +++ b/src/mainboard/asus/a8n_e/mainboard.c @@ -0,0 +1,13 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_ASUS_A8N_E + return "asus/a8n_e"; +#elif CONFIG_BOARD_ASUS_A8N_SLI + return "asus/a8n_sli"; +#else +#error "Unknown machine" +#endif +} diff --git a/src/mainboard/iei/juki-511p/mainboard.c b/src/mainboard/iei/juki-511p/mainboard.c new file mode 100644 index 0000000..72e3f54 --- /dev/null +++ b/src/mainboard/iei/juki-511p/mainboard.c @@ -0,0 +1,13 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_IEI_JUKI_511P + return "iei/juki-511p"; +#elif CONFIG_BOARD_IEI_ROCKY_512 + return "iei/rocky-512"; +#else +#error "Unknown machine" +#endif +} diff --git a/src/mainboard/jetway/j7f2/mainboard.c b/src/mainboard/jetway/j7f2/mainboard.c new file mode 100644 index 0000000..4aee352 --- /dev/null +++ b/src/mainboard/jetway/j7f2/mainboard.c @@ -0,0 +1,15 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_JETWAY_J7F2 + return "jetway/j7f2"; +#elif CONFIG_BOARD_JETWAY_J7F4K1G2E + return "jetway/j7f4k2g2e"; +#elif CONFIG_BOARD_JETWAY_J7F4K1G5D + return "jetway/j7f4k1g5d"; +#else +#error "Unknown machine" +#endif +} diff --git a/src/mainboard/lippert/hurricane-lx/mainboard.c b/src/mainboard/lippert/hurricane-lx/mainboard.c index 56f6a0a..e1c9cdf 100644 --- a/src/mainboard/lippert/hurricane-lx/mainboard.c +++ b/src/mainboard/lippert/hurricane-lx/mainboard.c @@ -27,6 +27,7 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> +#include <boot/coreboot_tables.h> /* Bit1 switches Com1 to RS485, bit2 same for Com2. */ #if CONFIG_ONBOARD_UARTS_RS485 diff --git a/src/mainboard/pcengines/alix2d/mainboard.c b/src/mainboard/pcengines/alix2d/mainboard.c index 3cd08c8..862a86a 100644 --- a/src/mainboard/pcengines/alix2d/mainboard.c +++ b/src/mainboard/pcengines/alix2d/mainboard.c @@ -19,6 +19,21 @@ #include <console/console.h> #include <device/device.h> +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_PCENGINES_ALIX2C + return "pcengines/alix2c"; +#elif CONFIG_BOARD_PCENGINES_ALIX2D + return "pcengines/alix2d"; +#elif CONFIG_BOARD_PCENGINES_ALIX6 + return "pcengines/alix6"; +#else +#error "Unknown machine" +#endif +} static void init(struct device *dev) { diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c new file mode 100644 index 0000000..ed60e4c --- /dev/null +++ b/src/mainboard/via/epia-m/mainboard.c @@ -0,0 +1,15 @@ +#include <boot/coreboot_tables.h> + +const char *lb_mainboard_id(void) +{ + /* FIXME: we shouldn't rely on user choosing the right variant. */ +#if CONFIG_BOARD_VIA_EPIA_M + return "via/epia-m"; +#elif CONFIG_BOARD_VIA_EPIA_MII + return "via/epia-mii"; +#elif CONFIG_BOARD_VIA_EPIA_ML + return "via/epia-ml"; +#else +#error "Unknown machine" +#endif +}

1 0

New patch to review for coreboot: 87bbfe4 lenovo/t520: fix devicetree
by Nicolas Reinecke 23 Aug '14

23 Aug '14

Nicolas Reinecke (nr(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6743 -gerrit commit 87bbfe42c38587024422c52f2778d555c23b51e9 Author: Nicolas Reinecke <nr(a)das-labor.org> Date: Sat Aug 23 01:06:33 2014 +0200 lenovo/t520: fix devicetree SATA Port documentation PCIe unsed ports and documentation T520 have no keybord backlight Change-Id: I517ff8519ea22a9a7a9b6e3136efd15d4a0f8fc4 Signed-off-by: Nicolas Reinecke <nr(a)das-labor.org> --- src/mainboard/lenovo/t520/devicetree.cb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mainboard/lenovo/t520/devicetree.cb b/src/mainboard/lenovo/t520/devicetree.cb index 475e49c..c911d99 100644 --- a/src/mainboard/lenovo/t520/devicetree.cb +++ b/src/mainboard/lenovo/t520/devicetree.cb @@ -34,6 +34,7 @@ chip northbridge/intel/sandybridge device domain 0 on device pci 00.0 on end # host bridge + device pci 01.0 on end # NVIDIA Corporation GF119M [NVS 4200M] device pci 02.0 on end # vga controller chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH @@ -54,7 +55,7 @@ chip northbridge/intel/sandybridge register "gpi1_routing" = "2" register "gpi8_routing" = "2" - # Enable SATA ports 0 + # Enable SATA ports 0 (HDD bay) & 1 (ODD bay) & 2 (mSATA) & 3 (eSATA) & 4 (dock) register "sata_port_map" = "0x1f" # Set max SATA speed to 6.0 Gb/s register "sata_interface_speed_support" = "0x3" @@ -73,11 +74,14 @@ chip northbridge/intel/sandybridge device pci 19.0 on end # Intel Gigabit Ethernet device pci 1a.0 on end # USB2 EHCI #2 device pci 1b.0 on end # High Definition Audio - device pci 1c.0 on end # PCIe Port #1 + device pci 1c.0 off end # PCIe Port #1 device pci 1c.1 on end # PCIe Port #2 Integrated Wireless LAN - device pci 1c.2 off end - device pci 1c.3 on end # PCIe Port #3 Express Card - device pci 1c.4 on end # PCIe Port #4 MMC/SDXC + IEEE1394 + device pci 1c.2 off end # PCIe Port #3 + device pci 1c.3 on end # PCIe Port #4 Express Card + device pci 1c.4 on end # PCIe Port #5 MMC/SDXC + IEEE1394 + device pci 1c.5 off end # PCIe Port #6 Intel Ethernet PHY + device pci 1c.6 off end # PCIe Port #7 USB 3.0 only W520 + device pci 1c.7 off end # PCIe Port #8 device pci 1d.0 on end # USB2 EHCI #1 device pci 1f.0 on #LPC bridge chip ec/lenovo/pmh7 @@ -100,8 +104,6 @@ chip northbridge/intel/sandybridge register "config2" = "0xa0" register "config3" = "0xc2" - register "has_keyboard_backlight" = "1" - register "beepmask0" = "0x00" register "beepmask1" = "0x86" register "has_power_management_beeps" = "0"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2014