diff options
author | davidcunado-arm <david.cunado@arm.com> | 2016-10-31 23:12:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-31 23:12:03 +0000 |
commit | 9c4c18fa8812f080e09b0d522fe98d0235e97320 (patch) | |
tree | e9176cf0a673cb6b573e17932599c61109c28613 | |
parent | 061723f96caee40ae5ee85760119c198d6965c13 (diff) | |
parent | 589b827f4b14c386dd49e1759578f72cf92b6f02 (diff) |
Merge pull request #742 from masahir0y/misc
Comment fixes and .gitignore update
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | docs/porting-guide.md | 2 | ||||
-rw-r--r-- | plat/common/aarch64/platform_helpers.S | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -2,6 +2,7 @@ cscope.* *.swp *.patch +*~ .project .cproject diff --git a/docs/porting-guide.md b/docs/porting-guide.md index 1247baf5..aa014f15 100644 --- a/docs/porting-guide.md +++ b/docs/porting-guide.md @@ -558,7 +558,7 @@ reset vector code to perform the above tasks. Argument : void Return : uintptr_t -This function is called with the called with the MMU and caches disabled +This function is called with the MMU and caches disabled (`SCTLR_EL3.M` = 0 and `SCTLR_EL3.C` = 0). The function is responsible for distinguishing between a warm and cold reset for the current CPU using platform-specific means. If it's a warm reset, then it returns the warm diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S index a134ded0..68bda223 100644 --- a/plat/common/aarch64/platform_helpers.S +++ b/plat/common/aarch64/platform_helpers.S @@ -98,7 +98,7 @@ endfunc plat_crash_console_putc /* ----------------------------------------------------- * Placeholder function which should be redefined by - * each platform. This function should preserve x10. + * each platform. This function should preserve x19 - x29. * ----------------------------------------------------- */ func plat_reset_handler |