summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon2014-11-11 17:33:35 -0600
committerNishanth Menon2014-11-11 17:33:35 -0600
commitb0c93da2a8df05ec7f143f636c65146afa18d995 (patch)
tree9447509e831a87832e3d024b3f3d90968f97af87
parent6dda8ce023c6ababe251699eef2da06a6beeb2d4 (diff)
downloaddevice-ti-x15-b0c93da2a8df05ec7f143f636c65146afa18d995.tar.gz
device-ti-x15-b0c93da2a8df05ec7f143f636c65146afa18d995.tar.xz
device-ti-x15-b0c93da2a8df05ec7f143f636c65146afa18d995.zip
rename to beaglex15
Signed-off-by: Nishanth Menon <nm@ti.com>
-rw-r--r--Android.mk4
-rw-r--r--AndroidProducts.mk2
-rw-r--r--BoardConfig.mk14
-rw-r--r--device.mk26
-rw-r--r--full_beaglex15.mk8
-rw-r--r--init.beaglex15board.rc4
-rw-r--r--vendorsetup.sh4
7 files changed, 31 insertions, 31 deletions
diff --git a/Android.mk b/Android.mk
index 37d2bcb..0df5349 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,10 +25,10 @@ LOCAL_PATH := $(call my-dir)
25# protect makefile from other boards 25# protect makefile from other boards
26# if some modules are built directly from this directory (not subdirectories), 26# if some modules are built directly from this directory (not subdirectories),
27# their rules should be written here. 27# their rules should be written here.
28ifeq ($(TARGET_DEVICE),jacinto6evm) 28ifeq ($(TARGET_DEVICE),beaglex15)
29include $(CLEAR_VARS) 29include $(CLEAR_VARS)
30 30
31LOCAL_MODULE := jacinto6evm_hdcp_keys 31LOCAL_MODULE := beaglex15_hdcp_keys
32LOCAL_MODULE_TAGS := optional 32LOCAL_MODULE_TAGS := optional
33LOCAL_MODULE_CLASS := FAKE 33LOCAL_MODULE_CLASS := FAKE
34LOCAL_MODULE_SUFFIX := -timestamp 34LOCAL_MODULE_SUFFIX := -timestamp
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 26b97c7..78cad59 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,4 +14,4 @@
14# limitations under the License. 14# limitations under the License.
15# 15#
16 16
17PRODUCT_MAKEFILES := $(LOCAL_DIR)/full_jacinto6evm.mk 17PRODUCT_MAKEFILES := $(LOCAL_DIR)/full_beaglex15.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index ffc3bc0..e61a01d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -35,18 +35,18 @@ TARGET_CPU_VARIANT := cortex-a15
35 35
36BOARD_HAVE_BLUETOOTH := true 36BOARD_HAVE_BLUETOOTH := true
37BOARD_HAVE_BLUETOOTH_TI := true 37BOARD_HAVE_BLUETOOTH_TI := true
38BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/ti/jacinto6evm/bluetooth 38BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/ti/beaglex15/bluetooth
39TARGET_NO_BOOTLOADER := true 39TARGET_NO_BOOTLOADER := true
40 40
41BOARD_KERNEL_BASE := 0x80000000 41BOARD_KERNEL_BASE := 0x80000000
42#BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 mem=1024M androidboot.console=ttyO2 androidboot.hardware=jacinto6evmboard vram=20M omapfb.vram=0:16M 42#BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 mem=1024M androidboot.console=ttyO2 androidboot.hardware=beaglex15board vram=20M omapfb.vram=0:16M
43BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01f00000 43BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01f00000
44 44
45TARGET_NO_RADIOIMAGE := true 45TARGET_NO_RADIOIMAGE := true
46TARGET_BOARD_PLATFORM := jacinto6 46TARGET_BOARD_PLATFORM := jacinto6
47TARGET_BOOTLOADER_BOARD_NAME := jacinto6evm 47TARGET_BOOTLOADER_BOARD_NAME := beaglex15
48 48
49BOARD_EGL_CFG := device/ti/jacinto6evm/egl.cfg 49BOARD_EGL_CFG := device/ti/beaglex15/egl.cfg
50 50
51USE_OPENGL_RENDERER := true 51USE_OPENGL_RENDERER := true
52 52
@@ -55,9 +55,9 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368
55BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648 55BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648
56BOARD_FLASH_BLOCK_SIZE := 4096 56BOARD_FLASH_BLOCK_SIZE := 4096
57 57
58TARGET_RECOVERY_FSTAB = device/ti/jacinto6evm/fstab.jacinto6evmboard 58TARGET_RECOVERY_FSTAB = device/ti/beaglex15/fstab.beaglex15board
59TARGET_RECOVERY_PIXEL_FORMAT := "RGB565" 59TARGET_RECOVERY_PIXEL_FORMAT := "RGB565"
60TARGET_RELEASETOOLS_EXTENSIONS := device/ti/jacinto6evm 60TARGET_RELEASETOOLS_EXTENSIONS := device/ti/beaglex15
61 61
62# Connectivity - Wi-Fi 62# Connectivity - Wi-Fi
63#USES_TI_MAC80211 := true 63#USES_TI_MAC80211 := true
@@ -74,7 +74,7 @@ ifeq ($(OMAP_MULTIZONE_AUDIO),true)
74COMMON_GLOBAL_CFLAGS += -DOMAP_MULTIZONE_AUDIO 74COMMON_GLOBAL_CFLAGS += -DOMAP_MULTIZONE_AUDIO
75endif 75endif
76 76
77#BOARD_SEPOLICY_DIRS := device/ti/jacinto6evm/sepolicy 77#BOARD_SEPOLICY_DIRS := device/ti/beaglex15/sepolicy
78#BOARD_SEPOLICY_UNION := \ 78#BOARD_SEPOLICY_UNION := \
79# healthd.te 79# healthd.te
80 80
diff --git a/device.mk b/device.mk
index 9da24d5..f79bf96 100644
--- a/device.mk
+++ b/device.mk
@@ -15,27 +15,27 @@
15# 15#
16 16
17ifeq ($(TARGET_PREBUILT_KERNEL),) 17ifeq ($(TARGET_PREBUILT_KERNEL),)
18LOCAL_KERNEL := device/ti/jacinto6evm/kernel 18LOCAL_KERNEL := device/ti/beaglex15/kernel
19else 19else
20LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) 20LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
21endif 21endif
22 22
23PRODUCT_COPY_FILES := \ 23PRODUCT_COPY_FILES := \
24 $(LOCAL_KERNEL):kernel \ 24 $(LOCAL_KERNEL):kernel \
25 device/ti/jacinto6evm/tablet_core_hardware_jacinto6evm.xml:system/etc/permissions/tablet_core_hardware_jacinto6evm.xml \ 25 device/ti/beaglex15/tablet_core_hardware_beaglex15.xml:system/etc/permissions/tablet_core_hardware_beaglex15.xml \
26 device/ti/jacinto6evm/init.jacinto6evmboard.rc:root/init.jacinto6evmboard.rc \ 26 device/ti/beaglex15/init.beaglex15board.rc:root/init.beaglex15board.rc \
27 device/ti/jacinto6evm/init.jacinto6evmboard.usb.rc:root/init.jacinto6evmboard.usb.rc \ 27 device/ti/beaglex15/init.beaglex15board.usb.rc:root/init.beaglex15board.usb.rc \
28 device/ti/jacinto6evm/ueventd.jacinto6evmboard.rc:root/ueventd.jacinto6evmboard.rc \ 28 device/ti/beaglex15/ueventd.beaglex15board.rc:root/ueventd.beaglex15board.rc \
29 device/ti/jacinto6evm/fstab.jacinto6evmboard:root/fstab.jacinto6evmboard \ 29 device/ti/beaglex15/fstab.beaglex15board:root/fstab.beaglex15board \
30 device/ti/jacinto6evm/media_profiles.xml:system/etc/media_profiles.xml \ 30 device/ti/beaglex15/media_profiles.xml:system/etc/media_profiles.xml \
31 device/ti/jacinto6evm/media_codecs.xml:system/etc/media_codecs.xml \ 31 device/ti/beaglex15/media_codecs.xml:system/etc/media_codecs.xml \
32 device/ti/jacinto6evm/bootanimation.zip:/system/media/bootanimation.zip \ 32 device/ti/beaglex15/bootanimation.zip:/system/media/bootanimation.zip \
33 frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ 33 frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
34 frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ 34 frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
35 frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ 35 frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
36 frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ 36 frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
37 device/ti/jacinto6evm/Atmel_maXTouch_Touchscreen.idc:system/usr/idc/Atmel_maXTouch_Touchscreen.idc \ 37 device/ti/beaglex15/Atmel_maXTouch_Touchscreen.idc:system/usr/idc/Atmel_maXTouch_Touchscreen.idc \
38 device/ti/jacinto6evm/LDC_3001_TouchScreen_Controller.idc:system/usr/idc/LDC_3001_TouchScreen_Controller.idc \ 38 device/ti/beaglex15/LDC_3001_TouchScreen_Controller.idc:system/usr/idc/LDC_3001_TouchScreen_Controller.idc \
39 39
40# These are the hardware-specific features 40# These are the hardware-specific features
41PRODUCT_COPY_FILES += \ 41PRODUCT_COPY_FILES += \
@@ -57,7 +57,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
57PRODUCT_CHARACTERISTICS := tablet,nosdcard 57PRODUCT_CHARACTERISTICS := tablet,nosdcard
58 58
59DEVICE_PACKAGE_OVERLAYS := \ 59DEVICE_PACKAGE_OVERLAYS := \
60 device/ti/jacinto6evm/overlay 60 device/ti/beaglex15/overlay
61 61
62PRODUCT_TAGS += dalvik.gc.type-precise 62PRODUCT_TAGS += dalvik.gc.type-precise
63 63
@@ -150,6 +150,6 @@ $(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap
150$(call inherit-product-if-exists, hardware/ti/omap4xxx/jacinto6.mk) 150$(call inherit-product-if-exists, hardware/ti/omap4xxx/jacinto6.mk)
151$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk) 151$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk)
152$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk) 152$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk)
153$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-full_jacinto6evm.mk) 153$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-full_beaglex15.mk)
154$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk) 154$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk)
155$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk) 155$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk)
diff --git a/full_beaglex15.mk b/full_beaglex15.mk
index 6f6f72e..8651781 100644
--- a/full_beaglex15.mk
+++ b/full_beaglex15.mk
@@ -22,11 +22,11 @@
22# 22#
23 23
24# Inherit from those products. Most specific first. 24# Inherit from those products. Most specific first.
25$(call inherit-product, device/ti/jacinto6evm/device.mk) 25$(call inherit-product, device/ti/beaglex15/device.mk)
26$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) 26$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
27 27
28PRODUCT_NAME := full_jacinto6evm 28PRODUCT_NAME := full_beaglex15
29PRODUCT_DEVICE := jacinto6evm 29PRODUCT_DEVICE := beaglex15
30PRODUCT_BRAND := Android 30PRODUCT_BRAND := Android
31PRODUCT_MODEL := jacinto6evm 31PRODUCT_MODEL := beaglex15
32PRODUCT_MANUFACTURER := Texas_Instruments_Inc 32PRODUCT_MANUFACTURER := Texas_Instruments_Inc
diff --git a/init.beaglex15board.rc b/init.beaglex15board.rc
index 08f82e7..d4f7b3d 100644
--- a/init.beaglex15board.rc
+++ b/init.beaglex15board.rc
@@ -1,4 +1,4 @@
1import init.jacinto6evmboard.usb.rc 1import init.beaglex15board.usb.rc
2 2
3on early-init 3on early-init
4 mount debugfs /sys/kernel/debug /sys/kernel/debug 4 mount debugfs /sys/kernel/debug /sys/kernel/debug
@@ -70,7 +70,7 @@ on boot
70 70
71on fs 71on fs
72 mkdir /factory 0775 radio radio 72 mkdir /factory 0775 radio radio
73 mount_all /fstab.jacinto6evmboard 73 mount_all /fstab.beaglex15board
74 74
75# Make UART wake up capable 75# Make UART wake up capable
76 write /sys/devices/ocp.2/4806a000.serial/tty/ttyO0/power/wakeup enabled 76 write /sys/devices/ocp.2/4806a000.serial/tty/ttyO0/power/wakeup enabled
diff --git a/vendorsetup.sh b/vendorsetup.sh
index b5bfef7..d5af0c0 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,5 +14,5 @@
14# limitations under the License. 14# limitations under the License.
15# 15#
16 16
17add_lunch_combo full_jacinto6evm-eng 17add_lunch_combo full_beaglex15-eng
18add_lunch_combo full_jacinto6evm-userdebug 18add_lunch_combo full_beaglex15-userdebug