| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-03-26 11:10:12 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-03-26 11:10:12 (GMT) |
| commit | cd023458e3cd989648a8ec9d0a62c51a9cdebe3b (patch) | |
| tree | cc67fa176748d5dd548959930a5b221be9ce1dd4 | |
| parent | 7f49a4192432bae739a2c94c8e34921014329adf (diff) | |
| download | darwin-cd023458e3cd989648a8ec9d0a62c51a9cdebe3b.zip darwin-cd023458e3cd989648a8ec9d0a62c51a9cdebe3b.tar.gz darwin-cd023458e3cd989648a8ec9d0a62c51a9cdebe3b.tar.bz2 | |
darwin: sync to o-ref [1/1]
PD# NONE
build 32 bit default
Change-Id: I2a87734bc05b68c3611ab1011703ad4d1ad874aa
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | Kernel.mk | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | darwin.mk | 4 | ||||
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | init.amlogic.board.rc | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index f0dba0a..728e147 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,7 +14,7 @@ # limitations under the License. # -ifeq ($(ANDROID_BUILD_TYPE), 32) +ifneq ($(ANDROID_BUILD_TYPE), 64) TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true @@ -29,6 +29,9 @@ $(TARGET_PREBUILT_KERNEL): $(INSTALLED_BOARDDTB_TARGET) cp device/amlogic/darwin-kernel/tdk/* $(PRODUCT_OUT)/obj/lib/ cp device/amlogic/darwin-kernel/tdk/* $(PRODUCT_OUT)/root/boot/ cp device/amlogic/darwin-kernel/tdk/* $(PRODUCT_OUT)/recovery/root/boot/ + -cp device/amlogic/darwin-kernel/lib/optee_armtz.ko $(PRODUCT_OUT)/vendor/lib/ + -cp device/amlogic/darwin-kernel/lib/optee.ko $(PRODUCT_OUT)/vendor/lib/ + -cp device/amlogic/darwin-kernel/lib/si2151_fe.ko $(PRODUCT_OUT)/vendor/lib/ cp device/amlogic/darwin-kernel/lib/firmware/video/* $(PRODUCT_OUT)/vendor/lib/firmware/video/ -cp device/amlogic/darwin-kernel/obj/KERNEL_OBJ/vmlinux $(PRODUCT_OUT)/obj/KERNEL_OBJ/ mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ diff --git a/darwin.mk b/darwin.mk index e64d9ed..ee87dc1 100755..100644 --- a/darwin.mk +++ b/darwin.mk @@ -17,14 +17,12 @@ # build for Meson reference board. # -ANDROID_BUILD_TYPE := 32 - # Dynamic enable start/stop zygote_secondary in 64bits # and 32bit system, default closed #TARGET_DYNAMIC_ZYGOTE_SECONDARY_ENABLE := true # Inherit from those products. Most specific first. -ifneq ($(ANDROID_BUILD_TYPE), 32) +ifeq ($(ANDROID_BUILD_TYPE), 64) ifeq ($(TARGET_DYNAMIC_ZYGOTE_SECONDARY_ENABLE), true) $(call inherit-product, device/amlogic/common/dynamic_zygote_seondary/dynamic_zygote_64_bit.mk) else @@ -72,7 +72,7 @@ PRODUCT_COPY_FILES += \ device/amlogic/darwin/files/tv/tv_rrt_define.xml:$(TARGET_COPY_OUT_VENDOR)/etc/tv_rrt_define.xml #darwin tuner PRODUCT_COPY_FILES += \ - device/amlogic/darwin/files/tv/si2151_fe.ko:root/boot/si2151_fe.ko + device/amlogic/darwin/files/tv/si2151_fe.ko:$(TARGET_COPY_OUT_VENDOR)/lib/si2151_fe.ko PRODUCT_AAPT_CONFIG := xlarge hdpi xhdpi PRODUCT_AAPT_PREF_CONFIG := hdpi diff --git a/init.amlogic.board.rc b/init.amlogic.board.rc index 52b17b7..21e77c0 100644 --- a/init.amlogic.board.rc +++ b/init.amlogic.board.rc @@ -6,7 +6,7 @@ on early-init mount configfs configfs /sys/kernel/config #mount usbfs none /proc/bus/usb -# insmod /boot/si2151_fe.ko +# insmod /vendor/lib/si2151_fe.ko on init |