coreboot-gerrit May 2014

coreboot-gerrit@coreboot.org

1 participants
1066 discussions

Patch set updated for coreboot: 047b3ff mainboard/google/parrot Fix usage of GNU field designator extension
by Edward O'Callaghan 23 May '14

23 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5821 -gerrit commit 047b3ffae5560e91e4c8f81799bd76a90cb3959a Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 08:36:01 2014 +1000 mainboard/google/parrot Fix usage of GNU field designator extension Following the reasoning in: 8089f17 mainboard/lenovo/x230 Fix usage of GNU field designator extension In C99 we defined a syntax for this. GCC's old syntax was deprecated. Change-Id: I5be77fe6670601e103260077fae07a5b9fd41f1d Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/google/parrot/romstage.c | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c index 361c19b..1799aec 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/romstage.c @@ -120,32 +120,32 @@ void main(unsigned long bist) u16 pm1_sts; struct pei_data pei_data = { - pei_version: PEI_VERSION, - mchbar: DEFAULT_MCHBAR, - dmibar: DEFAULT_DMIBAR, - epbar: DEFAULT_EPBAR, - pciexbar: CONFIG_MMCONF_BASE_ADDRESS, - smbusbar: SMBUS_IO_BASE, - wdbbar: 0x4000000, - wdbsize: 0x1000, - hpet_address: CONFIG_HPET_ADDRESS, - rcba: DEFAULT_RCBABASE, - pmbase: DEFAULT_PMBASE, - gpiobase: DEFAULT_GPIOBASE, - thermalbase: 0xfed08000, - system_type: 0, // 0 Mobile, 1 Desktop/Server - tseg_size: CONFIG_SMM_TSEG_SIZE, - spd_addresses: { 0xA0, 0x00,0xA4,0x00 }, - ts_addresses: { 0x00, 0x00, 0x00, 0x00 }, - ec_present: 1, + .pei_version = PEI_VERSION, + .mchbar = DEFAULT_MCHBAR, + .dmibar = DEFAULT_DMIBAR, + .epbar = DEFAULT_EPBAR, + .pciexbar = CONFIG_MMCONF_BASE_ADDRESS, + .smbusbar = SMBUS_IO_BASE, + .wdbbar = 0x4000000, + .wdbsize = 0x1000, + .hpet_address = CONFIG_HPET_ADDRESS, + .rcba = DEFAULT_RCBABASE, + .pmbase = DEFAULT_PMBASE, + .gpiobase = DEFAULT_GPIOBASE, + .thermalbase = 0xfed08000, + .system_type = 0, // 0 Mobile, 1 Desktop/Server + .tseg_size = CONFIG_SMM_TSEG_SIZE, + .spd_addresses = { 0xA0, 0x00,0xA4,0x00 }, + .ts_addresses = { 0x00, 0x00, 0x00, 0x00 }, + .ec_present = 1, // 0 = leave channel enabled // 1 = disable dimm 0 on channel // 2 = disable dimm 1 on channel // 3 = disable dimm 0+1 on channel - dimm_channel0_disabled: 2, - dimm_channel1_disabled: 2, - max_ddr3_freq: 1600, - usb_port_config: { + .dimm_channel0_disabled = 2, + .dimm_channel1_disabled = 2, + .max_ddr3_freq = 1600, + .usb_port_config = { /* Empty and onboard Ports 0-7, set to un-used pin OC3 */ { 0, 3, 0x0000 }, /* P0: Empty */ { 1, 0, 0x0040 }, /* P1: Left USB 1 (OC0) */

1 0

Patch merged into coreboot/master: 68a56ca northbridge/amd/amdmct: Incorrect usage of logical over bitwise and
by gerrit＠coreboot.org 23 May '14

23 May '14

the following patch was just integrated into master: commit 68a56caf7e9bb0203de1d4d96861ba60885a401d Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 07:11:14 2014 +1000 northbridge/amd/amdmct: Incorrect usage of logical over bitwise and Small mix up of logical/bitwise logical and operation. Spotted by Clang. Change-Id: I2c2256b9b2f2b6ca627914118c745f579555acc9 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/5820 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones(a)se-eng.com> See http://review.coreboot.org/5820 for details. -gerrit

1 0

Patch merged into coreboot/master: ba363d3 northbridge/amd/amdmct: Superfluous parenthesis in if-statements
by gerrit＠coreboot.org 23 May '14

