Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread

Android.mk

@@ -88,7 +88,10 @@ ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_SYMLINKS)
 # Now let's do recovery symlinks
 BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links)
 ifndef BOARD_HAS_SMALL_RECOVERY
-exclude := tune2fs mke2fs
+exclude := tune2fs
+ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
+exclude += mke2fs
+endif
 endif
 RECOVERY_BUSYBOX_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
 $(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox

mmcutils/Android.mk

@@ -4,8 +4,8 @@ ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-ifeq ($(BOARD_HAS_SMALL_RECOVERY),true)
-LOCAL_CFLAGS += -DBOARD_HAS_SMALL_RECOVERY
+ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
+LOCAL_CFLAGS += -DBOARD_HAS_LARGE_FILESYSTEM
 endif
 
 LOCAL_SRC_FILES := \

mmcutils/mmcutils.c

@@ -340,7 +340,7 @@ run_exec_process ( char **argv) {
 
 int
 format_ext3_device (const char *device) {
-#ifndef BOARD_HAS_SMALL_RECOVERY
+#ifdef BOARD_HAS_LARGE_FILESYSTEM
     char *const mke2fs[] = {MKE2FS_BIN, "-j", "-q", device, NULL};
     char *const tune2fs[] = {TUNE2FS_BIN, "-C", "1", device, NULL};
 #else

utilities/Android.mk

@@ -42,7 +42,7 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
-ifneq ($(BOARD_HAS_SMALL_RECOVERY),true)
+ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := mke2fs
 LOCAL_MODULE_TAGS := eng