mach-ux500/Makefile: Move riogrande/nypon stuff
board-rio-grande.c: Use i2c-nomadic.h instead of i2c.h

Fixes this error-
fatal error: plat/i2c.h not found