Merge branch 'linaro-ics' into linaro-jb
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7497f4e..f2ef8d6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -45,3 +45,6 @@
# ARMs gator (DS-5)
TARGET_USE_GATOR:= true
+
+# Build uImage and uInitrd instead of kernel and ramdisk.img
+TARGET_BOOTLOADER_TYPE := uboot
diff --git a/device.mk b/device.mk
index 6ee224d..d9afcd8 100644
--- a/device.mk
+++ b/device.mk
@@ -13,7 +13,4 @@
PRODUCT_TAGS += dalvik.gc.type-precise
-PRODUCT_PACKAGES += \
- camera.vexpress
-
-$(call inherit-product, frameworks/base/build/tablet-dalvik-heap.mk)
+$(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk)
