Merge branch 'cyanogen' into gingerbread

CyanogenDefy · Apr 9, 2012 · 25819e9 · 25819e9
2 parents bbcc898 + f34c5f5
commit 25819e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -96,6 +96,8 @@ BOARD_USE_KINETO_COMPATIBILITY := true
 
 # Changes related to bootmenu
 BOARD_USES_BOOTMENU := true
+BOARD_WITH_CPCAP    := true
+BOARD_MMC_DEVICE    := /dev/block/mmcblk1
 BOARD_BOOTMODE_CONFIG_FILE := /cache/recovery/bootmode.conf
 
 # Recovery

diff --git a/bootmenu/bootmenu.mk b/bootmenu/bootmenu.mk
@@ -60,10 +60,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	external/bootmenu/images/indeterminate1.png:system/bootmenu/images/indeterminate1.png \
 	external/bootmenu/images/indeterminate2.png:system/bootmenu/images/indeterminate2.png \
-	external/bootmenu/images/indeterminate3.png:system/bootmenu/images/indeterminate3.png \
-	external/bootmenu/images/indeterminate4.png:system/bootmenu/images/indeterminate4.png \
-	external/bootmenu/images/indeterminate5.png:system/bootmenu/images/indeterminate5.png \
-	external/bootmenu/images/indeterminate6.png:system/bootmenu/images/indeterminate6.png \
 	external/bootmenu/images/progress_empty.png:system/bootmenu/images/progress_empty.png \
 	external/bootmenu/images/progress_fill.png:system/bootmenu/images/progress_fill.png \
 	${bm_device}/bootmenu/images/background.png:system/bootmenu/images/background.png \