snowball: Disable gator and deprecated ALL_PREBUILT

Usage of ALL_PREBUILT is deprecated and gives build errors.
Gator is disabled since it is not included in the manifest
Use the init.rc provided by android build system.
Disable Camera.
Cleanup and Update Boardconfig.mk to ICS
Include full_base.mk

Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>

4 files changed, 38 insertions, 71 deletions

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
deleted file mode 100644
index 3f69a35..0000000
--- a/AndroidBoard.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-file := $(TARGET_OUT_KEYLAYOUT)/gpio-keys.kl
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/gpio-keys.kl | $(ACP)
-	$(transform-prebuilt-to-target)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := gpio-keys.kcm
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_KEY_CHAR_MAP)
-
-file := $(TARGET_OUT_KEYLAYOUT)/Logitech_Logitech_USB_Keyboard.kl
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/Logitech_Logitech_USB_Keyboard.kl | $(ACP)
-	$(transform-prebuilt-to-target)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := Logitech_Logitech_USB_Keyboard.kcm
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_KEY_CHAR_MAP)
-
-file := $(TARGET_ROOT_OUT)/init.rc
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/init.rc | $(ACP)
-	$(transform-prebuilt-to-target)
-
-file := $(TARGET_ROOT_OUT)/init.st-ericsson.rc
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/init.st-ericsson.rc | $(ACP)
-	$(transform-prebuilt-to-target)
-
-file := $(PRODUCT_OUT)/system/etc/init.snowball.sh
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/init.snowball.sh | $(ACP)
-	$(transform-prebuilt-to-target)
-
-file := $(TARGET_ROOT_OUT)/initlogo.rle
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/initlogo.rle | $(ACP)
-	$(transform-prebuilt-to-target)
-
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9456eb5..ecddd5d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -12,48 +12,32 @@ UBOOT_CONFIG := u8500_snowball_config
 TARGET_USE_XLOADER := false
 TARGET_NO_RECOVERY := true
 TARGET_NO_RADIOIMAGE := true
-TARGET_PROVIDES_INIT_RC := true
+#TARGET_PROVIDES_INIT_RC := true
 BOARD_USES_GENERIC_AUDIO := true
 BOARD_USES_ALSA_AUDIO := false
-OMAP_ENHANCEMENT := true
 HARDWARE_OMX := false
-USE_CAMERA_STUB := false
+USE_CAMERA_STUB := true
 
 BOARD_HAVE_BLUETOOTH := false
 BOARD_HAVE_BLUETOOTH_BCM := false
 
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
-
-ifdef HARDWARE_OMX
-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
-
-ifdef OMAP_ENHANCEMENT
-COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT -DTARGET_OMAP4
-endif
-
-# Enable NEON feature
+TARGET_CPU_SMP := true
 TARGET_ARCH_VARIANT := armv7-a-neon
 ARCH_ARM_HAVE_TLS_REGISTER := true
 
-EXTRA_PACKAGE_MANAGEMENT := false
+#BOARD_USES_HGL := true
+#BOARD_USES_OVERLAY := true
+USE_OPENGL_RENDERER := true
 
 TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
-
-# bootargs
-BOARD_KERNEL_CMDLINE := omapdss.def_disp=hdmi consoleblank=0
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456
+#BOARD_SYSTEMIMAGE_PARTITION_SIZE := 16777216
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 536870912
+BOARD_FLASH_BLOCK_SIZE := 4096
 
-# Snowball uses a Nova A9500 -- Dual-Core Cortex A9
-TARGET_CPU_SMP := true
-TARGET_EXTRA_CFLAGS += -mtune=cortex-a9 -mcpu=cortex-a9
+#TARGET_PROVIDES_INIT_RC := true
+#TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
-# ARMs gator (DS-5)
-TARGET_USE_GATOR:= true
+#TARGET_USE_GATOR:= true
diff --git a/device.mk b/device.mk
index 237dc70..baf29f6 100644
--- a/device.mk
+++ b/device.mk
@@ -19,3 +19,25 @@ PRODUCT_COPY_FILES := \
 PRODUCT_COPY_FILES += \
         device/linaro/snowball/init.st-ericsson.rc:root/init.st-ericsson.rc \
         device/linaro/snowball/ueventd.st-ericsson.rc:root/ueventd.st-ericsson.rc
+
+PRODUCT_PACKAGES := \
+        make_ext4fs \
+        com.android.future.usb.accessory
+
+PRODUCT_PROPERTY_OVERRIDES := \
+        hwui.render_dirty_regions=false
+
+PRODUCT_CHARACTERISTICS := tablet,nosdcard
+
+#DEVICE_PACKAGE_OVERLAYS := \
+    device/ti/panda/overlay
+
+PRODUCT_TAGS += dalvik.gc.type-precise
+
+PRODUCT_PACKAGES += \
+        librs_jni \
+        com.android.future.usb.accessory
+
+# Filesystem management tools
+PRODUCT_PACKAGES += \
+        make_ext4fs
diff --git a/snowball.mk b/snowball.mk
index 4409224..d2f181c 100644
--- a/snowball.mk
+++ b/snowball.mk
@@ -1,7 +1,10 @@
 # The snowball product that is specialized for snowball.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, device/linaro/common/common.mk)
 $(call inherit-product, device/linaro/snowball/device.mk)
 
 PRODUCT_BRAND := snowball
 PRODUCT_DEVICE := snowball
 PRODUCT_NAME := snowball
+PRODUCT_MODEL := snowball
+PRODUCT_MANUFACTURER := ST-Ericsson