snowball: Port to JB
Change-Id: I1dc14772cf9852f930267aa8cc0518a56562d0e4
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 01cfe06..81bd0b9 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,8 +21,10 @@
BOARD_HAVE_BLUETOOTH_BCM := true
WPA_SUPPLICANT_VERSION := VER_0_8_X
-BOARD_WPA_SUPPLICANT_DRIVER := WEXT
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := private_lib_driver_cmd
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+# FIXME using the wl12xx lib is incorrect, but it should be
+# close enough to get things started
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wl12xx
WIFI_DRIVER_MODULE_PATH := /system/modules/cw1200_wlan.ko
WIFI_DRIVER_MODULE_NAME := cw1200_wlan
@@ -50,3 +52,6 @@
# Snowball uses a Nova A9500 -- Dual-Core Cortex A9
TARGET_EXTRA_CFLAGS += $(call cc-option,-mtune=cortex-a9,$(call cc-option,-mtune=cortex-a8)) $(call cc-option,-mcpu=cortex-a9,$(call cc-option,-mcpu=cortex-a8))
+
+# Build uImage and uInitrd instead of kernel and ramdisk.img
+TARGET_BOOTLOADER_TYPE := uboot
diff --git a/device.mk b/device.mk
index 91d4aaf..63d3a07 100644
--- a/device.mk
+++ b/device.mk
@@ -23,7 +23,7 @@
device/linaro/snowball/ueventd.st-ericssonsnowballplatform.rc:root/ueventd.st-ericssonsnowballplatform.rc
PRODUCT_COPY_FILES += \
- frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+ frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
device/linaro/common/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml
PRODUCT_PACKAGES := \
@@ -50,4 +50,4 @@
PRODUCT_PACKAGES += \
make_ext4fs
-$(call inherit-product, frameworks/base/build/tablet-dalvik-heap.mk)
+$(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk)
