staging/gma500: fixup staging code to build following core changes.