merge from ics-test for 3.0 kernel

AndroidProducts.mk

@@ -14,5 +14,4 @@
 # limitations under the License.
 #
 
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_otter.mk
+PRODUCT_MAKEFILES := $(LOCAL_DIR)/full_otter.mk

BoardConfig.mk

@@ -16,9 +16,10 @@
 
 # This variable is set first, so it can be overridden
 # by BoardConfigVendor.mk
+BOARD_USES_GENERIC_AUDIO := false
 USE_CAMERA_STUB := true
-#BIONIC_ICS := true
 BOARD_HAVE_FAKE_GPS := true
+BOARD_HAVE_BLUETOOTH := false
 
 # Use the non-open-source parts, if they're present
 -include vendor/amazon/otter/BoardConfigVendor.mk
@@ -30,16 +31,11 @@ TARGET_CPU_ABI2 := armeabi
 TARGET_CPU_SMP := true
 TARGET_ARCH_VARIANT := armv7-a-neon
 ARCH_ARM_HAVE_TLS_REGISTER := true
-NEEDS_ARM_ERRATA_754319_754320 := true
-TARGET_GLOBAL_CFLAGS += -DNEEDS_ARM_ERRATA_754319_754320
-#BOARD_NEEDS_CUTILS_LOG := true
-
 
 # Kernel
 BOARD_KERNEL_BASE := 0x80000000
 BOARD_KERNEL_PAGESIZE := 4096
-#BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 mem=463M@0x80000000 init=/init vram=5M omapfb.vram=0:5M
-BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 mem=463M@0x80000000 init=/init vram=32M omapfb.vram=0:16M
+BOARD_KERNEL_CMDLINE := mem=512M console=ttyO2,115200n8 vram=24M omapfb.vram=0:8M def_disp=lcd2
 TARGET_NO_RADIOIMAGE := true
 TARGET_BOARD_PLATFORM := omap4
 TARGET_NO_BOOTLOADER := true
@@ -48,9 +44,8 @@ TARGET_BOARD_INFO_FILE := device/amazon/otter/board-info.txt
 TARGET_PREBUILT_KERNEL := device/amazon/otter/kernel
 TARGET_PROVIDES_INIT_RC := true
 BOARD_HAS_SDCARD_INTERNAL := true
-BOARD_SDCARD_DEVICE_PRIMARY := /dev/block/platform/mmci-omap-hs.1/by-name/media
-BOARD_SDCARD_DEVICE_INTERNAL := /dev/block/platform/mmci-omap-hs.1/by-name/media
-
+BOARD_SDCARD_DEVICE_PRIMARY := /dev/block/platform/omap/omap_hsmmc.1/by-name/media
+BOARD_SDCARD_DEVICE_INTERNAL := /dev/block/platform/omap/omap_hsmmc.1/by-name/media
 
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true
@@ -59,84 +54,36 @@ BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16777216
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 536870912
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 1192230912
 BOARD_FLASH_BLOCK_SIZE := 4096
+BOARD_VOLD_MAX_PARTITIONS := 32
+BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
 
 # Connectivity - Wi-Fi
-BOARD_WPA_SUPPLICANT_DRIVER := CUSTOM
-BOARD_HOSTAPD_DRIVER        := CUSTOM
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := libCustomWifi
-WPA_SUPPLICANT_VERSION      := VER_0_6_X
-HOSTAPD_VERSION             := VER_0_6_X
-BOARD_WLAN_DEVICE           := wl1283
-BOARD_SOFTAP_DEVICE         := wl1283
-#BOARD_WLAN_TI_STA_DK_ROOT   := system/wlan/ti/wilink_6_1
-WIFI_DRIVER_MODULE_PATH     := "/system/etc/wifi/tiwlan_drv.ko"
-WIFI_DRIVER_MODULE_NAME     := "tiwlan_drv"
-WIFI_DRIVER_MODULE_ARG      := ""
-WIFI_FIRMWARE_LOADER        := "wlan_loader"
-WIFI_DRIVER_FW_STA_PATH     := "/system/etc/wifi/firmware.bin"
-WIFI_DRIVER_FW_AP_PATH      := "/system/etc/wifi/softap/firmware_ap.bin"
-PRODUCT_WIRELESS_TOOLS      := true
-AP_CONFIG_DRIVER_WILINK     := true
-WPA_SUPPL_APPROX_USE_RSSI   := true
-
-
-# Audio
-BOARD_USES_GENERIC_AUDIO := false
-BOARD_USES_AUDIO_LEGACY := true
-ifdef BOARD_USES_AUDIO_LEGACY
-COMMON_GLOBAL_CFLAGS += -DBOARD_USES_AUDIO_LEGACY
-endif
-
-
-# Bluetooth
-BOARD_HAVE_BLUETOOTH := true
-
+BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
+WPA_SUPPLICANT_VERSION           := VER_0_8_X
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wl12xx
+BOARD_WLAN_DEVICE                := wl12xx_mac80211
+BOARD_SOFTAP_DEVICE              := wl12xx_mac80211
+WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/wl12xx_sdio.ko"
+WIFI_DRIVER_MODULE_NAME          := "wl12xx_sdio"
+WIFI_FIRMWARE_LOADER             := ""
+COMMON_GLOBAL_CFLAGS += -DUSES_TI_MAC80211
 
 # Graphics
 BOARD_EGL_CFG := device/amazon/otter/prebuilt/etc/egl.cfg
