vexpress: Rename everything to remove trailing '_a9'

We also support A5 and A15 so 'a9' is misleading.

Change-Id: I6dc9a0cd90dc3b7e09fe3b54e2ebb503e0a41a30
Signed-off-by: Jon Medhurst <tixy@linaro.org>

8 files changed, 22 insertions, 22 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 2466468..8a18453 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1,2 @@
 PRODUCT_MAKEFILES := \
-	$(LOCAL_DIR)/vexpress_a9.mk
+	$(LOCAL_DIR)/vexpress.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f6aab54..edbd93e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -3,7 +3,7 @@
 # Product-specific compile-time definitions.
 #
 
-TARGET_BOARD_PLATFORM := vexpress_a9
+TARGET_BOARD_PLATFORM := vexpress
 TARGET_NO_BOOTLOADER := true # Uses u-boot instead 
 TARGET_NO_KERNEL := false
 KERNEL_CONFIG := android_vexpress_defconfig
@@ -11,7 +11,7 @@ TARGET_USE_UBOOT := true
 UBOOT_CONFIG := vexpress_ca9x4_config
 UBOOT_FLAVOURS := vexpress_ca9x4:u-boot_v2p-ca9.bin vexpress_ca5x2:u-boot_v2p-ca5s.bin vexpress_ca15x2:u-boot_v2p-ca15-tc1.bin
 DEVICE_TREES := vexpress-v2p-ca5s:v2p-ca5s.dtb vexpress-v2p-ca9:v2p-ca9.dtb vexpress-v2p-ca15-tc1:v2p-ca15-tc1.dtb
-CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress_a9/uefi.mk
+CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress/uefi.mk
 TARGET_USE_XLOADER := false
 TARGET_NO_RECOVERY := true
 TARGET_NO_RADIOIMAGE := true
diff --git a/device.mk b/device.mk
index 45d5205..ce2a828 100644
--- a/device.mk
+++ b/device.mk
@@ -1,12 +1,12 @@
 PRODUCT_COPY_FILES := \
     device/linaro/common/init.partitions.rc:root/init.partitions.rc \
-    device/linaro/vexpress_a9/vold.fstab:system/etc/vold.fstab \
-    device/linaro/vexpress_a9/egl.cfg:system/lib/egl/egl.cfg
+    device/linaro/vexpress/vold.fstab:system/etc/vold.fstab \
+    device/linaro/vexpress/egl.cfg:system/lib/egl/egl.cfg
 
 PRODUCT_COPY_FILES += \
-    device/linaro/vexpress_a9/init.arm-versatileexpress.rc:root/init.arm-versatileexpress.rc \
-    device/linaro/vexpress_a9/init.vexpress_a9.sh:system/etc/init.vexpress_a9.sh \
-    device/linaro/vexpress_a9/initlogo.rle:root/initlogo.rle
+    device/linaro/vexpress/init.arm-versatileexpress.rc:root/init.arm-versatileexpress.rc \
+    device/linaro/vexpress/init.vexpress.sh:system/etc/init.vexpress.sh \
+    device/linaro/vexpress/initlogo.rle:root/initlogo.rle
 
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
 
diff --git a/init.vexpress.sh b/init.vexpress.sh
new file mode 100755
index 0000000..448a21a
--- /dev/null
+++ b/init.vexpress.sh
@@ -0,0 +1,3 @@
+#!/system/bin/sh
+
+setprop ro.runtime.device vexpress
diff --git a/init.vexpress_a9.sh b/init.vexpress_a9.sh
deleted file mode 100755
index 84c6956..0000000
--- a/init.vexpress_a9.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/system/bin/sh
-
-setprop ro.runtime.device vexpress_a9
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 2f79920..6e8238f 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1 +1 @@
-add_lunch_combo vexpress_a9-eng
+add_lunch_combo vexpress-eng
diff --git a/vexpress.mk b/vexpress.mk
new file mode 100644
index 0000000..90d09e2
--- /dev/null
+++ b/vexpress.mk
@@ -0,0 +1,10 @@
+# The vexpress product that is specialized for vexpress.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+$(call inherit-product, device/linaro/common/common.mk)
+$(call inherit-product, device/linaro/vexpress/device.mk)
+
+PRODUCT_BRAND := vexpress
+PRODUCT_DEVICE := vexpress
+PRODUCT_NAME := vexpress
+PRODUCT_MODEL := vexpress
+PRODUCT_MANUFACTURER := ARM
diff --git a/vexpress_a9.mk b/vexpress_a9.mk
deleted file mode 100644
index b4f9d49..0000000
--- a/vexpress_a9.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# The vexpress_a9 product that is specialized for vexpress_a9.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call inherit-product, device/linaro/common/common.mk)
-$(call inherit-product, device/linaro/vexpress_a9/device.mk)
-
-PRODUCT_BRAND := vexpress_a9
-PRODUCT_DEVICE := vexpress_a9
-PRODUCT_NAME := vexpress_a9
-PRODUCT_MODEL := vexpress_a9
-PRODUCT_MANUFACTURER := ARM