23 May '14

the following patch was just integrated into master: commit ba363d3f185c30c51069cff711d8be8dccb3545f Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 05:58:27 2014 +1000 northbridge/amd/amdmct: Superfluous parenthesis in if-statements Remove superfluous parenthesis found in some if-statements, spotted by Clang. Change-Id: I98d2bf6b408caf320c5bcc8adb23d621b182976b Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/5817 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones(a)se-eng.com> See http://review.coreboot.org/5817 for details. -gerrit

1 0

Patch set updated for coreboot: e442f6c sconfig: Refuse devicetree with leaf "chip"s
by Stefan Reinauer 23 May '14

23 May '14

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3189 -gerrit commit e442f6c1c47795215be220f3e9a43ba1dffb4b96 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Fri May 3 20:31:56 2013 +0200 sconfig: Refuse devicetree with leaf "chip"s It doesn't make sense to have a chip without any containing device in the device tree, and it creates lots of funny issues when trying to make use of such a tree (ask Ron). Since the right thing is to refuse such devicetrees, this change makes them a syntax error. Change-Id: Ia35b518bd4acd631e78bdf63c4424c0fa6a81229 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/sconfig/sconfig.tab.c_shipped | 122 +++++++++++++++++++------------------ util/sconfig/sconfig.y | 2 +- 2 files changed, 63 insertions(+), 61 deletions(-) diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped index 3a56ac8..1347b89 100644 --- a/util/sconfig/sconfig.tab.c_shipped +++ b/util/sconfig/sconfig.tab.c_shipped @@ -387,16 +387,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 37 +#define YYLAST 48 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 28 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 13 /* YYNRULES -- Number of rules. */ -#define YYNRULES 22 +#define YYNRULES 24 /* YYNRULES -- Number of states. */ -#define YYNSTATES 41 +#define YYNSTATES 46 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -444,30 +444,30 @@ static const yytype_uint8 yytranslate[] = YYRHS. */ static const yytype_uint8 yyprhs[] = { - 0, 0, 3, 4, 7, 10, 13, 16, 17, 20, - 23, 26, 29, 32, 33, 34, 40, 41, 49, 54, - 59, 63, 68 + 0, 0, 3, 4, 7, 10, 12, 15, 18, 21, + 24, 27, 30, 33, 36, 39, 40, 41, 47, 48, + 56, 61, 66, 70, 75 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { 29, 0, -1, -1, 30, 33, -1, 31, 35, -1, - 31, 33, -1, 31, 38, -1, -1, 32, 35, -1, - 32, 33, -1, 32, 37, -1, 32, 39, -1, 32, - 40, -1, -1, -1, 3, 12, 34, 31, 9, -1, - -1, 4, 7, 22, 6, 36, 32, 9, -1, 8, - 22, 10, 22, -1, 5, 12, 10, 12, -1, 23, - 22, 22, -1, 23, 22, 22, 24, -1, 25, 22, - 27, 22, -1 + 35, -1, 31, 33, -1, 31, 38, -1, 38, 31, + -1, 33, 31, -1, 32, 35, -1, 32, 33, -1, + 32, 37, -1, 32, 39, -1, 32, 40, -1, -1, + -1, 3, 12, 34, 31, 9, -1, -1, 4, 7, + 22, 6, 36, 32, 9, -1, 8, 22, 10, 22, + -1, 5, 12, 10, 12, -1, 23, 22, 22, -1, + 23, 22, 22, 24, -1, 25, 22, 27, 22, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 35, 35, 35, 37, 37, 37, 37, 39, 39, - 39, 39, 39, 39, 41, 41, 51, 51, 63, 66, - 69, 72, 75 + 0, 35, 35, 35, 37, 37, 37, 37, 37, 37, + 39, 39, 39, 39, 39, 39, 41, 41, 51, 51, + 63, 66, 69, 72, 75 }; #endif @@ -499,17 +499,17 @@ static const yytype_uint16 yytoknum[] = /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 28, 30, 29, 31, 31, 31, 31, 32, 32, - 32, 32, 32, 32, 34, 33, 36, 35, 37, 38, - 39, 39, 40 + 0, 28, 30, 29, 31, 31, 31, 31, 31, 31, + 32, 32, 32, 32, 32, 32, 34, 33, 36, 35, + 37, 38, 39, 39, 40 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { - 0, 2, 0, 2, 2, 2, 2, 0, 2, 2, - 2, 2, 2, 0, 0, 5, 0, 7, 4, 4, - 3, 4, 4 + 0, 2, 0, 2, 2, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 0, 0, 5, 0, 7, + 4, 4, 3, 4, 4 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -517,37 +517,37 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 0, 1, 0, 3, 14, 7, 0, 0, - 0, 15, 5, 4, 6, 0, 0, 0, 0, 16, - 19, 13, 0, 0, 17, 0, 0, 9, 8, 10, - 11, 12, 0, 0, 0, 0, 20, 0, 18, 21, - 22 + 2, 0, 0, 1, 0, 3, 16, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 17, 6, 4, 7, + 9, 8, 0, 0, 18, 21, 15, 0, 0, 19, + 0, 0, 11, 10, 12, 13, 14, 0, 0, 0, + 0, 22, 0, 20, 23, 24 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 2, 8, 22, 5, 7, 13, 21, 29, - 14, 30, 31 + -1, 1, 2, 10, 27, 11, 7, 12, 26, 34, + 13, 35, 36 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -9 +#define YYPACT_NINF -10 static const yytype_int8 yypact[] = { - -9, 3, 1, -9, -2, -9, -9, -9, 4, 5, - -1, -9, -9, -9, -9, -8, 7, 9, 6, -9, - -9, -9, -3, 2, -9, 8, 10, -9, -9, -9, - -9, -9, 11, 12, -4, 13, -5, 14, -9, -9, - -9 + -10, 2, 3, -10, -5, -10, -10, 24, 15, 11, + 12, 24, -10, 24, 9, 23, -10, -10, -10, -10, + 24, 24, 28, 25, -10, -10, -10, 1, 13, -10, + 14, 16, -10, -10, -10, -10, -10, 29, 18, 17, + 20, 21, 26, -10, -10, -10 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -9, -9, -9, -9, -9, -6, -9, 15, -9, -9, - -9, -9, -9 + -10, -10, -10, 19, -10, -2, -10, -7, -10, -10, + -9, -10, -10 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -556,35 +556,37 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 4, 9, 12, 3, 4, 23, 24, 4, 9, 10, - 6, 16, 15, 11, 17, 19, 27, 18, 20, 39, - 25, 35, 26, 37, 32, 0, 0, 0, 0, 0, - 33, 0, 34, 0, 36, 38, 40, 28 + 5, 19, 3, 18, 4, 8, 4, 6, 17, 28, + 29, 19, 19, 18, 18, 4, 8, 9, 17, 17, + 33, 16, 14, 15, 30, 32, 31, 4, 8, 9, + 20, 22, 21, 23, 24, 37, 38, 25, 39, 40, + 41, 0, 43, 0, 42, 44, 0, 0, 45 }; #define yypact_value_is_default(yystate) \ - ((yystate) == (-9)) + ((yystate) == (-10)) #define yytable_value_is_error(yytable_value) \ YYID (0) static const yytype_int8 yycheck[] = { - 3, 4, 8, 0, 3, 8, 9, 3, 4, 5, - 12, 12, 7, 9, 22, 6, 22, 10, 12, 24, - 23, 10, 25, 27, 22, -1, -1, -1, -1, -1, - 22, -1, 22, -1, 22, 22, 22, 22 + 2, 10, 0, 10, 3, 4, 3, 12, 10, 8, + 9, 20, 21, 20, 21, 3, 4, 5, 20, 21, + 27, 9, 7, 12, 23, 27, 25, 3, 4, 5, + 11, 22, 13, 10, 6, 22, 22, 12, 22, 10, + 22, -1, 22, -1, 27, 24, -1, -1, 22 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 29, 30, 0, 3, 33, 12, 34, 31, 4, - 5, 9, 33, 35, 38, 7, 12, 22, 10, 6, - 12, 36, 32, 8, 9, 23, 25, 33, 35, 37, - 39, 40, 22, 22, 22, 10, 22, 27, 22, 24, - 22 + 0, 29, 30, 0, 3, 33, 12, 34, 4, 5, + 31, 33, 35, 38, 7, 12, 9, 33, 35, 38, + 31, 31, 22, 10, 6, 12, 36, 32, 8, 9, + 23, 25, 33, 35, 37, 39, 40, 22, 22, 22, + 10, 22, 27, 22, 24, 22 }; #define yyerrok (yyerrstatus = 0) @@ -1428,7 +1430,7 @@ yyreduce: { postprocess_devtree(); } break; - case 14: + case 16: { (yyval.device) = new_chip(cur_parent, cur_bus, (yyvsp[(2) - (2)].string)); @@ -1436,7 +1438,7 @@ yyreduce: } break; - case 15: + case 17: { cur_parent = (yyvsp[(3) - (5)].device)->parent; @@ -1445,7 +1447,7 @@ yyreduce: } break; - case 16: + case 18: { (yyval.device) = new_device(cur_parent, cur_bus, (yyvsp[(2) - (4)].number), (yyvsp[(3) - (4)].string), (yyvsp[(4) - (4)].number)); @@ -1454,7 +1456,7 @@ yyreduce: } break; - case 17: + case 19: { cur_parent = (yyvsp[(5) - (7)].device)->parent; @@ -1464,27 +1466,27 @@ yyreduce: } break; - case 18: + case 20: { add_resource(cur_parent, (yyvsp[(1) - (4)].number), strtol((yyvsp[(2) - (4)].string), NULL, 0), strtol((yyvsp[(4) - (4)].string), NULL, 0)); } break; - case 19: + case 21: { add_register(cur_parent, (yyvsp[(2) - (4)].string), (yyvsp[(4) - (4)].string)); } break; - case 20: + case 22: { add_pci_subsystem_ids(cur_parent, strtol((yyvsp[(2) - (3)].string), NULL, 16), strtol((yyvsp[(3) - (3)].string), NULL, 16), 0); } break; - case 21: + case 23: { add_pci_subsystem_ids(cur_parent, strtol((yyvsp[(2) - (4)].string), NULL, 16), strtol((yyvsp[(3) - (4)].string), NULL, 16), 1); } break; - case 22: + case 24: { add_ioapic_info(cur_parent, strtol((yyvsp[(2) - (4)].string), NULL, 16), (yyvsp[(3) - (4)].string), strtol((yyvsp[(4) - (4)].string), NULL, 16)); } break; diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y index 8ea702e..f298ce2 100755 --- a/util/sconfig/sconfig.y +++ b/util/sconfig/sconfig.y @@ -34,7 +34,7 @@ static struct device *cur_parent, *cur_bus; %% devtree: { cur_parent = cur_bus = head; } chip { postprocess_devtree(); } ; -chipchildren: chipchildren device | chipchildren chip | chipchildren registers | /* empty */ ; +chipchildren: chipchildren device | device | chipchildren chip | chipchildren registers | registers chipchildren | chip chipchildren ; devicechildren: devicechildren device | devicechildren chip | devicechildren resource | devicechildren subsystemid | devicechildren ioapic_irq | /* empty */ ;

