From dc937700ffce0340f5abfdaa0c0cb3dde36fc2d8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Tue, 5 Apr 2011 09:54:21 -0700 Subject: 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 --- BoardConfig.mk | 59 +++------------------------------------------------------- 1 file changed, 3 insertions(+), 56 deletions(-) (limited to 'BoardConfig.mk') 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 -- cgit v1.1