Remove greedy match case and update with KronosConfig class Signed-off-by: Divin Raj <divin.raj@arm.com>