sabrina: Migrate to sm1-common tree

Change-Id: Iecca866b037e603241940dfb4687e33fb74ca732

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e1b9e49033c97408da268905811f44efb25cd8a1..40500ff71985f79a0103c676b088b7ccf2d97980 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -18,9 +18,6 @@ TARGET_BOOTLOADER_BOARD_NAME := sabrina
 ## DTB
 TARGET_DTB_NAME := sm1_s905d3_sabrina
 
-## Kernel
-TARGET_KERNEL_VARIANT_CONFIG := sabrina_defconfig
-
 ## Kernel modules
 TARGET_KERNEL_EXT_MODULES := \
     dhd-driver/bcmdhd.101.10.361.x
@@ -47,7 +44,7 @@ WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path"
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 ## Include the common tree BoardConfig makefile
-include device/amlogic/g12-common/BoardConfigCommon.mk
+include device/amlogic/sm1-common/BoardConfigCommon.mk
 
 ## Include the proprietary BoardConfig makefile
 include vendor/google/sabrina/BoardConfigVendor.mk

diff --git a/device.mk b/device.mk
index a6c7a73a5bbd10d575322f558f7078eab931a184..5e6c8e27004dce6e43c16f88cb3f14f7228ae1ee 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -30,7 +30,7 @@ TARGET_AMLOGIC_SOC := sm1
 include kernel/amlogic/kernel-modules/dhd-driver/firmware/wifi/wifi.mk
 
 ## Inherit from the common tree product makefile
-$(call inherit-product, device/amlogic/g12-common/g12.mk)
+$(call inherit-product, device/amlogic/sm1-common/sm1.mk)
 
 ## Inherit from the proprietary files makefile
 $(call inherit-product, vendor/google/sabrina/sabrina-vendor.mk)

diff --git a/extract-files.sh b/extract-files.sh
index 859e9240d19df4ec4b3c644022660b5dd8533b4c..a97e8d9d1a421ab0484263ead8dd2444dc1aea13 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -34,7 +34,7 @@ fi
 set -e
 
 export DEVICE=sabrina
-export DEVICE_COMMON=g12-common
+export DEVICE_COMMON=sm1-common
 export TARGET_SOC=sm1
 export VENDOR=google
 export VENDOR_BRAND="${VENDOR}"

diff --git a/lineage.dependencies b/lineage.dependencies
index ff93eb9a88bcca415146fbc27ebd8c56f3a76f9c..c338ed18afc0eabc0e5a3541ebae922d8a4f587c 100644 (file)
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,7 +1,7 @@
 [  
   {
-    "repository": "android_device_amlogic_g12-common",
-    "target_path": "device/amlogic/g12-common"
+    "repository": "android_device_amlogic_sm1-common",
+    "target_path": "device/amlogic/sm1-common"
   },
   {
     "repository": "android_hardware_amlogic_kernel-modules_dhd-driver",

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 55d7d659912dc521cf2e768dfb1fa1408c8ae462..ab84a9d63814655b5ad048843d0156341690e9ce 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -15,7 +15,7 @@ fi
 set -e
 
 export DEVICE=sabrina
-export DEVICE_COMMON=g12-common
+export DEVICE_COMMON=sm1-common
 export TARGET_SOC=sm1
 export VENDOR=google
 export VENDOR_BRAND="${VENDOR}"