1 0

Patch set updated for coreboot: e37a0e0 libpayload: Add ARM defconfig
by Stefan Reinauer 23 May '14

23 May '14

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4552 -gerrit commit e37a0e0c8c3ab88c097d506534d6eba171e24cad Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat Dec 21 21:39:37 2013 +0100 libpayload: Add ARM defconfig make junit.xml tries to build it, but fails (ARM port doesn't seem to be ready?) Useful test case to demonstrate a failing libpayload build. Change-Id: Iba4fe551b48f631e6a3bd90eb07930fc70761332 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- payloads/libpayload/configs/defconfig-arm | 72 +++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm new file mode 100644 index 0000000..ac074c1 --- /dev/null +++ b/payloads/libpayload/configs/defconfig-arm @@ -0,0 +1,72 @@ +# +# Automatically generated make config: don't edit +# libpayload version: 0.2.0 +# Sat Dec 21 21:38:06 2013 +# + +# +# Generic Options +# +# CONFIG_EXPERIMENTAL is not set +# CONFIG_OBSOLETE is not set +# CONFIG_DEVELOPER is not set +# CONFIG_CHROMEOS is not set + +# +# Architecture Options +# +CONFIG_ARCH_ARMV7=y +# CONFIG_ARCH_X86 is not set +# CONFIG_MEMMAP_RAM_ONLY is not set + +# +# Standard Libraries +# +CONFIG_LIBC=y +CONFIG_CURSES=y +CONFIG_TINYCURSES=y +# CONFIG_PDCURSES is not set +CONFIG_CBFS=y +CONFIG_LZMA=y + +# +# Console Options +# +# CONFIG_SKIP_CONSOLE_INIT is not set +CONFIG_CBMEM_CONSOLE=y +CONFIG_SERIAL_CONSOLE=y +# CONFIG_SERIAL_SET_SPEED is not set +# CONFIG_SERIAL_ACS_FALLBACK is not set +CONFIG_VIDEO_CONSOLE=y +# CONFIG_COREBOOT_VIDEO_CONSOLE is not set +CONFIG_PC_KEYBOARD=y +CONFIG_PC_KEYBOARD_LAYOUT_US=y +# CONFIG_PC_KEYBOARD_LAYOUT_DE is not set + +# +# Drivers +# +# CONFIG_RTC_PORT_EXTENDED_VIA is not set +CONFIG_STORAGE=y +# CONFIG_STORAGE_64BIT_LBA is not set +CONFIG_STORAGE_ATA=y +CONFIG_STORAGE_ATAPI=y +CONFIG_USB=y +CONFIG_USB_OHCI=y +CONFIG_USB_EHCI=y +CONFIG_USB_XHCI=y +CONFIG_USB_HID=y +CONFIG_USB_HUB=y +CONFIG_USB_MSC=y +CONFIG_USB_GEN_HUB=y +# CONFIG_USB_PCI is not set +CONFIG_USB_MEMORY=y +CONFIG_USB_OHCI_BASE_ADDRESS=0x12120000 +CONFIG_USB_EHCI_BASE_ADDRESS=0x12110000 +CONFIG_USB_XHCI_BASE_ADDRESS=0x12000000 +# CONFIG_BIG_ENDIAN is not set +CONFIG_LITTLE_ENDIAN=y +# CONFIG_IO_ADDRESS_SPACE is not set +CONFIG_ARCH_SPECIFIC_OPTIONS=y +CONFIG_COREBOOT_INFO_RANGE_BASE=0x10 +CONFIG_COREBOOT_INFO_RANGE_SIZE=0x4000000

1 0

New patch to review for coreboot: 6517853 mainboard/google/peppy Fix usage of GNU field designator extension
by Edward O'Callaghan 23 May '14

23 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5822 -gerrit commit 6517853eeb7d38fb11d58a3d37e871e7b975a6cb Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 08:42:18 2014 +1000 mainboard/google/peppy Fix usage of GNU field designator extension Following the reasoning in, 8089f17 mainboard/lenovo/x230 Fix usage of GNU field designator extension In C99 we defined a syntax for this. GCC's old syntax was deprecated. Change-Id: Idd7305cb34be77894ca4b6062bc0a2dc61126347 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/google/peppy/romstage.c | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c index 4e72326..38c224b 100644 --- a/src/mainboard/google/peppy/romstage.c +++ b/src/mainboard/google/peppy/romstage.c @@ -121,32 +121,32 @@ static void copy_spd(struct pei_data *peid) void mainboard_romstage_entry(unsigned long bist) { struct pei_data pei_data = { - pei_version: PEI_VERSION, - mchbar: DEFAULT_MCHBAR, - dmibar: DEFAULT_DMIBAR, - epbar: DEFAULT_EPBAR, - pciexbar: DEFAULT_PCIEXBAR, - smbusbar: SMBUS_IO_BASE, - wdbbar: 0x4000000, - wdbsize: 0x1000, - hpet_address: HPET_ADDR, - rcba: DEFAULT_RCBA, - pmbase: DEFAULT_PMBASE, - gpiobase: DEFAULT_GPIOBASE, - temp_mmio_base: 0xfed08000, - system_type: 5, /* ULT */ - tseg_size: CONFIG_SMM_TSEG_SIZE, - spd_addresses: { 0xff, 0x00, 0xff, 0x00 }, - ec_present: 1, + .pei_version = PEI_VERSION, + .mchbar = DEFAULT_MCHBAR, + .dmibar = DEFAULT_DMIBAR, + .epbar = DEFAULT_EPBAR, + .pciexbar = DEFAULT_PCIEXBAR, + .smbusbar = SMBUS_IO_BASE, + .wdbbar = 0x4000000, + .wdbsize = 0x1000, + .hpet_address = HPET_ADDR, + .rcba = DEFAULT_RCBA, + .pmbase = DEFAULT_PMBASE, + .gpiobase = DEFAULT_GPIOBASE, + .temp_mmio_base = 0xfed08000, + .system_type = 5, /* ULT */ + .tseg_size = CONFIG_SMM_TSEG_SIZE, + .spd_addresses = { 0xff, 0x00, 0xff, 0x00 }, + .ec_present = 1, // 0 = leave channel enabled // 1 = disable dimm 0 on channel // 2 = disable dimm 1 on channel // 3 = disable dimm 0+1 on channel - dimm_channel0_disabled: 2, - dimm_channel1_disabled: 2, - max_ddr3_freq: 1600, - usb_xhci_on_resume: 1, - usb2_ports: { + .dimm_channel0_disabled = 2, + .dimm_channel1_disabled = 2, + .max_ddr3_freq = 1600, + .usb_xhci_on_resume = 1, + .usb2_ports = { /* Length, Enable, OCn#, Location */ { 0x0150, 1, USB_OC_PIN_SKIP, /* P0: LTE */ USB_PORT_MINI_PCIE }, @@ -165,7 +165,7 @@ void mainboard_romstage_entry(unsigned long bist) { 0x0000, 0, USB_OC_PIN_SKIP, /* P7: EMPTY */ USB_PORT_SKIP }, }, - usb3_ports: { + .usb3_ports = { /* Enable, OCn# */ { 1, 0 }, /* P1; Port A, CN6 */ { 0, USB_OC_PIN_SKIP }, /* P2; */

1 0

New patch to review for coreboot: e238753 mainboard/google/parrot Fix usage of GNU field designator extension
by Edward O'Callaghan 23 May '14

23 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5821 -gerrit commit e23875361f198af7ebd119080619e29dbb797b62 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 08:36:01 2014 +1000 mainboard/google/parrot Fix usage of GNU field designator extension Following the reasoning in: 8089f17 mainboard/lenovo/x230 Fix usage of GNU field designator extension In C99 we defined a syntax for this. GCC's old syntax was deprecated. Change-Id: I5be77fe6670601e103260077fae07a5b9fd41f1d Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/google/parrot/romstage.c | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c index 361c19b..1799aec 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/romstage.c @@ -120,32 +120,32 @@ void main(unsigned long bist) u16 pm1_sts; struct pei_data pei_data = { - pei_version: PEI_VERSION, - mchbar: DEFAULT_MCHBAR, - dmibar: DEFAULT_DMIBAR, - epbar: DEFAULT_EPBAR, - pciexbar: CONFIG_MMCONF_BASE_ADDRESS, - smbusbar: SMBUS_IO_BASE, - wdbbar: 0x4000000, - wdbsize: 0x1000, - hpet_address: CONFIG_HPET_ADDRESS, - rcba: DEFAULT_RCBABASE, - pmbase: DEFAULT_PMBASE, - gpiobase: DEFAULT_GPIOBASE, - thermalbase: 0xfed08000, - system_type: 0, // 0 Mobile, 1 Desktop/Server - tseg_size: CONFIG_SMM_TSEG_SIZE, - spd_addresses: { 0xA0, 0x00,0xA4,0x00 }, - ts_addresses: { 0x00, 0x00, 0x00, 0x00 }, - ec_present: 1, + .pei_version = PEI_VERSION, + .mchbar = DEFAULT_MCHBAR, + .dmibar = DEFAULT_DMIBAR, + .epbar = DEFAULT_EPBAR, + .pciexbar = CONFIG_MMCONF_BASE_ADDRESS, + .smbusbar = SMBUS_IO_BASE, + .wdbbar = 0x4000000, + .wdbsize = 0x1000, + .hpet_address = CONFIG_HPET_ADDRESS, + .rcba = DEFAULT_RCBABASE, + .pmbase = DEFAULT_PMBASE, + .gpiobase = DEFAULT_GPIOBASE, + .thermalbase = 0xfed08000, + .system_type = 0, // 0 Mobile, 1 Desktop/Server + .tseg_size = CONFIG_SMM_TSEG_SIZE, + .spd_addresses = { 0xA0, 0x00,0xA4,0x00 }, + .ts_addresses = { 0x00, 0x00, 0x00, 0x00 }, + .ec_present = 1, // 0 = leave channel enabled // 1 = disable dimm 0 on channel // 2 = disable dimm 1 on channel // 3 = disable dimm 0+1 on channel - dimm_channel0_disabled: 2, - dimm_channel1_disabled: 2, - max_ddr3_freq: 1600, - usb_port_config: { + .dimm_channel0_disabled = 2, + .dimm_channel1_disabled = 2, + .max_ddr3_freq = 1600, + .usb_port_config = { /* Empty and onboard Ports 0-7, set to un-used pin OC3 */ { 0, 3, 0x0000 }, /* P0: Empty */ { 1, 0, 0x0040 }, /* P1: Left USB 1 (OC0) */

1 0

Patch set updated for coreboot: c2ed08c northbridge/amd/amdmct: Superfluous parenthesis in if-statements
by Edward O'Callaghan 22 May '14

22 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5817 -gerrit commit c2ed08ce333146c0d080f82d1ef4e2f2c4753a2c Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 05:58:27 2014 +1000 northbridge/amd/amdmct: Superfluous parenthesis in if-statements Remove superfluous parenthesis found in some if-statements, spotted by Clang. Change-Id: I98d2bf6b408caf320c5bcc8adb23d621b182976b Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/northbridge/amd/amdmct/mct/mct_d.c | 10 +++++----- src/northbridge/amd/amdmct/mct_ddr3/mct_d.c | 2 +- src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/northbridge/amd/amdmct/mct/mct_d.c b/src/northbridge/amd/amdmct/mct/mct_d.c index 47b89b4..66eb88a 100644 --- a/src/northbridge/amd/amdmct/mct/mct_d.c +++ b/src/northbridge/amd/amdmct/mct/mct_d.c @@ -1532,27 +1532,27 @@ static u8 AutoConfig_D(struct MCTStatStruc *pMCTstat, DramConfigLo |= 1 << 4; /* 75 Ohms ODT */ if (mctGet_NVbits(NV_MAX_DIMMS) == 8) { if (pDCTstat->Speed == 3) { - if ((pDCTstat->MAdimms[dct] == 4)) + if (pDCTstat->MAdimms[dct] == 4) DramConfigLo |= 1 << 5; /* 50 Ohms ODT */ } else if (pDCTstat->Speed == 4){ - if ((pDCTstat->MAdimms[dct] != 1)) + if (pDCTstat->MAdimms[dct] != 1) DramConfigLo |= 1 << 5; /* 50 Ohms ODT */ } } else { // FIXME: Skip for Ax versions - if ((pDCTstat->MAdimms[dct] == 4)) { + if (pDCTstat->MAdimms[dct] == 4) { if ( pDCTstat->DimmQRPresent != 0) { if ((pDCTstat->Speed == 3) || (pDCTstat->Speed == 4)) { DramConfigLo |= 1 << 5; /* 50 Ohms ODT */ } - } else if ((pDCTstat->MAdimms[dct] == 4)) { + } else if (pDCTstat->MAdimms[dct] == 4) { if (pDCTstat->Speed == 4) { if ( pDCTstat->DimmQRPresent != 0) { DramConfigLo |= 1 << 5; /* 50 Ohms ODT */ } } } - } else if ((pDCTstat->MAdimms[dct] == 2)) { + } else if (pDCTstat->MAdimms[dct] == 2) { DramConfigLo |= 1 << 5; /* 50 Ohms ODT */ } diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c index 7db13d2..90b7ed3 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c @@ -3380,7 +3380,7 @@ static void mct_BeforeDramInit_Prod_D(struct MCTStatStruc *pMCTstat, u32 dev = pDCTstat->dev_dct; if (pDCTstat->LogicalCPUID & AMD_DR_Dx) { - if ((pDCTstat->Speed == 3)) + if (pDCTstat->Speed == 3) dword = 0x00000800; else dword = 0x00000000; diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c index aba558f..1446f4f 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c @@ -502,7 +502,7 @@ void prepareDimms(sMCTStruct *pMCTData, sDCTStruct *pDCTData, u8 dimm, BOOL wl) } } else { /* 1 or 4 Dimms per channel */ - if ((pDCTData->MaxDimmsInstalled == 4)) + if (pDCTData->MaxDimmsInstalled == 4) { tempW1 = 0x04; /* Rtt_Nom=RZQ/4=60 Ohm */ }

1 0

Patch set updated for coreboot: e7722ca northbridge/amd/amdmct: Incorrect usage of logical over bitwise and
by Edward O'Callaghan 22 May '14

22 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5820 -gerrit commit e7722ca76c9d15f42b72e25044e1b5a6ba9ac96c Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 07:11:14 2014 +1000 northbridge/amd/amdmct: Incorrect usage of logical over bitwise and Small mix up of logical/bitwise logical and operation. Spotted by Clang. Change-Id: I2c2256b9b2f2b6ca627914118c745f579555acc9 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/northbridge/amd/amdmct/wrappers/mcti_d.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/northbridge/amd/amdmct/wrappers/mcti_d.c b/src/northbridge/amd/amdmct/wrappers/mcti_d.c index 8c45332..e127322 100644 --- a/src/northbridge/amd/amdmct/wrappers/mcti_d.c +++ b/src/northbridge/amd/amdmct/wrappers/mcti_d.c @@ -439,7 +439,7 @@ static void vErratum372(struct DCTStatStruc *pDCTstat) { msr_t msr = rdmsr(NB_CFG_MSR); - int nbPstate1supported = ! (msr.hi && (1 << (NB_GfxNbPstateDis -32))) ; + int nbPstate1supported = !(msr.hi & (1 << (NB_GfxNbPstateDis -32))); // is this the right way to check for NB pstate 1 or DDR3-1333 ? if (((pDCTstat->PresetmaxFreq==1333)||(nbPstate1supported)) @@ -456,10 +456,10 @@ static void vErratum414(struct DCTStatStruc *pDCTstat) for(; dct < 2 ; dct++) { int dRAMConfigHi = Get_NB32(pDCTstat->dev_dct,0x94 + (0x100 * dct)); - int powerDown = dRAMConfigHi && (1 << PowerDownEn ) ; - int ddr3 = dRAMConfigHi && (1 << Ddr3Mode ) ; + int powerDown = dRAMConfigHi & (1 << PowerDownEn ); + int ddr3 = dRAMConfigHi & (1 << Ddr3Mode ); int dRAMMRS = Get_NB32(pDCTstat->dev_dct,0x84 + (0x100 * dct)); - int pchgPDModeSel = dRAMMRS && (1 << PchgPDModeSel ) ; + int pchgPDModeSel = dRAMMRS & (1 << PchgPDModeSel); if (powerDown && ddr3 && pchgPDModeSel ) { Set_NB32(pDCTstat->dev_dct,0x84 + (0x100 * dct), dRAMMRS & ~(1 << PchgPDModeSel) );

1 0

New patch to review for coreboot: 6735199 northbridge/amd/amdmct: Incorrect usage of logical over bitwise and
by Edward O'Callaghan 22 May '14

22 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5820 -gerrit commit 6735199e9d6d65bd55564cf4228ceda0cff4456f Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri May 23 07:11:14 2014 +1000 northbridge/amd/amdmct: Incorrect usage of logical over bitwise and Small mix up of logical/bitwise logical and operation. Spotted by Clang. Change-Id: I2c2256b9b2f2b6ca627914118c745f579555acc9 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/northbridge/amd/amdmct/wrappers/mcti_d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/northbridge/amd/amdmct/wrappers/mcti_d.c b/src/northbridge/amd/amdmct/wrappers/mcti_d.c index 8c45332..0119ae6 100644 --- a/src/northbridge/amd/amdmct/wrappers/mcti_d.c +++ b/src/northbridge/amd/amdmct/wrappers/mcti_d.c @@ -459,7 +459,7 @@ static void vErratum414(struct DCTStatStruc *pDCTstat) int powerDown = dRAMConfigHi && (1 << PowerDownEn ) ; int ddr3 = dRAMConfigHi && (1 << Ddr3Mode ) ; int dRAMMRS = Get_NB32(pDCTstat->dev_dct,0x84 + (0x100 * dct)); - int pchgPDModeSel = dRAMMRS && (1 << PchgPDModeSel ) ; + int pchgPDModeSel = dRAMMRS & (1 << PchgPDModeSel); if (powerDown && ddr3 && pchgPDModeSel ) { Set_NB32(pDCTstat->dev_dct,0x84 + (0x100 * dct), dRAMMRS & ~(1 << PchgPDModeSel) );

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2014