aboutsummaryrefslogtreecommitdiff
path: root/resources/libreboot/patch
Commit message (Collapse)AuthorAgeFilesLines
* Coreboot, vboot and depthcharge updates to Coreboot 4.3 for CrOS devicesPaul Kocialkowski2016-04-1911-101/+230
| | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* asus/kgpe-d116|kcma-d8: Update coreboot to latest versionTimothy Pearson2016-04-115-0/+0
|
* asus/kgpe-d116|kcma-d8: Update coreboot to latest version to fix RAM and SB ↵Timothy Pearson2016-04-115-0/+0
| | | | issues
* mainboard/asus/kgpe-d16|kcma-d8: Include additional coreboot MCT fixes for ↵Timothy Pearson2016-04-045-0/+0
| | | | | | Kingston RDIMMs Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
* mainboard/kcma-d8|kgpe-d16: Reenable GRUB buildsTimothy Pearson2016-04-042-0/+178
|
* mainboard/asus/kgpe-d16|kcma-d8: Include coreboot MCT fixes for Kingston RDIMMsTimothy Pearson2016-03-283-0/+267
| | | | Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
* Add SeaBIOS payload to librebootFrancis Rowe2016-03-143-0/+0
|
* Update KGPE-D16, KCMA-D8 and KFSN4-DRE to current latest coreboot versionFrancis Rowe2016-03-143-0/+0
|
* Remove ThinkPad R500 support (wasn't ready for production use yet anyway)Francis Rowe2016-03-118-2268/+0
| | | | | | R500 support in its current state should not be merged in the master branch. This will likely not make it into the immediate upcoming release. This patch will be reverted in a separate experimental branch, for the time being.
* i945 and gm45 laptops: use cb 2a3434757ef425dbdfedf1fc69e1a033a6e7310dFrancis Rowe2016-03-1132-461/+14
| | | | | This should fix the RTC century byte issue (fix merged upstream). Some patches were removed, in those cases where they became merged upstream.
* jgpe-d16, kcma-d8, kfsn4-dre: remove unneeded patchesFrancis Rowe2016-03-099-222/+0
|
* Revert "kgpe-d6,kcma-d8,kfsn4-dre: use cb ↵Francis Rowe2016-03-099-0/+222
| | | | | | 67e11d1e4f5fa4ba7e864bb0487bf5a835fb2919" This reverts commit 735b6a3e7250a52c5fa04cdd400cb7f44f37b89e.
* Revert "rename wrongly named patch directory (fix build issue)"Francis Rowe2016-03-093-0/+0
| | | | This reverts commit 41dd699e78587f3e83e354f6897057305300699b.
* rename wrongly named patch directory (fix build issue)Francis Rowe2016-03-093-0/+0
|
* kgpe-d6,kcma-d8,kfsn4-dre: use cb 67e11d1e4f5fa4ba7e864bb0487bf5a835fb2919Francis Rowe2016-03-099-222/+0
| | | | This revision is reported to work correctly.
* Update coreboot (kgpe-d16,kcma-d8,kfsn4-dre,d510mo,ga-g41m-es2l)Francis Rowe2016-03-08202-74128/+489
| | | | | | Update to the latest coreboot and vboot versions at the time of writing: coreboot 2a3434757ef425dbdfedf1fc69e1a033a6e7310d vboot d187cd3fc792f8bcefbee4587c83eafbd08441fc
* fix build issue on kcma-d8Francis Rowe2016-01-311-0/+41
|
* New board: Intel D510MOFrancis Rowe2016-01-301-0/+33
|
* New board: ASUS KCMA-D8 desktop/workstation motherboardFrancis Rowe2016-01-3045-0/+10453
|
* Revert "reset x60/t60/macbook21 to older coreboot revisions"Francis Rowe2016-01-2925-500/+66
| | | | This reverts commit 3b56767917dccd59c4af7c289450a053982e984a.
* reset x60/t60/macbook21 to older coreboot revisionsFrancis Rowe2016-01-2825-66/+500
| | | | This is a temporary fix for an upcoming release.
* Use different coreboot revisions and patches per boardFrancis Rowe2016-01-04185-0/+208
| | | | | | | | | | | | | | | | | | The release archives will be bigger, but this is a necessary change that makes libreboot development easier. At present, there are boards maintained in libreboot by different people. By doing it this way, that becomes much easier. This is in contrast to the present situation, where a change to one board potentially affects all other boards, especially when updating to a new version of coreboot. Coreboot-libre scripts, download scripts, build scripts - everything. The entire build system has been modified to reflect this change of development. For reasons of consistency, cbfstool and nvramtool are no longer included in the util archives.
* Replace Chromebook mentions with CrOS, that is more genericPaul Kocialkowski2015-11-061-0/+0
| | | | | | | | | | Not all CrOS devices are Chromebooks (laptops) or run on ARM, not all RK3288 CrOS devices are Chromebooks, either. We want to support more CrOS devices, including some that are not Chromebooks, such as the ASUS Chromebit! Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* veyron_speedy config update, depthcharge menus improvementPaul Kocialkowski2015-11-063-162/+19
|
* Update coreboot to new version (use latest stable kgpe-d16 tree)Francis Rowe2015-11-06147-2495/+2285
|
* KGPE-D16: update patch set (also update coreboot and vboot)Francis Rowe2015-10-19166-4321/+13550
| | | | | | | | | | | Also contains other fixes from coreboot, like: * 551cff0 Derive lvds_dual_channel from EDID timings. ^ makes single/dual channel LVDS selection on GM45 automatic * 26fc544 lenovo/t60: Enable native intel gfx init. ^ was being maintained in libreboot, now upstreamed so not needed Framebuffer mode was disabled for the KGPE-D16, because only text-mode works at the moment.
* New board: ASUS KGPE-D16Francis Rowe2015-10-17141-0/+54242
| | | | | | | | | | | | | | | | | | | | coreboot build errors: In file included from src/northbridge/amd/amdfam10/misc_control.c:35:0: src/include/option.h:13:27: error: static declaration of 'get_option' follows non-static declaration static inline enum cb_err get_option(void *dest, const char *name) ^ In file included from src/northbridge/amd/amdfam10/misc_control.c:34:0: src/include/pc80/mc146818rtc.h:176:13: note: previous declaration of 'get_option' was here enum cb_err get_option(void *dest, const char *name); Ping tpearson about this. Also ping him about the fact that there isn't actually an option to enable or disable native graphics initialization, but that the option MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is in fact available and set to Y in the Kconfig file. I think this is probably since there isn't even an option ROM available for the machine, so it's pointless to offer the setting.
* Chromebook C201 (codename veyron_speedy) supportPaul Kocialkowski2015-10-119-0/+562
| | | | | | | | | | | | | | | | | This introduces Libreboot support for the Asus Chromebook C201 (codename veyron_speedy). At this point, this produces a standalone Libreboot image that can be flashed to the RO Coreboot partition of the SPI flash, as well as the Libreboot version that can be flash to the RO Firmware ID partition. Libreboot on the Chromebook C201 uses the depthcharge bootloader, modified to display text messages instead of ChromeOS bitmaps (that encourage the use of ChromeOS). For convenience, an installation script, chromebook-flash-replace, is provided along with a description of the flash layout, to ease the replacement of the Coreboot and RO Firmware ID partitions on the full SPI flash image. Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* Add patches for R500 (will finish later, and upstream them)Francis Rowe2015-10-118-0/+2268
|
* Update coreboot to the latest as of 4 August 2015Francis Rowe2015-08-0416-134/+40
|
* kfsn4-dre: Add CONFIG_VGA=y to the configFrancis Rowe2015-06-261-0/+29
| | | | Video initialization won't work without it.
* Update coreboot again (a patch was merged upstream)Francis Rowe2015-06-161-41/+0
| | | | | | | | | | The patch for only requiring cmake for clang users was merged. This patch is important, because libreboot doesn't want to use clang, and doesn't want any dependences that it relies on which it doesn't need. Also, this and the other recent update re-add support for ACPI brightness methods on the Thinkpad X60 and T60.
* Update coreboot-libreFrancis Rowe2015-06-1625-2779/+245
| | | | | | | | | | | | Rebase all patches. Remove the ones that are no longer needed. More CPU microcode updates were moved to coreboot's 3rdparty repository, so there are less blobs for libreboot to delete now (because the 3rdparty repository is not checked out in libreboot). Correct HDA verbs used for T400 (also R400, T500) (patch is in coreboot, merged).
* coreboot-libre: backport patches for X200 Tablet digitizer supportFrancis Rowe2015-05-171-0/+117
|
* scripts/download/coreboot: use diffs, not gerritFrancis Rowe2015-05-1122-0/+3406
| | | | | | | Solves the problem where coreboot.org down down makes libreboot.git useless. Now if coreboot.org goes down, you can just use a backup coreboot repository and then run the script.
* Update corebootFrancis Rowe2015-03-161-105/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to new coreboot revision: 83b05eb0a85d7b7ac0837cece67afabbdb46ea65 Intel microcode updates are no longer deleted, because these no longer exist in the main coreboot branch. Instead, they exist in the optional 3rdparty repository which libreboot does not merge. note: the microcode in src/soc/intel/ still exists and is still deleted in libreboot, therefore TODO: delete the instructions in coreboot that download the 3rdparty branch MacBook2,1 cstate patch is no longer cherry picked, because this is now merged in the main coreboot repository. The patch to disable use of timestamps in non-git is now removed, because a better version of patch was submitted to and merged in coreboot. coreboot-libre: These blobs either don't exist in coreboot anymore, or have had their names changed. They are no longer listed in the deblob script: src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c src/cpu/amd/model_10xxx/mc_patch_01000086.h src/cpu/amd/model_10xxx/mc_patch_0100009f.h src/cpu/amd/model_10xxx/mc_patch_010000b6.h src/cpu/amd/model_10xxx/mc_patch_010000bf.h src/cpu/amd/model_10xxx/mc_patch_010000c4.h src/northbridge/amd/agesa/family12/ssdt.asl coreboot-libre: These nonblobs either don't exist in coreboot anymore, or have had their names changed. They are no longer listed in the nonblobs or nonblobs_notes files: ./src/mainboard/digitallogic/msm586seg/mainboard.c ./src/mainboard/intel/jarrell/irq_tables.c ./src/mainboard/supermicro/x6dai_g/irq_tables.c ./src/mainboard/technologic/ts5300/mainboard.c ./src/mainboard/via/epia/irq_tables.c ./src/northbridge/via/vx800/examples/chipset_init.c ./src/southbridge/amd/cs5530/bitmap.c ./src/southbridge/amd/pi/avalon/Kconfig ./src/mainboard/google/samus/samsung_8Gb.spd.hex ./src/mainboard/google/samus/empty.spd.hex ./src/mainboard/google/samus/elpida_4Gb.spd.hex ./src/mainboard/google/samus/elpida_8Gb.spd.hex ./src/mainboard/google/samus/samsung_4Gb.spd.hex coreboot-libre: The following were added to the nonblobs file: ./src/mainboard/google/samus/spd/samsung_4Gb.spd.hex ./src/mainboard/google/samus/spd/empty.spd.hex ./src/mainboard/google/samus/spd/elpida_8Gb.spd.hex ./src/mainboard/google/samus/spd/hynix_4Gb.spd.hex ./src/mainboard/google/samus/spd/samsung_8Gb.spd.hex ./src/mainboard/google/samus/spd/hynix_8Gb.spd.hex ./src/mainboard/google/samus/spd/elpida_4Gb.spd.hex ./src/drivers/xgi/common/vb_table.h ./src/drivers/xgi/common/vb_setmode.c ./src/drivers/xgi/common/XGI_main.h ./src/mainboard/siemens/mc_tcu3/romstage.c ./src/mainboard/siemens/mc_tcu3/lcd_panel.c ./src/mainboard/siemens/mc_tcu3/modhwinfo.c ./src/mainboard/pcengines/apu1/Kconfig ./src/mainboard/asus/kfsn4-dre/get_bus_conf.c ./src/mainboard/google/samus/spd/spd.c ./src/mainboard/hp/abm/mptable.c ./src/northbridge/amd/pi/00630F01/Kconfig ./src/cpu/amd/microcode/microcode.c ./src/lib/tlcl_structures.h coreboot-libre: New blobs in coreboot are now deleted in libreboot: src/soc/intel/baytrail/microcode/M0C3067_0000031E.h src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c src/cpu/amd/model_10xxx/mc_patch_010000d9.h src/cpu/amd/model_10xxx/mc_patch_010000dc.h src/cpu/amd/model_10xxx/mc_patch_010000db.h src/cpu/amd/model_10xxx/mc_patch_010000c7.h src/cpu/amd/model_10xxx/mc_patch_010000c8.h
* New board: ThinkPad R400 support added to libreboot.Francis Rowe2015-02-091-0/+105
|
* Update corebootFrancis Rowe2014-11-232-18/+0
| | | | | | | | | | | | | | Some notes: DEBLOB script updated (more blobs added). i945: reverted to legacy brightness. i945: permanently set tft_brightness to 0xff (works around a bug on X60 where brightness loops to zero when at max brightness and trying to increase the brightness level) EHCI debug dongle (BeagleBone Black) now enabled on all boards.
* T60: fix compilationFrancis Rowe2014-10-121-0/+12
|
* getcb: Remove patch instructions for ACPI brightness on i945.Francis Rowe2014-10-111-12/+0
| | | | | The patch (6731 on review.coreboot.org) was bogus (needs re-writing). The next commit will put libreboot back on legacy brightness controls instead.
* T60 text-mode native graphics: enable using coreboot gerrit patch instead of ↵Francis Rowe2014-10-111-12/+0
| | | | a diff file.
* Remove useless file.Francis Rowe2014-10-111-46/+0
|
* i945 ACPI uneven backlight fix: use coreboot gerrit instead of a diff file.Francis Rowe2014-10-111-22/+0
|
* Libreboot release 6 beta 6.Francis Rowe2014-09-038-570/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added modified builddeb* scripts for Parabola GNU/Linux-libre: buildpac, buildpac-flashrom, buildpac-bucts (courtesy of Noah Vesely) - Documentation: updated all relevant areas to mention use of buildpac* scripts for Parabola users. - Documentation: added information showing how to enable or disable bluetooth on the X60 - MacBook1,1 tested! See ../docs/index.html#macbook11" - Documentation: fixed typo in ../docs/index.html#get_edid_panelname (get-edit changed to get-edid) - Documentation: added ../docs/howtos/x60_lcd_change/ (pics only for now) - Added gcry_serpent and gcry_whirlpool to the GRUB module list in the 'build' script (for luks users) - Libreboot is now based on a new coreboot version from August 23rd, 2014: Merged commits (relates to boards that were already supported in libreboot): - http://review.coreboot.org/#/c/6697/ - http://review.coreboot.org/#/c/6698/ (merged already) - http://review.coreboot.org/#/c/6699/ (merged already) - http://review.coreboot.org/#/c/6696/ (merged already) - http://review.coreboot.org/#/c/6695/ (merged already) - http://review.coreboot.org/#/c/5927/ (merged already) - http://review.coreboot.org/#/c/6717/ (merged already) - http://review.coreboot.org/#/c/6718/ (merged already) - http://review.coreboot.org/#/c/6723/ (merged already) (text-mode patch, might enable memtest. macbook21) - http://review.coreboot.org/#/c/6732/ (MERGED) (remove useless ps/2 keyboard delay from macbook21. already merged) - These were also merged in coreboot (relates to boards that libreboot already supported): - http://review.coreboot.org/#/c/5320/ (merged) - http://review.coreboot.org/#/c/5321/ (merged) - http://review.coreboot.org/#/c/5323/ (merged) - http://review.coreboot.org/#/c/6693/ (merged) - http://review.coreboot.org/#/c/6694/ (merged) - http://review.coreboot.org/#/c/5324/ (merged) - Documentation: removed the section about tft_brightness on X60 (new code makes it obsolete) - Removed all patches from resources/libreboot/patch/ and added new patch: 0000_t60_textmode.git.diff - Updated getcb script and DEBLOB script. - Updated configuration files under resources/libreboot/config/ to accomodate new coreboot version. - Removed grub_serial*.cfg and libreboot_serial*.rom, all configs/rom's are now unified (containing same configuration as serial rom's from before). - Documentation: updated ../docs/index.html#rom to reflect the above. - Updated GRUB to new version from August 14th, 2014. - Unified all grub configurations for all machines to a single grub.cfg under resources/grub/config/ - Updated flashrom to new version from August 20th, 2014 - Added getseabios and builddeps-seabios (builddeps and getall were also updated) - Added instructions to 'buildrom-withgrub' to include bios.bin.elf and vgaroms/vgabios.bin from SeaBIOS inside the ROM. - Added seabios (and sgavgabios) to grub as payload option in menu - Disabled serial output in Memtest86+ (no longer needed) to speed up tests. - MemTest86+ now works properly, it can output on the laptop screen (no serial port needed anymore). - Added getgrubinvaders, builddeps-grubinvaders scripts. Added these to getall and builddeps. - Added GRUB Invaders menu entry in resources/grub/config/grub.cfg - Added rules to builddeps-coreboot to build libpayload with TinyCurses. (added appropriate instructions to cleandeps script). - Commented out lines in resources/grub/config/grub.cfg for loading font/background (not useful anymore, now that GRUB is in text-mode). - Commented out lines in buildrom-withgrub that included backgrounds/fonts (not useful anymore, now that GRUB is in text-mode). - Added resources/utilities/i945-pwm/ (from git://git.mtjm.eu/i945-pwm), for debugging acpi brightness on i945 machines. - Added instructions for it in builddeps, builddeps-i945pwm, builddeb and cleandeps - 'build' script: removed the parts that generated sha512sum manifests (not needed, since release tarballs are GPG-signed) - 'build' script: removed the parts that generated libreboot_meta directory (not needed anymore, since _meta will be hosted in git) - Updated ../docs/index.html#build_meta (and other parts of documentation) to accomodate this change. - Documentation: simplified (refactored) the notes in ../docs/index.html#rom - 'build' script: removed the parts that generated libreboot_bin and added them to a new script: 'build-release' - Documentation: ../docs/index.html#build updated to reflect the above. - Removed 'sudo' from builddeb, builddeb-flashrom, powertop.trisquel6 and builddeb-bucts scripts (assuming that the user has it is a really bad idea). - Added all gcry_* modules to grub (luks/cryptomount): gcry_arcfour gcry_camellia gcry_crc gcry_dsa gcry_md4 gcry_rfc2268 gcry_rmd160 gcry_seed gcry_sha1 gcry_sha512 gcry_twofish gcry_blowfish gcry_cast5 gcry_des gcry_idea gcry_md5 gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_tiger gcry_whirlpool - Added GNUtoo's list of GRUB modules (includes all of the gcry_* modules above), cryptomount should be working now. - Removed builddeb-bucts and builddeb-flashrom, merged them with builddeb (../docs/index.html updated accordingly) - Removed buildpac-bucts and buildpac-flashrom, merged them with buildpac (../docs/index.html updated accordingly) - Renamed builddeb to deps-trisquel (../docs/index.html updated accordingly) - Renamed buildpac to deps-parabola (../docs/index.html updated accordingly) - Documentation: removed all parts talking about build dependencies, replaced them with links to ../docs/index.html#build_dependencies - Documentation: emphasized more strongly on the documentation, the need to re-build bucts and/or flashrom before flashing a ROM image. - build-release: flashrom, nvramtool, cbfstool and bucts are no longer provided pre-compiled in binary archives, and are now in source form only. (to maximize distro compatibility). - Documentation: added ../docs/howtos/encrypted_trisquel.html showing how to setup a fully encrypted Trisquel installation (including /boot) and boot it from the GRUB payload. - 'build' script: replaced grub.elf assembly instructons, it's now handled by a utility added under resources/utilities/grub-assemble - Moved resources/grub/keymap to resources/utilities/grub-assemble/keymap, and updated that utility to use it - Documentation: removed useless links to pictures of keyboard layouts and unmodified layouts. - Removed all unused fonts from dejavu-fonts-ttf-2.34/ directory - 'buildrom-withgrub' script: updated it to create 2 sets of ROM's for each machine: one with text-mode, one with coreboot framebuffer. - Documentation: updated ../docs/index.html#rom to reflect the above - Deleted unused README and COPYING file from main directory - Removed some rm -rf .git* instructions from the get* scripts and moved them to build-release script - Split up default grub.cfg into 6 parts: extra/{common.cfg,txtmode.cfg,vesafb.cfg} and menuentries/{common.cfg,txtmode.cfg,vesafb.cfg} - buildrom-withgrub script uses these to generate the correct grub.cfg for each type of configuration. - grub_memdisk.cfg (used inside grub.elf) now only loads grub.cfg from cbfs. It no longer enables serial output or sets prefix. (menuentries/common.cfg does instead) - resources/grub/config/extra/common.cfg, added: - insmod instructions to load those modules: nativedisk, ehci, ohci, uhci, usb, usbserial_pl2303, usbserial_ftdi, usbserial_usbdebug - set prefix=(memdisk)/boot/grub - For native graphics (recommended by coreboot wiki): - gfxpayload=keep - terminal_output --append gfxterm - Play a beep on startup: - play 480 440 1 - Documentation: added note about 'fb=false' workaround for text-mode debian-installer (Trisquel net install) to ../docs/howtos/grub_boot_installer.html - Documentation: updated ../docs/howtos/grub_cbfs.html to make it safer (and easier) to follow.
* Libreboot release 6 beta 5.Francis Rowe2014-08-224-55/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - build: added 'luks', 'lvm', 'cmosdump' and 'cmostest' to the list of modules for grub.elf - Documentation: added pics showing T60 unbricking (still need to write a tutorial) - build: include cmos.layout (coreboot/src/mainboard/manufacturer/model/cmos.layout) files in libreboot_bin - Documentation: added ../docs/howtos/x60tablet_unbrick.html - Documentation: added ../docs/howtos/t60_unbrick.html - Documentation: added ../docs/howtos/t60_lcd_15.html - Documentation: added ../docs/howtos/t60_security.html - Documentation: added ../docs/howtos/t60_heatsink.html - Documentation: Renamed RELEASE.html to release.html - Documentation: removed pcmcia reference in x60_security.html (it's cardbus) - Documentation: added preliminary information about randomized seal (for physical intrusion detection) in x60_security.html and t60_security.html - Documentation: added preliminary information about preventing/mitigating cold-boot attack in x60_security.html and t60_security.html - Documentation: added info to ../docs/index.html#macbook21 warning about issues with macbook21 - Documentation: X60/T60: added information about checking custom ROM's using dd to see whether or not the top 64K region is duplicated below top or not. Advise caution about this in the tutorial that deals with flashing on top of Lenovo BIOS, citing the correct dd commands necessary if it is confirmed that the ROM has not been applied with dd yet. (in the case that the user compiled their own ROM's from libreboot, without using the build scripts, or if they forgot to use dd, etc). - Split resources/libreboot/patch/gitdiff into separate patch files (getcb script updated to accomodate this change). - Re-added .git files to bucts - Fixed the oversight where macbook21_firstflash wasn't included in binary archives
* Libreboot release 6 beta 1.Francis Rowe2014-08-222-0/+586