The original patch makes the condition always true, so it is wrong.

It masks (but not fixes) the bug described in the commit message
but introduces a regression (no console is selected by SPCR)
in regular (no 'console=ttyAMA') case.

s/||/&&/ would not fix the problem as the root cause was identified
incorrectly.

This reverts commit aea9a80b.
Signed-off-by: NAleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: NSudeep Holla <sudeep.holla@arm.com>
Tested-by: NJayachandran C <jnair@caviumnetworks.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>