arm-bsp: FVP include cleanup

No real benefit to having the FVP inc file in a layer above the conf
files.  Move the file down one level and rename to make it more
consistent with the layout.

Change-Id: If32c0462352fbe2f3496957b1b2a169cfd7e7f66
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-bsp/conf/machine/foundation-armv8.conf

@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Foundation Platform machine
 #@DESCRIPTION: Machine configuration for Armv8-A Foundation Platform model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb"
 

meta-arm-bsp/conf/machine/fvp-base.conf

@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"