diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-08-03 10:41:55 +0000 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-08-03 10:41:55 +0000 |
| commit | 75cd98a552cad2ca7f02668bd36bf68966a6bafe (patch) | |
| tree | 316b4cb3474a8bc17700f6bb5f561e9336e79f98 | |
| parent | 2cb2fa152dbff21f959926f99406b0da173204cd (diff) | |
| parent | e8a2b31424a126ba8054c81980aed62415131a05 (diff) | |
| download | pandaboard-75cd98a552cad2ca7f02668bd36bf68966a6bafe.tar.gz | |
Merge branch 'ics' into jb
| -rw-r--r-- | BoardConfig.mk | 11 | ||||
| -rw-r--r-- | device.mk | 7 | ||||
| -rw-r--r-- | init.omap4pandaboard.rc | 6 |
3 files changed, 23 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 9416fc4..6756b35 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -7,8 +7,10 @@ TARGET_BOARD_PLATFORM := omap4 TARGET_NO_BOOTLOADER := true # Uses u-boot instead TARGET_NO_KERNEL := false DEVICE_TREES := omap4-panda:board.dtb -ifeq ($(KERNEL_CONFIG),) +ifneq ($(wildcard $(TOP)/kernel/arch/arm/configs/android_omap4_defconfig),) KERNEL_CONFIG := android_omap4_defconfig +else +KERNEL_CONFIG := omap4plus_defconfig endif TARGET_USE_UBOOT := true UBOOT_CONFIG := omap4_panda_config @@ -30,8 +32,15 @@ BOARD_HAVE_BLUETOOTH_BCM := true BOARD_WPA_SUPPLICANT_DRIVER := WEXT WPA_SUPPLICANT_VERSION := VER_0_8_X BOARD_WPA_SUPPLICANT_PRIVATE_LIB := private_lib_driver_cmd +# Below condition allows us to check if the image is being built for +# 3.4+ kernel. +ifeq ($(KERNEL_CONFIG),omap4plus_defconfig) +WIFI_DRIVER_MODULE_PATH := "/system/modules/wlcore_sdio.ko" +WIFI_DRIVER_MODULE_NAME := "wlcore_sdio" +else WIFI_DRIVER_MODULE_PATH := "/system/modules/wl12xx_sdio.ko" WIFI_DRIVER_MODULE_NAME := "wl12xx_sdio" +endif WIFI_FIRMWARE_LOADER := "" TARGET_CPU_ABI := armeabi-v7a @@ -50,6 +50,13 @@ $(call inherit-product-if-exists, device/ti/proprietary-open/install-binaries.mk PRODUCT_PROPERTY_OVERRIDES += \ ro.opengles.version=131072 +# 3.4 kernel doesn't have hardware acceleration. We are enabling the +# support for software graphics by checking if the kernel config is +# set for 3.4 kernel .TODO: Revisit when 3.4+ kernel supports SGX +ifneq ($(wildcard $(TOP)/kernel/arch/arm/configs/omap4plus_defconfig),) +TARGET_NO_HARDWAREGFX=1 +endif + ifeq ($(TARGET_NO_HARDWAREGFX),1) PRODUCT_PROPERTY_OVERRIDES += \ ro.nohardwaregfx=true diff --git a/init.omap4pandaboard.rc b/init.omap4pandaboard.rc index 24045c5..716f688 100644 --- a/init.omap4pandaboard.rc +++ b/init.omap4pandaboard.rc @@ -128,7 +128,13 @@ on boot chown system system /sys/class/rfkill/rfkill0/type chown system system /sys/class/rfkill/rfkill0/state +# TODO "wl1273-core" is needed for 3.2 kernel.Remove it once we stop +# supporting 3.2 kernel insmod /system/modules/wl1273-core.ko + insmod /system/modules/lib80211.ko + insmod /system/modules/cfg80211.ko + insmod /system/modules/mac80211.ko + insmod /system/modules/wlcore.ko insmod /system/modules/wl12xx.ko # Initialize the SGX driver |