-MISSING_EGL_EXTERNAL_IMAGE := true
-MISSING_GRALLOC_BUFFERS := true
-MISSING_EGL_PIXEL_FORMAT_YV12 := true
-COMMON_GLOBAL_CFLAGS += -DMISSING_EGL_EXTERNAL_IMAGE -DMISSING_GRALLOC_BUFFERS -DMISSING_EGL_PIXEL_FORMAT_YV12
-
-
-# OMX
-HARDWARE_OMX := true
-ifdef HARDWARE_OMX
-OMX_JPEG := true
-OMX_VENDOR := ti
-OMX_VENDOR_INCLUDES := \
-  hardware/ti/omx/system/src/openmax_il/omx_core/inc \
-  hardware/ti/omx/image/src/openmax_il/jpeg_enc/inc
-OMX_VENDOR_WRAPPER := TI_OMX_Wrapper
-BOARD_OPENCORE_LIBRARIES := libOMX_Core
-BOARD_OPENCORE_FLAGS := -DHARDWARE_OMX=1
-endif
-LEGACY_DOMX := true
-
+USE_OPENGL_RENDERER := true
 
 # OMAP
 OMAP_ENHANCEMENT := true
 ifdef OMAP_ENHANCEMENT
 COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT -DTARGET_OMAP4
 endif
 
-
 # OTA Packaging
-# device-specific extensions to the updater binary
-#TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_otter
-#TARGET_RELEASETOOLS_EXTENSIONS := device/amazon/otter/releastools
 TARGET_PROVIDES_RELEASETOOLS := true
 TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := device/amazon/otter/releasetools/otter_ota_from_target_files
 TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := device/amazon/otter/releasetools/otter_img_from_target_files
 TARGET_CUSTOM_RELEASETOOL := ./device/amazon/otter/releasetools/squisher
 
-
-# Storage
-TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/usb_mass_storage/lun0/file
-BOARD_UMS_LUNFILE := /sys/devices/platform/usb_mass_storage/lun0/file
-
-
 # Recovery
 TARGET_PREBUILT_RECOVERY_KERNEL := device/amazon/otter/recovery-kernel
 BOARD_HAS_NO_SELECT_BUTTON := true
@@ -145,9 +92,9 @@ BOARD_HAS_LARGE_FILESYSTEM := true
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 TARGET_RECOVERY_UI_LIB := librecovery_ui_otter
 
-
 # Misc.
 BOARD_NEEDS_CUTILS_LOG := true
-BOARD_USES_SECURE_SERVICES := true
+#BOARD_USES_SECURE_SERVICES := true
 BOARD_LIB_DUMPSTATE := libdumpstate.otter
 BOARD_USE_LEGACY_TOUCHSCREEN := true
+

README

@@ -1,5 +1,2 @@
-This device board was based on the work by G1011999 @ GitHub.
-
-Much of the day-to-day "grind it out and fix bugs" work done by JackpotClavin
-
-Select work done by Hashcode (HD video codecs, kernel modules, and some advisory role)
+This device board is designed for a 3.0 kernel running on the Kindle Fire
+By Hashcode

audio/Android.mk

@@ -1,46 +1,29 @@
-ifeq ($(BOARD_USES_AUDIO_LEGACY),true)
+# Copyright (C) 2011 Texas Instruments
+#
+# 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.
 
 LOCAL_PATH := $(call my-dir)
 
-# output for libaudio intermediates
-LIBAUDIO_INTERMEDIATES_PREREQS := $(PRODUCT_OUT)/obj/lib
+include $(CLEAR_VARS)
 
-# prerequisites for building audio
-file := $(LIBAUDIO_INTERMEDIATES_PREREQS)/libaudio.so
-$(file) : device/amazon/otter/audio/libaudio.so
-	@echo "Copy libaudio.so -> $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) cp -a device/amazon/otter/audio/libaudio.so $@
+LOCAL_MODULE := audio.primary.omap4430
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_SRC_FILES := audio_hw.c
+LOCAL_C_INCLUDES += \
+	external/tinyalsa/include \
+	system/media/audio_utils/include \
+	system/media/audio_effects/include
+LOCAL_SHARED_LIBRARIES := liblog libcutils libtinyalsa libaudioutils libdl
+LOCAL_MODULE_TAGS := optional
 
-file := $(LIBAUDIO_INTERMEDIATES_PREREQS)/libaudiopolicy.so
-$(file) : device/amazon/otter/audio/libaudiopolicy.so
-	@echo "Copy libaudio.so -> $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) cp -a device/amazon/otter/audio/libaudiopolicy.so $@
-
-file := $(LIBAUDIO_INTERMEDIATES_PREREQS)/alsa.omap4.so
-$(file) : device/amazon/otter/audio/alsa.omap4.so
-	@echo "Copy libaudio.so -> $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) cp -a device/amazon/otter/audio/alsa.omap4.so $@
-
-file := $(LIBAUDIO_INTERMEDIATES_PREREQS)/libaudiomodemgeneric.so
-$(file) : device/amazon/otter/audio/libaudiomodemgeneric.so
-	@echo "Copy libaudio.so -> $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) cp -a device/amazon/otter/audio/libaudiomodemgeneric.so $@
-
-file := $(LIBAUDIO_INTERMEDIATES_PREREQS)/libasound.so
-$(file) : device/amazon/otter/audio/libasound.so
-	@echo "Copy libasound.so -> $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) cp -a device/amazon/otter/audio/libasound.so $@
-
-include $(all-subdir-makefiles)
-
-endif # BOARD_USES_AUDIO_LEGACY
+include $(BUILD_SHARED_LIBRARY)