lk2nd: device: 2nd: Split recovery partition too

Useful for Android recovery that runs mainline kernel

Author: me-cafebabe

lk2nd/device/2nd/partition.c

@@ -107,9 +107,15 @@ static void lk2nd_partition_split_mmc(void)
 {
 	uint32_t block_size __UNUSED = mmc_get_device_blocksize();
 
-#ifdef LK2ND_PARTITION_SIZE
-	partition_split_mmc(LK2ND_PARTITION_BASE, LK2ND_PARTITION_NAME,
-			    LK2ND_PARTITION_SIZE / block_size, false);
+#ifdef LK2ND_BOOT_PARTITION_SIZE
+	partition_split_mmc(LK2ND_BOOT_PARTITION_BASE,
+			    LK2ND_BOOT_PARTITION_NAME,
+			    LK2ND_BOOT_PARTITION_SIZE / block_size, false);
+#endif
+#ifdef LK2ND_RECOVERY_PARTITION_SIZE
+	partition_split_mmc(LK2ND_RECOVERY_PARTITION_BASE,
+			    LK2ND_RECOVERY_PARTITION_NAME,
+			    LK2ND_RECOVERY_PARTITION_SIZE / block_size, false);
 #endif
 }
 
@@ -121,9 +127,15 @@ static void lk2nd_partition_split_flash(void)
 	if (!ptable)
 		return;
 
-#ifdef LK2ND_PARTITION_SIZE
-	partition_split_flash(ptable, LK2ND_PARTITION_BASE, LK2ND_PARTITION_NAME,
-			      LK2ND_PARTITION_SIZE / block_size, false);
+#ifdef LK2ND_BOOT_PARTITION_SIZE
+	partition_split_flash(ptable, LK2ND_BOOT_PARTITION_BASE,
+			      LK2ND_BOOT_PARTITION_NAME,
+			      LK2ND_BOOT_PARTITION_SIZE / block_size, false);
+#endif
+#ifdef LK2ND_RECOVERY_PARTITION_SIZE
+	partition_split_flash(ptable, LK2ND_RECOVERY_PARTITION_BASE,
+			      LK2ND_RECOVERY_PARTITION_NAME,
+			      LK2ND_RECOVERY_PARTITION_SIZE / block_size, false);
 #endif
 }
 

lk2nd/device/2nd/rules.mk

@@ -15,11 +15,17 @@ OBJS += \
 	$(LOCAL_DIR)/samsung-muic-reset.o \
 	$(if $(filter %/mdss_spi.o, $(OBJS)), $(LOCAL_DIR)/spi-display.o) \
 
-ifneq ($(LK2ND_PARTITION_SIZE),)
+ifneq ($(LK2ND_BOOT_PARTITION_SIZE),)
 DEFINES += \
-	LK2ND_PARTITION_BASE="$(LK2ND_PARTITION_BASE)" \
-	LK2ND_PARTITION_NAME="$(LK2ND_PARTITION_NAME)" \
-	LK2ND_PARTITION_SIZE=($(LK2ND_PARTITION_SIZE))
+	LK2ND_BOOT_PARTITION_BASE="$(LK2ND_BOOT_PARTITION_BASE)" \
+	LK2ND_BOOT_PARTITION_NAME="$(LK2ND_BOOT_PARTITION_NAME)" \
+	LK2ND_BOOT_PARTITION_SIZE=($(LK2ND_BOOT_PARTITION_SIZE))
+endif
+ifneq ($(LK2ND_RECOVERY_PARTITION_SIZE),)
+DEFINES += \
+	LK2ND_RECOVERY_PARTITION_BASE="$(LK2ND_RECOVERY_PARTITION_BASE)" \
+	LK2ND_RECOVERY_PARTITION_NAME="$(LK2ND_RECOVERY_PARTITION_NAME)" \
+	LK2ND_RECOVERY_PARTITION_SIZE=($(LK2ND_RECOVERY_PARTITION_SIZE))
 endif
 
 include $(if $(BUILD_GPL),$(LOCAL_DIR)/gpl/rules.mk)

lk2nd/project/lk2nd.mk

@@ -11,11 +11,14 @@ ifneq ($(ENABLE_FBCON_DISPLAY_MSG),1)
 MODULES += $(if $(filter $(MODULES), lk2nd/display), lk2nd/device/menu)
 endif
 
-# Use part of the "boot" partition for the lk2nd boot image. The real Android
-# boot image can be placed in the partition with 512 KiB offset.
-LK2ND_PARTITION_BASE ?= boot
-LK2ND_PARTITION_NAME ?= lk2nd
-LK2ND_PARTITION_SIZE ?= 512*1024
+# Use part of the "boot" and "recovery" partition for the lk2nd boot image.
+# The real Android boot image can be placed in the partition with 512 KiB offset.
+LK2ND_BOOT_PARTITION_BASE ?= boot
+LK2ND_BOOT_PARTITION_NAME ?= lk2nd
+LK2ND_BOOT_PARTITION_SIZE ?= 512*1024
+LK2ND_RECOVERY_PARTITION_BASE ?= recovery
+LK2ND_RECOVERY_PARTITION_NAME ?= lk2nd_recovery
+LK2ND_RECOVERY_PARTITION_SIZE ?= 512*1024
 
 # The primary bootloader will implement LONG_PRESS_POWER_ON if needed.
 # If we do it again in lk2nd we might accidentally shutdown the device because