From d1327de6cac9ffd6e0fc8c046f1dd04a4671eb05 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 21 Feb 2018 12:42:16 -0800 Subject: [PATCH 1/2] misc: Document arm_control and that it shouldn't be used Include this for completeness and provide a note on avoiding it. --- configuration/config-txt/misc.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configuration/config-txt/misc.md b/configuration/config-txt/misc.md index 933d4fb33..f3a63ac3b 100644 --- a/configuration/config-txt/misc.md +++ b/configuration/config-txt/misc.md @@ -11,6 +11,10 @@ The [warning symbols](../warning-icons.md) can be disabled using this option, al Sets the Videocore logging level. The value is a Videocore-specific bitmask. +## arm_control + +Sets board-specific control bits. **NOTE:** Instead of this option, use the `arm_64bit` option to set the 64-bit boot control bit (`0x200` here). + ## arm_64bit If set, this forces the kernel loading system to assume a 64-bit kernel. From 882658e26e18cd987cddcb62a5ca0a3e1570ffa1 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 28 Feb 2018 12:38:48 +0000 Subject: [PATCH 2/2] Update misc.md --- configuration/config-txt/misc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/config-txt/misc.md b/configuration/config-txt/misc.md index f3a63ac3b..94c5bbaab 100644 --- a/configuration/config-txt/misc.md +++ b/configuration/config-txt/misc.md @@ -13,7 +13,7 @@ Sets the Videocore logging level. The value is a Videocore-specific bitmask. ## arm_control -Sets board-specific control bits. **NOTE:** Instead of this option, use the `arm_64bit` option to set the 64-bit boot control bit (`0x200` here). +Sets board-specific control bits. **NOTE:** This option is deprecated in favour of using the `arm_64bit` command to set the 64-bit boot control bit (arm_control=`0x200`). ## arm_64bit