summaryrefslogtreecommitdiffstats
path: root/mtdutils (follow)
Commit message (Collapse)AuthorAgeFilesLines
* mtdutils: add include to fix implicit function warningHashcode2015-10-131-0/+1
| | | | | | | Including unistd.h fixes implicit function warning for "read" and "close" in mtdutils/mounts.c Change-Id: I72c3a52de035600cdd794ed5e2d4cae0da26f428
* Revert "Use getmntent when accessing /proc/mounts."that2015-10-101-14/+75
| | | | | | | | This reverts commit a382e2bdb22b5b68d83f32c6c339465b2e8f6e46. getmntent is not implemented in older Bionic versions. Change-Id: I277dae9e4fd83f08de8099e856e8d8f45e39239d
* Merge up to AOSP marshmallow-releaseEthan Yonker2015-10-094-102/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to maintain compatibility with older trees, we now have minadbd.old and minui.old. I had to use a TARGET_GLOBAL_CFLAG to handle ifdef issues in minui/minui.d because healthd includes minui/minui.h and there was no other alternative to make minui.h compatible with older trees without having to modify healthd rules which is outside of TWRP. Note that the new minui does not currently have support for qcom overlay graphics. Support for this graphics mode will likely be added in a later patch set. If you are building in a 6.0 tree and have a device that needs qcom overlay graphics, be warned, as off mode charging may not work properly. A dead battery in this case could potentially brick your device if it is unable to charge as healthd handles charging duties. Update rules for building toolbox and add rules for making toybox Use permissive.sh in init.rc which will follow symlinks so we do not have to worry about what binary is supplying the setenforce functionality (toolbox, toybox, or busybox). Fix a few warnings in the main recovery binary source code. Fix a few includes that were missing that prevented compiling in 6.0 Change-Id: Ia67aa2107d260883da5e365475a19bea538e8b97
| * Check all lseek calls succeed.Elliott Hughes2015-04-303-38/+26
| | | | | | | | | | | | | | | | Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek. Bug: http://b/20625546 Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b (cherry picked from commit 7bad7c4646ee8fd8d6e6ed0ffd3ddbb0c1b41a2f)
| * Always use strerror to report errno in recovery.Elliott Hughes2015-03-231-4/+4
| | | | | | | | Change-Id: I7009959043150fabf5853a43ee2448c7fbea176e
| * Use getmntent when accessing /proc/mounts.Yabin Cui2015-01-021-75/+14
| | | | | | | | | | Bug: 18887435 Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
* | Clean up make flash utility make filesEthan Yonker2014-11-171-3/+2
| | | | | | | | Change-Id: Ie396be7d9636a8b481bcf7c062f94ce51a4b1fde
* | Merge in lollipop and attempt to fix merge conflictsEthan Yonker2014-11-061-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will probably not compile and may need additional work. For tracking purposes so we know what might still need looking at as none of this has been compiled and tested, here is a list of the merge conflicts that I attempted to fix before pushing this set of changes: git pull aosp lollipop-release remote: Finding sources: 100% (992/992) remote: Total 992 (delta 473), reused 992 (delta 473) Receiving objects: 100% (992/992), 1.51 MiB | 516.00 KiB/s, done. Resolving deltas: 100% (473/473), completed with 42 local objects. From https://android.googlesource.com/platform/bootable/recovery * branch lollipop-release -> FETCH_HEAD * [new branch] lollipop-release -> aosp/lollipop-release Auto-merging verifier_test.cpp CONFLICT (content): Merge conflict in verifier_test.cpp Auto-merging verifier.h CONFLICT (content): Merge conflict in verifier.h Auto-merging verifier.cpp CONFLICT (content): Merge conflict in verifier.cpp Auto-merging updater/updater.c Auto-merging updater/install.c CONFLICT (content): Merge conflict in updater/install.c Auto-merging updater/Android.mk CONFLICT (content): Merge conflict in updater/Android.mk Auto-merging uncrypt/Android.mk CONFLICT (content): Merge conflict in uncrypt/Android.mk Auto-merging ui.cpp CONFLICT (content): Merge conflict in ui.cpp Auto-merging screen_ui.cpp Auto-merging roots.cpp CONFLICT (content): Merge conflict in roots.cpp CONFLICT (rename/delete): res-hdpi/images/progress_fill.png deleted in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42. Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of res-hdpi/images/progress_fill.png left in tree. CONFLICT (rename/delete): res-hdpi/images/progress_empty.png deleted in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42. Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of res-hdpi/images/progress_empty.png left in tree. CONFLICT (rename/delete): res-hdpi/images/icon_error.png deleted in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42. Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of res-hdpi/images/icon_error.png left in tree. Auto-merging recovery.cpp CONFLICT (content): Merge conflict in recovery.cpp Auto-merging minui/resources.c CONFLICT (content): Merge conflict in minui/resources.c Auto-merging minui/minui.h CONFLICT (content): Merge conflict in minui/minui.h Auto-merging minui/graphics.c CONFLICT (content): Merge conflict in minui/graphics.c Auto-merging minui/Android.mk CONFLICT (content): Merge conflict in minui/Android.mk Removing minelf/Retouch.h Removing minelf/Retouch.c Auto-merging minadbd/usb_linux_client.c CONFLICT (content): Merge conflict in minadbd/usb_linux_client.c Auto-merging minadbd/adb.h CONFLICT (content): Merge conflict in minadbd/adb.h Auto-merging minadbd/adb.c CONFLICT (content): Merge conflict in minadbd/adb.c Auto-merging minadbd/Android.mk CONFLICT (content): Merge conflict in minadbd/Android.mk Removing make-overlay.py Auto-merging install.h CONFLICT (content): Merge conflict in install.h Auto-merging etc/init.rc CONFLICT (content): Merge conflict in etc/init.rc Auto-merging bootloader.h Auto-merging applypatch/applypatch.c Auto-merging applypatch/Android.mk CONFLICT (content): Merge conflict in applypatch/Android.mk Auto-merging adb_install.cpp CONFLICT (content): Merge conflict in adb_install.cpp Auto-merging Android.mk CONFLICT (content): Merge conflict in Android.mk Automatic merge failed; fix conflicts and then commit the result. Change-Id: I3e0e03e48ad8550912111c7a5c9a140ed0267e2c
| * remove pixelflinger from recoveryDoug Zongker2014-03-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery now draws directly to the framebuffer by rolling its own graphics code, rather than depending on libpixelflinger. The recovery UI is modified slightly to eliminate operations that are slow with the software implementation: when the text display / menu is turned on, it now appears on a black background instead of a dimmed version of the recovery icon. There's probably substantial room for optimization of the graphics operations. Bug: 12131110 Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595
* | Build block TWRP with RECOVERY_VARIANTMatt Mower2014-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Enable TWRP to reside alongside other recoveries with the naming convention: bootable/recovery(-flag). If TWRP resides at bootable/recovery and a device does not specify RECOVERY_VARIANT, then it will build like normal. If TWRP resides at bootable/recovery-twrp, then its makefiles will only be parsed if a device specifies 'RECOVERY_VARIANT := twrp'. This prevents TWRP specific makefile warnings/errors (notably, missing DEVICE_RESOLUTION) when another recovery is being built. Change-Id: I8f02fffcd79c309c7123b9428eedc69af02e126e
* | mtdutils: fix rk3xhack filterHumberto Borba2014-07-051-2/+2
| | | | | | | | | | | | | | Just fix filter for correct platform Signed-off-by: Humberto Borba <humberos@gmail.com> Change-Id: I1f0978a6b215a1967dad4a2c495777d917865b88
* | Changes in rk30hackKra1o52014-06-305-20/+20
| | | | | | | | | | This works on rk3188 based devices too so rename it to rk3xhack. Change-Id: Ia3d9d52d99205057f8bece735a938986491b7522
* | Enable rk30xx hackJ. Carlos Romero2014-04-151-0/+2
| | | | | | | | | | | | Fix problem with erase/restore mtd partitions on Rockchip SoC Change-Id: I3320f711446441cf79e38e9ffb5dfdb6b1717a55
* | Fix merge conflicts and update for 4.4 kitkatDees Troy2013-11-021-13/+14
|\| | | | | | | | | | | | | | | Make a copy of libmincrypt in TWRP source so we do not have to ifdef verifier.cpp for various versions of mincrypt. Remove reboot tool from toolbox (it was removed from 4.4 and did not compile properly on some devices in older trees)
| * recovery: move log output to stdoutDoug Zongker2013-07-091-13/+13
| | | | | | | | | | | | | | | | Recovery currently has a random mix of messages printed to stdout and messages printed to stderr, which can make logs hard to read. Move everything to stdout. Change-Id: Ie33bd4a9e1272e731302569cdec918e0534c48a6
* | Update to latest AOSP masterDees_Troy2013-09-041-2/+2
|\| | | | | | | Merge in latest commits from AOSP master and fix merge conflicts
| * Add liblogYing Wang2013-04-101-1/+1
| | | | | | | | | | Bug: 8580410 Change-Id: Ie60dade81c06589cb0daee431611ded34adef8e6
* | Move all AOSP code out of recovery binaryDees_Troy2013-04-041-0/+15
| | | | | | | | | | | | Improves license compatibility between GPL and Apache Change-Id: I2b165aa575bb6213af6b07936f99610c113443f0
* | mtdutils: add bml_over_mtd target for aries/p1 buildsjt11342013-02-221-0/+23
| | | | | | | | Change-Id: Ie4bf51e09e632403c1bc87be64a0f9dd66b83f31
* | Work around MEMERASE ioctl for rk3066 compatibilitySergey 'Jin' Bostandzhyan2013-01-055-0/+136
| | | | | | | | | | | | | | | | | | | | | | Due to a kernel bug and no available sources we have to work around the MEMERASE ioctl - if used, it hangs and never returns. I straced the original recovery executable and could see that it is simply calling write() with a bunch of zeroes instead of using MEMERASE. Added a hack that does the same and now the resulting TWRP recovery image works. Change-Id: I1b1c1c9e870e350776346bdca5d442c7ef565aa0
* | Fix compiling for x86 targetsHiemanshu Sharma2012-11-211-2/+0
| |
* | TWRP-ify AOSP codeDees_Troy2012-09-055-36/+1024
|/ | | | | | | Pull in most TWRP sources Stub out partition management code Make it compile -- probably will not boot Kind of a mess but have to start somewhere
* Fixed warnings in libmtdutilsEdwin Vane2012-08-211-4/+4
| | | | | | | | | A few signed/unsigned comparison warnings were all that stood in the way of a clean clang build. Change-Id: Id8c47fcfa500a6ac164bddb855831cdc17d99847 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I9ef9f808a852c36903c8afc40136c89c9ec07630
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
| | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: If6c6ea354caf02fb3bf155931b23e4a6d2f751e9
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-2/+2
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I3b4ea2184555bc0b570ec858601d4c43ecffb6f8
* turn recovery into a C++ binaryDoug Zongker2011-10-312-0/+16
| | | | Change-Id: I423a23581048d451d53eef46e5f5eac485b77555
* Remove the simulator target from all makefiles.Jeff Brown2011-07-121-4/+0
| | | | | | Bug: 5010576 Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
* Fix x86 build.Ying Wang2011-02-091-2/+0
| | | | Change-Id: Iada6268b0a72ee832113ea397334cc7950a37051
* Free allocated struct after freeing fieldChristian Lindeberg2011-01-191-1/+1
| | | | | | | Free allocated MtdReadContext after freeing buffer field in struct, not before. Change-Id: I237920dc36115389cd2d6948e7a962dbec22fe56
* fix comparison of ECC stats before and after mtd readsDoug Zongker2010-11-031-0/+2
| | | | | | | | | | | | ECC errors are found by comparing the result of ioctl(ECCGETSTATS) before and after the read. But if an error was found causing us to go to the next block, we'd compare the stats before the *first* read to the stats after the second (third, fourth, etc.) reads, so we'd read to the end of the partition without ever succeeding. Fix logic so we compare the values before and after each read independently. Bug: 3162777 Change-Id: I5a13abd7243d2afd1d21bd98cbb233e5124b2e80
* close update package before installing; allow remountDoug Zongker2010-09-153-1/+11
| | | | | | | | Close the update package before invoking the binary, to allow the installer to unmount /cache if it wants to. Add a function to allow remounting of a mount as read-only. Change-Id: Idfcc96c3da66083295177f729263560be58034e4
* add the ability to seek to a raw location while reading MTD partitionDoug Zongker2010-09-152-0/+8
| | | | Change-Id: Id1563ca667c50e61cf1bb15d2cf783a50937eece
* stop treating all-zero blocks as badDoug Zongker2010-09-121-8/+1
| | | | Change-Id: If49fa6485f66598d16a7e44fce3129de55fab422
* block is bad if ioctl() returns nonzeroDoug Zongker2010-09-101-2/+5
| | | | Change-Id: I6fc4ce796bc663d05035927c0af0ce7ab6d07218
* make offsets in firmware update header not point to bad blocksDoug Zongker2010-01-132-4/+43
| | | | | | | | | | | | | hboot will apparently fail to install if the first block of the image (the one pointed to by the offset in the block 0 header) is a bad block. (Hopefully it handles subsequent bad blocks.) This change makes the MTD write code keep track of the bad blocks it has skipped over, so that the offset in the header can be adjusted to be the address of the first successfully written block. Change-Id: I45d58e32a36d0c1dbc0a7f871bd5985b6c8ff524 http://b/2358012 - passion: failure to flash hboot (bad blocks?)
* use MEMGETBADBLOCK to look for bad blocks when reading MTD partitionsDoug Zongker2009-12-151-5/+12
|
* only build flash_image for engDoug Zongker2009-07-241-0/+1
| | | | | | With the recovery image being installed by applypatch, the flash_image tool isn't needed any more. Continue to build it for eng just in case it's handy for debugging.
* skip over all-zero blocks when reading MTD partitionDoug Zongker2009-07-011-1/+12
| | | | | | | | | | | We fail to detect certain bad blocks (marked in the factory as bad, I think?) when reading mtd partitions. These come back as a block of all zeros. Since it's fairly unlikely a legitimate boot or recovery block will contain 128k of zeros, change mtdutils to skip over such blocks. Arve says https://review.source.android.com/10535 may be a long-term fix for this, but he isn't yet sure.
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-046-0/+972
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-046-972/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-181-0/+2
|
* Initial ContributionThe Android Open Source Project2008-10-216-0/+970