Clean up crespo/crespo4g's makefile inheritance.

Specifically, remove crespo's BoardConfigVendor from
crespo4g's inheritance chain, so that it's possible
to build a no-driver crespo4g in AOSP when the
crespo drivers are present.

Same thing with crespo's device_vendor.mk

BUG=4211111

Change-Id: I23e7c4b15c38b1acee4165db7be37044e19745ff

4 files changed, 84 insertions, 62 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index c082896..e198b9b 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,7 +17,7 @@
 # Product-specific compile-time definitions.
 #
 
-# Set this up here so that BoardVendorConfig.mk can override it
+# Set this up here so that BoardConfigVendor.mk can override it
 BOARD_USES_GENERIC_AUDIO := false
 
 BOARD_USES_LIBSECRIL_STUB := true
@@ -28,58 +28,5 @@ BOARD_NO_32BPP := true
 # Use the non-open-source parts, if they're present
 -include vendor/samsung/crespo/BoardConfigVendor.mk
 
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-
-BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_BCM := true
-
-TARGET_NO_BOOTLOADER := true
-
-TARGET_NO_KERNEL := false
-
-TARGET_NO_RADIOIMAGE := true
-TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_BOARD_PLATFORM := s5pc110
-TARGET_BOOTLOADER_BOARD_NAME := herring
-
-TARGET_SEC_INTERNAL_STORAGE := false
-
-# Enable NEON feature
-TARGET_ARCH_VARIANT := armv7-a-neon
-ARCH_ARM_HAVE_TLS_REGISTER := true
-
-USE_CAMERA_STUB := false
-ifeq ($(USE_CAMERA_STUB),false)
-BOARD_CAMERA_LIBRARIES := libcamera
-endif
-
-BOARD_USES_HGL := true
-BOARD_USES_OVERLAY := true
-
-DEFAULT_FB_NUM := 2
-
-BOARD_NAND_PAGE_SIZE := 4096 -s 128
-
-BOARD_KERNEL_BASE := 0x30000000
-BOARD_KERNEL_PAGESIZE := 4096
-BOARD_KERNEL_CMDLINE := console=ttyFIQ0 no_console_suspend
-
-TARGET_RECOVERY_UI_LIB := librecovery_ui_crespo
-TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/crespo
-
-TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 536870912
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 1073741824
-BOARD_FLASH_BLOCK_SIZE := 4096
-
-# Connectivity - Wi-Fi
-WPA_SUPPLICANT_VERSION := VER_0_6_X
-BOARD_WPA_SUPPLICANT_DRIVER := WEXT
-BOARD_WLAN_DEVICE := bcm4329
-WIFI_DRIVER_MODULE_PATH     := "/system/modules/bcm4329.ko"
-WIFI_DRIVER_FW_STA_PATH     := "/vendor/firmware/fw_bcm4329.bin"
-WIFI_DRIVER_FW_AP_PATH      := "/vendor/firmware/fw_bcm4329_apsta.bin"
-WIFI_DRIVER_MODULE_NAME     :=  "bcm4329"
-WIFI_DRIVER_MODULE_ARG      :=  "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt"
-
+# Use the parts that are common between all crespos
+include device/samsung/crespo/BoardConfigCommon.mk
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
new file mode 100755
index 0000000..3fd9019
--- /dev/null
+++ b/BoardConfigCommon.mk
@@ -0,0 +1,74 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# BoardConfig.mk
+#
+# Product-specific compile-time definitions.
+#
+
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+
+BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_BCM := true
+
+TARGET_NO_BOOTLOADER := true
+
+TARGET_NO_KERNEL := false
+
+TARGET_NO_RADIOIMAGE := true
+TARGET_PROVIDES_INIT_TARGET_RC := true
+TARGET_BOARD_PLATFORM := s5pc110
+TARGET_BOOTLOADER_BOARD_NAME := herring
+
+TARGET_SEC_INTERNAL_STORAGE := false
+
+# Enable NEON feature
+TARGET_ARCH_VARIANT := armv7-a-neon
+ARCH_ARM_HAVE_TLS_REGISTER := true
+
+USE_CAMERA_STUB := false
+ifeq ($(USE_CAMERA_STUB),false)
+BOARD_CAMERA_LIBRARIES := libcamera
+endif
+
+BOARD_USES_HGL := true
+BOARD_USES_OVERLAY := true
+
+DEFAULT_FB_NUM := 2
+
+BOARD_NAND_PAGE_SIZE := 4096 -s 128
+
+BOARD_KERNEL_BASE := 0x30000000
+BOARD_KERNEL_PAGESIZE := 4096
+BOARD_KERNEL_CMDLINE := console=ttyFIQ0 no_console_suspend
+
+TARGET_RECOVERY_UI_LIB := librecovery_ui_crespo
+TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/crespo
+
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 536870912
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 1073741824
+BOARD_FLASH_BLOCK_SIZE := 4096
+
+# Connectivity - Wi-Fi
+WPA_SUPPLICANT_VERSION := VER_0_6_X
+BOARD_WPA_SUPPLICANT_DRIVER := WEXT
+BOARD_WLAN_DEVICE := bcm4329
+WIFI_DRIVER_MODULE_PATH     := "/system/modules/bcm4329.ko"
+WIFI_DRIVER_FW_STA_PATH     := "/vendor/firmware/fw_bcm4329.bin"
+WIFI_DRIVER_FW_AP_PATH      := "/vendor/firmware/fw_bcm4329_apsta.bin"
+WIFI_DRIVER_MODULE_NAME     :=  "bcm4329"
+WIFI_DRIVER_MODULE_ARG      :=  "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt"
+
diff --git a/device.mk b/device.mk
index a557181..c738286 100644
--- a/device.mk
+++ b/device.mk
@@ -39,3 +39,10 @@ PRODUCT_COPY_FILES := \
 	frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
 
 $(call inherit-product, device/samsung/crespo/device_base.mk)
+
+# See comment at the top of this file. This is where the other
+# half of the device-specific product definition file takes care
+# of the aspects that require proprietary drivers that aren't
+# commonly available
+$(call inherit-product-if-exists, vendor/samsung/crespo/device-vendor.mk)
+
diff --git a/device_base.mk b/device_base.mk
index cd43b55..799ee9f 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -150,9 +150,3 @@ endif
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel
-
-# See comment at the top of this file. This is where the other
-# half of the device-specific product definition file takes care
-# of the aspects that require proprietary drivers that aren't
-# commonly available
-$(call inherit-product-if-exists, vendor/samsung/crespo/device-vendor.mk)