Upstream in progress

Please add spaces before and after "?=" i.e, 
CFG_ENABLE_PSCI_DEBUG ?= 0