We need to avoid using the scratch pad for boot recovery mechanisms as upstream SW don't have access to this and there are plans for future HW to not use it.
As an intermediate solution the current mechanism should only be run if upgrade_available is set. See the Bootcount section of README.