summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew F. Davis2019-05-17 11:29:24 -0500
committerAndrew F. Davis2019-05-17 11:29:24 -0500
commit39faf766d5a6cfaf88001fbb5ebc707e9b7dba42 (patch)
tree8a3a4a3f637dfb740fbf9b9f9d9c735320aacb91
parent498cf6e00506d721174985b89c460e041eb34cee (diff)
downloaddevice-ti-j721e-39faf766d5a6cfaf88001fbb5ebc707e9b7dba42.tar.gz
device-ti-j721e-39faf766d5a6cfaf88001fbb5ebc707e9b7dba42.tar.xz
device-ti-j721e-39faf766d5a6cfaf88001fbb5ebc707e9b7dba42.zip
j721e: Initial rename to J721e
Signed-off-by: Andrew F. Davis <afd@ti.com>
-rw-r--r--AndroidProducts.mk4
-rw-r--r--BoardConfig.mk16
-rw-r--r--build/tasks/boot_fit.mk2
-rw-r--r--device-common.mk28
-rw-r--r--fstab.j721eboard (renamed from fstab.am65xevmboard)0
-rw-r--r--init.j721eboard.rc (renamed from init.am65xevmboard.rc)4
-rw-r--r--init.j721eboard.usb.rc (renamed from init.am65xevmboard.usb.rc)0
-rw-r--r--j721.its (renamed from am65x-evm.its)0
-rw-r--r--j721e_full.mk (renamed from am65xevm_full.mk)10
-rw-r--r--sepolicy/file_contexts4
-rw-r--r--tablet_core_hardware_j721e.xml (renamed from tablet_core_hardware_am65xevm.xml)0
-rw-r--r--ueventd.j721eboard.rc (renamed from ueventd.am65xevmboard.rc)0
-rw-r--r--vendorsetup.sh8
13 files changed, 34 insertions, 42 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 30d67c1..b283aeb 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,5 +1,5 @@
1# 1#
2# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ 2# Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
3# 3#
4# Licensed under the Apache License, Version 2.0 (the "License"); 4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License. 5# you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
15# 15#
16 16
17PRODUCT_MAKEFILES := \ 17PRODUCT_MAKEFILES := \
18 $(LOCAL_DIR)/am65xevm_full.mk \ 18 $(LOCAL_DIR)/j721e_full.mk \
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 938c06c..e3c2ce4 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,5 @@
1# 1#
2# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ 2# Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
3# 3#
4# Licensed under the Apache License, Version 2.0 (the "License"); 4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License. 5# you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
14# limitations under the License. 14# limitations under the License.
15# 15#
16 16
17TARGET_BOARD_PLATFORM := am65x 17TARGET_BOARD_PLATFORM := j721e
18TARGET_BOOTLOADER_BOARD_NAME := am65xevmboard 18TARGET_BOOTLOADER_BOARD_NAME := j721eboard
19 19
20TARGET_ARCH := arm64 20TARGET_ARCH := arm64
21TARGET_ARCH_VARIANT := armv8-a 21TARGET_ARCH_VARIANT := armv8-a
22TARGET_CPU_ABI := arm64-v8a 22TARGET_CPU_ABI := arm64-v8a
23TARGET_CPU_ABI2 := 23TARGET_CPU_ABI2 :=
24TARGET_CPU_VARIANT := cortex-a53 24TARGET_CPU_VARIANT := cortex-a72
25 25
26TARGET_2ND_ARCH := arm 26TARGET_2ND_ARCH := arm
27TARGET_2ND_ARCH_VARIANT := armv8-a 27TARGET_2ND_ARCH_VARIANT := armv8-a
28TARGET_2ND_CPU_ABI := armeabi-v7a 28TARGET_2ND_CPU_ABI := armeabi-v7a
29TARGET_2ND_CPU_ABI2 := armeabi 29TARGET_2ND_CPU_ABI2 := armeabi
30TARGET_2ND_CPU_VARIANT := cortex-a53 30TARGET_2ND_CPU_VARIANT := cortex-a72
31 31
32TARGET_BOOTIMAGE_FIT := true 32TARGET_BOOTIMAGE_FIT := true
33TARGET_NO_BOOTLOADER := true # We use externally built U-Boot 33TARGET_NO_BOOTLOADER := true # We use externally built U-Boot
@@ -56,12 +56,12 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912 # 512MB
56TARGET_USERIMAGES_USE_EXT4 := true 56TARGET_USERIMAGES_USE_EXT4 := true
57BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 57BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
58 58
59DEVICE_MANIFEST_FILE := device/ti/am65xevm/manifest.xml 59DEVICE_MANIFEST_FILE := device/ti/j721e/manifest.xml
60DEVICE_MATRIX_FILE := device/ti/am65xevm/compatibility_matrix.xml 60DEVICE_MATRIX_FILE := device/ti/j721e/compatibility_matrix.xml
61TARGET_COPY_OUT_VENDOR := vendor 61TARGET_COPY_OUT_VENDOR := vendor
62 62
63BOARD_SEPOLICY_DIRS += \ 63BOARD_SEPOLICY_DIRS += \
64 device/ti/am65xevm/sepolicy 64 device/ti/j721e/sepolicy
65 65
66BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true 66BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
67 67
diff --git a/build/tasks/boot_fit.mk b/build/tasks/boot_fit.mk
index 8897c40..cf2be4f 100644
--- a/build/tasks/boot_fit.mk
+++ b/build/tasks/boot_fit.mk
@@ -3,7 +3,7 @@ ifeq ($(TARGET_BOOTIMAGE_FIT), true)
3 3
4MKIMAGE := $(shell command -v mkimage 2> /dev/null) 4MKIMAGE := $(shell command -v mkimage 2> /dev/null)
5DTC_FLAGS_MKIMAGE = -I dts -O dtb -p 500 -Wno-unit_address_vs_reg 5DTC_FLAGS_MKIMAGE = -I dts -O dtb -p 500 -Wno-unit_address_vs_reg
6BOARD_DIR := device/ti/am65xevm 6BOARD_DIR := device/ti/j721e
7FIT_DIR := $(PRODUCT_OUT)/obj/fit 7FIT_DIR := $(PRODUCT_OUT)/obj/fit
8ITS := am65x-evm.its 8ITS := am65x-evm.its
9BOOTIMG_FIT := $(PRODUCT_OUT)/boot_fit.img 9BOOTIMG_FIT := $(PRODUCT_OUT)/boot_fit.img
diff --git a/device-common.mk b/device-common.mk
index a44dbe2..550bcfc 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -1,5 +1,5 @@
1# 1#
2# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ 2# Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
3# 3#
4# Licensed under the Apache License, Version 2.0 (the "License"); 4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License. 5# you may not use this file except in compliance with the License.
@@ -82,23 +82,15 @@ endif
82 82
83PRODUCT_COPY_FILES += \ 83PRODUCT_COPY_FILES += \
84 $(LOCAL_KERNEL):kernel \ 84 $(LOCAL_KERNEL):kernel \
85 device/ti/am65xevm/init.am65xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am65xevmboard.rc \ 85 device/ti/j721e/init.j721eboard.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.j721eboard.rc \
86 device/ti/am65xevm/init.am65xevmboard.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am65xevmboard.usb.rc \ 86 device/ti/j721e/init.j721eboard.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.j721eboard.usb.rc \
87 device/ti/am65xevm/ueventd.am65xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ 87 device/ti/j721e/ueventd.j721eboard.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
88 device/ti/am65xevm/fstab.am65xevmboard:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.am65xevmboard \ 88 device/ti/j721e/fstab.j721eboard:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.j721eboard \
89 device/ti/am65xevm/tablet_core_hardware_am65xevm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_am65xevm.xml \ 89 device/ti/j721e/tablet_core_hardware_j721e.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_j721e.xml \
90
91# Connectivity
92PRODUCT_COPY_FILES += \
93 frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
94 device/ti/am65xevm/firmware/ti-pruss/am65x-pru0-prueth-fw.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-pruss/am65x-pru0-prueth-fw.elf \
95 device/ti/am65xevm/firmware/ti-pruss/am65x-pru1-prueth-fw.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-pruss/am65x-pru1-prueth-fw.elf \
96 device/ti/am65xevm/firmware/ti-pruss/am65x-rtu0-prueth-fw.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-pruss/am65x-rtu0-prueth-fw.elf \
97 device/ti/am65xevm/firmware/ti-pruss/am65x-rtu1-prueth-fw.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-pruss/am65x-rtu1-prueth-fw.elf \
98 90
99# Media 91# Media
100PRODUCT_COPY_FILES += \ 92PRODUCT_COPY_FILES += \
101 device/ti/am65xevm/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ 93 device/ti/j721e/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
102 frameworks/av/media/libeffects/data/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ 94 frameworks/av/media/libeffects/data/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
103 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ 95 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
104 frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ 96 frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
@@ -106,7 +98,7 @@ PRODUCT_COPY_FILES += \
106PRODUCT_CHARACTERISTICS := tablet,nosdcard 98PRODUCT_CHARACTERISTICS := tablet,nosdcard
107 99
108DEVICE_PACKAGE_OVERLAYS := \ 100DEVICE_PACKAGE_OVERLAYS := \
109 device/ti/am65xevm/overlay 101 device/ti/j721e/overlay
110 102
111PRODUCT_PACKAGES += \ 103PRODUCT_PACKAGES += \
112 toybox_vendor \ 104 toybox_vendor \
@@ -116,7 +108,7 @@ PRODUCT_PACKAGES += \
116$(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk) 108$(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
117 109
118# Include hardware projects (HALs) 110# Include hardware projects (HALs)
119$(call inherit-product-if-exists, hardware/ti/am65x/am65x.mk) 111$(call inherit-product-if-exists, hardware/ti/j721e/j721e.mk)
120 112
121# Include vendor binaries 113# Include vendor binaries
122$(call inherit-product-if-exists, vendor/ti/am65x/am65x.mk) 114$(call inherit-product-if-exists, vendor/ti/j721e/j721e.mk)
diff --git a/fstab.am65xevmboard b/fstab.j721eboard
index a03d2e5..a03d2e5 100644
--- a/fstab.am65xevmboard
+++ b/fstab.j721eboard
diff --git a/init.am65xevmboard.rc b/init.j721eboard.rc
index 923f114..f92bf8b 100644
--- a/init.am65xevmboard.rc
+++ b/init.j721eboard.rc
@@ -1,6 +1,6 @@
1import /vendor/etc/init/hw/init.am65xevmboard.usb.rc 1import /vendor/etc/init/hw/init.j721eboard.usb.rc
2on fs 2on fs
3 mount_all /vendor/etc/fstab.am65xevmboard 3 mount_all /vendor/etc/fstab.j721eboard
4 4
5service pvrsrvinit /vendor/bin/pvrsrvctl --start 5service pvrsrvinit /vendor/bin/pvrsrvctl --start
6 class core 6 class core
diff --git a/init.am65xevmboard.usb.rc b/init.j721eboard.usb.rc
index 10c136a..10c136a 100644
--- a/init.am65xevmboard.usb.rc
+++ b/init.j721eboard.usb.rc
diff --git a/am65x-evm.its b/j721.its
index 48de776..48de776 100644
--- a/am65x-evm.its
+++ b/j721.its
diff --git a/am65xevm_full.mk b/j721e_full.mk
index 3c75a56..5fc8b46 100644
--- a/am65xevm_full.mk
+++ b/j721e_full.mk
@@ -1,5 +1,5 @@
1# 1#
2# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ 2# Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
3# 3#
4# Licensed under the Apache License, Version 2.0 (the "License"); 4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License. 5# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
14# limitations under the License. 14# limitations under the License.
15# 15#
16 16
17$(call inherit-product, device/ti/am65xevm/device-common.mk) 17$(call inherit-product, device/ti/j721e/device-common.mk)
18$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) 18$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
19 19
20PRODUCT_NAME := am65xevm_full 20PRODUCT_NAME := j721e_full
21PRODUCT_DEVICE := am65xevm 21PRODUCT_DEVICE := j721e
22PRODUCT_BRAND := TI 22PRODUCT_BRAND := TI
23PRODUCT_MODEL := AOSP on AM65x EVM 23PRODUCT_MODEL := AOSP on J721e EVM
24PRODUCT_MANUFACTURER := Texas Instruments 24PRODUCT_MANUFACTURER := Texas Instruments
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index b73f14b..f131b06 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -21,7 +21,7 @@
21/vendor/lib64/libsrv_um.so u:object_r:same_process_hal_file:s0 21/vendor/lib64/libsrv_um.so u:object_r:same_process_hal_file:s0
22/vendor/lib64/libusc.so u:object_r:same_process_hal_file:s0 22/vendor/lib64/libusc.so u:object_r:same_process_hal_file:s0
23/vendor/lib64/libpvrANDROID_WSEGL.so u:object_r:same_process_hal_file:s0 23/vendor/lib64/libpvrANDROID_WSEGL.so u:object_r:same_process_hal_file:s0
24/vendor/lib64/hw/gralloc.am65x.so u:object_r:same_process_hal_file:s0 24/vendor/lib64/hw/gralloc.j721e.so u:object_r:same_process_hal_file:s0
25/vendor/lib64/libpvr2d.so u:object_r:same_process_hal_file:s0 25/vendor/lib64/libpvr2d.so u:object_r:same_process_hal_file:s0
26/vendor/lib64/libdbm.so u:object_r:same_process_hal_file:s0 26/vendor/lib64/libdbm.so u:object_r:same_process_hal_file:s0
27/vendor/lib64/libgbm.so u:object_r:same_process_hal_file:s0 27/vendor/lib64/libgbm.so u:object_r:same_process_hal_file:s0
@@ -33,7 +33,7 @@
33/vendor/lib/libsrv_um.so u:object_r:same_process_hal_file:s0 33/vendor/lib/libsrv_um.so u:object_r:same_process_hal_file:s0
34/vendor/lib/libusc.so u:object_r:same_process_hal_file:s0 34/vendor/lib/libusc.so u:object_r:same_process_hal_file:s0
35/vendor/lib/libpvrANDROID_WSEGL.so u:object_r:same_process_hal_file:s0 35/vendor/lib/libpvrANDROID_WSEGL.so u:object_r:same_process_hal_file:s0
36/vendor/lib/hw/gralloc.am65x.so u:object_r:same_process_hal_file:s0 36/vendor/lib/hw/gralloc.j721e.so u:object_r:same_process_hal_file:s0
37/vendor/lib/libpvr2d.so u:object_r:same_process_hal_file:s0 37/vendor/lib/libpvr2d.so u:object_r:same_process_hal_file:s0
38/vendor/lib/libdbm.so u:object_r:same_process_hal_file:s0 38/vendor/lib/libdbm.so u:object_r:same_process_hal_file:s0
39/vendor/lib/libgbm.so u:object_r:same_process_hal_file:s0 39/vendor/lib/libgbm.so u:object_r:same_process_hal_file:s0
diff --git a/tablet_core_hardware_am65xevm.xml b/tablet_core_hardware_j721e.xml
index 7f436a9..7f436a9 100644
--- a/tablet_core_hardware_am65xevm.xml
+++ b/tablet_core_hardware_j721e.xml
diff --git a/ueventd.am65xevmboard.rc b/ueventd.j721eboard.rc
index 18c5e17..18c5e17 100644
--- a/ueventd.am65xevmboard.rc
+++ b/ueventd.j721eboard.rc
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 48285ea..51aa0e4 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,5 +1,5 @@
1# 1#
2# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ 2# Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
3# 3#
4# Licensed under the Apache License, Version 2.0 (the "License"); 4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License. 5# you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
14# limitations under the License. 14# limitations under the License.
15# 15#
16 16
17add_lunch_combo am65xevm_full-eng 17add_lunch_combo j721e_full-eng
18add_lunch_combo am65xevm_full-user 18add_lunch_combo j721e_full-user
19add_lunch_combo am65xevm_full-userdebug 19add_lunch_combo j721e_full-userdebug
20 20