envf/part_env: Optimise mechanism

- env partition independs on envf
- support macro define to replace env.img
- it's better to handle bootargs late in board_fdt_chosen_bootargs()

Signed-off-by: Joseph Chen <[email protected]>
Change-Id: I94091b40b4022a68e92427eeb775117966f5446c

Author: JosephChen2017

arch/arm/mach-rockchip/board.c

@@ -1110,16 +1110,39 @@ char *board_fdt_chosen_bootargs(void *fdt)
 #endif
 	}
 
-#ifdef CONFIG_ENVF
-	char * sys_bootargs;
+#if defined(CONFIG_ENVF) || defined(CONFIG_ENV_PARTITION)
+	char *part_type[] = { "mtdparts", "blkdevparts" };
+	char *part_list;
+	char *env;
+	int id = 0;
+
+	env = env_get(part_type[id]);
+	if (!env)
+		env = env_get(part_type[++id]);
+	if (env) {
+		if (!strstr(env, part_type[id])) {
+			part_list = calloc(1, strlen(env) + strlen(part_type[id]) + 2);
+			if (part_list) {
+				strcat(part_list, part_type[id]);
+				strcat(part_list, "=");
+				strcat(part_list, env);
+			}
+		} else {
+			part_list = env;
+		}
+		env_update("bootargs", part_list);
+		if (dump)
+			printf("## parts: %s\n\n", part_list);
+	}
 
-	sys_bootargs = env_get("sys_bootargs");
-	if (sys_bootargs) {
-		env_update("bootargs", sys_bootargs);
+	env = env_get("sys_bootargs");
+	if (env) {
+		env_update("bootargs", env);
 		if (dump)
-			printf("## sys_bootargs: %s\n\n", sys_bootargs);
+			printf("## sys_bootargs: %s\n\n", env);
 	}
 #endif
+
 #ifdef CONFIG_MTD_BLK
 	if (!env_get("mtdparts")) {
 		char *mtd_par_info = mtd_part_parse(NULL);

disk/Kconfig

@@ -137,15 +137,15 @@ config PARTITION_TYPE_GUID
 
 config ENV_PARTITION
 	bool "Enable ENV partition table support"
-	depends on PARTITIONS && ENVF
-	default y
+	depends on PARTITIONS
+	default y if ENVF
 	help
 	  Say Y here if you would like to use ENV partition table.
 
 config SPL_ENV_PARTITION
 	bool "Enable ENV partition table support in SPL"
-	depends on SPL && PARTITIONS && SPL_ENVF
-	default y
+	depends on SPL && PARTITIONS
+	default y if SPL_ENVF
 	help
 	  Say Y here if you would like to use ENV partition table in SPL.
 

disk/part_env.c

@@ -82,14 +82,7 @@ static int env_init_parts(struct blk_desc *dev_desc, struct list_head *parts_hea
 #if CONFIG_IS_ENABLED(ENVF)
 	parts_list = envf_get_part_table(dev_desc);
 #else
-	const char *parts_prefix[] = { "mtdparts", "blkdevparts", };
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(parts_prefix); i++) {
-		parts_list = env_get(parts_prefix[i]);
-		if (parts_list)
-			break;
-	}
+	parts_list = ENV_PARTITIONS;
 #endif
 	if (!parts_list)
 		return -EINVAL;

env/envf.c

@@ -262,35 +262,6 @@ static int envf_init_vars(void)
 	return envf_num;
 }
 
-#ifdef CONFIG_ENV_PARTITION
-static int envf_add_partition_bootargs(void)
-{
-	char *part_list;
-	char *bootargs;
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(part_type); i++) {
-		part_list = env_get(part_type[i]);
-		if (part_list)
-			break;
-	}
-	if (!part_list)
-		return -EINVAL;
-
-	bootargs = calloc(1, strlen(part_list) + strlen(part_type[i]) + 2);
-	if (!bootargs)
-		return -ENOMEM;
-
-	strcat(bootargs, part_type[i]);
-	strcat(bootargs, "=");
-	strcat(bootargs, part_list);
-	env_update("bootargs", bootargs);
-	free(bootargs);
-
-	return 0;
-}
-#endif
-
 static int envf_load(void)
 {
 	struct blk_desc *desc;
@@ -314,10 +285,6 @@ static int envf_load(void)
 		}
 	}
 
-#ifdef CONFIG_ENV_PARTITION
-	envf_add_partition_bootargs();
-#endif
-
 	return 0;
 }