Merge "Revert "init.v2p-aarch64.rc: change to not use vsync"" into linaro-jb
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f12e178..9dc5fa3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -43,7 +43,11 @@
# Juice
#
KERNEL_TOOLS_PREFIX := aarch64-linux-android-
-KERNEL_CONFIG := vexpress-android_defconfig
+KERNEL_CONFIG := linaro/configs/linaro-base.conf \
+ linaro/configs/android.conf \
+ linaro/configs/vexpress64.conf \
+ linaro/configs/vexpress-tuning.conf \
+ linaro/configs/juice.conf
CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress/bootloader64.mk
else ifeq ($(strip $(BUILD_IKS)),true)
@@ -78,6 +82,7 @@
linaro/configs/android.conf \
linaro/configs/big-LITTLE-MP.conf \
linaro/configs/vexpress.conf \
+ linaro/configs/big-LITTLE-IKS.conf \
linaro/configs/vexpress-tuning.conf
DEVICE_TREES := vexpress-v2p-ca5s:v2p-ca5s.dtb \
vexpress-v2p-ca9:v2p-ca9.dtb \
@@ -96,6 +101,7 @@
CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress/bootloader.mk
INSTALLED_KERNEL_TARGET_NAME := zImage
INSTALLED_RAMDISK_TARGET_NAME := initrd
+INCLUDE_PERF := 0
endif
diff --git a/bootloader.mk b/bootloader.mk
index d78c423..22f5420 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -2,6 +2,8 @@
$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.dsc -D EDK2_ARMVE_SINGLE_BINARY=1 -D EDK2_ARMVE_STANDALONE=1,ca15-tc1,ARMVEXPRESS_EFI,uefi_v2p-ca15-tc1.bin))
$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.dsc -D EDK2_ARMVE_SINGLE_BINARY=1 -D EDK2_ARMVE_STANDALONE=1,ca5s,ARMVEXPRESS_EFI,uefi_v2p-ca5s.bin))
$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc -D ARM_BIGLITTLE_TC2=1 -D EDK2_ARMVE_SINGLE_BINARY=1,ca15-tc2,ARM_VEXPRESS_CTA15A7_EFI,uefi_v2p-ca15-tc2.bin))
+$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc -D EDK2_ARMVE_STANDALONE=1,rtsm-ca9,RTSM_VE_CORTEX-A9_EFI,rtsm/uefi_rtsm_ve-ca9x4.bin))
+$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc -D EDK2_ARMVE_STANDALONE=1,rtsm-ca15,RTSM_VE_CORTEX-A15_MPCORE_EFI,rtsm/uefi_rtsm_ve-ca15.bin))
#
diff --git a/device.mk b/device.mk
index 6e3afad..e276057 100644
--- a/device.mk
+++ b/device.mk
@@ -16,13 +16,20 @@
device/linaro/vexpress/ueventd.v2p-aarch64.rc:root/ueventd.v2p-aarch64.rc \
device/linaro/vexpress/init.vexpress.sh:system/etc/init.vexpress.sh \
device/linaro/vexpress/initlogo.rle:root/initlogo.rle \
- device/linaro/vexpress/set_irq_affinity.sh:root/sbin/set_irq_affinity.sh
+ device/linaro/vexpress/set_irq_affinity.sh:root/sbin/set_irq_affinity.sh \
+ device/linaro/common/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml
PRODUCT_CHARACTERISTICS := tablet,nosdcard
ifeq ($(strip $(ANDROID_64)),true)
DEVICE_PACKAGE_OVERLAYS := \
device/linaro/vexpress/overlay.v2p-aarch64
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.sf.lcd_density=120
+
+PRODUCT_COPY_FILES += \
+ device/linaro/vexpress/init.v2p-aarch64.sh:system/etc/init.v2p-aarch64.sh
else
DEVICE_PACKAGE_OVERLAYS := \
device/linaro/vexpress/overlay
diff --git a/init.arm-versatileexpress.rc b/init.arm-versatileexpress.rc
old mode 100644
new mode 100755
index ae78561..2f07380
--- a/init.arm-versatileexpress.rc
+++ b/init.arm-versatileexpress.rc
@@ -16,7 +16,10 @@
# For TC2, set A15 and A7 clusters A7s to interactive governor
# (Other CoreTiles don't have cpu_freq so this doesn't affect them.)
write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
+ write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive
+ write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
+ write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor interactive
# change permissions for alsa nodes
chmod 0777 /dev/snd/pcmC0D0c
diff --git a/init.v2p-aarch64.sh b/init.v2p-aarch64.sh
new file mode 100755
index 0000000..6f742c5
--- /dev/null
+++ b/init.v2p-aarch64.sh
@@ -0,0 +1,3 @@
+#!/system/bin/sh
+
+date -s 20130606.060606
