Add support to detect Pine64 model based on DRAM size and make pine64_model variable available in environment.

Author: longsleep

board/sunxi/common/Makefile

@@ -33,6 +33,7 @@ obj-y   += check_key_uart.o
 obj-y   += debug_mode.o
 obj-y   += key_burn.o
 obj-$(CONFIG_SUNXI_SERIAL)   += sunxi_serial.o
+obj-$(CONFIG_PINE64_MODEL)   += pine64_model.o
 
 obj-$(CONFIG_VIDEO_SUNXI_V1)   += de_v1.o
 obj-$(CONFIG_VIDEO_SUNXI_V2)   += de_v2.o

board/sunxi/common/board_common.c

@@ -11,6 +11,7 @@
 #include "debug_mode.h"
 #include "sunxi_string.h"
 #include "sunxi_serial.h"
+#include "pine64_model.h"
 #include <fdt_support.h>
 #include <arisc.h>
 
@@ -520,6 +521,9 @@ int board_late_init(void)
 		ret = update_fdt_para_for_kernel(working_fdt);
 #ifdef CONFIG_SUNXI_SERIAL
                 sunxi_set_serial_num();
+#endif
+#ifdef CONFIG_PINE64_MODEL
+		pine64_set_model();
 #endif
 		return 0;
 	}

board/sunxi/common/pine64_model.c

@@ -0,0 +1,32 @@
+
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int get_model_from_dram_size(char* model)
+{
+	phys_size_t l = 512 * 1024 * 1024;
+	puts("get Pine64 model from DRAM size\n");
+	if (gd->ram_size > l) {
+		puts("DRAM >512M\n");
+		sprintf(model, "pine64-plus");
+	} else {
+		puts("DRAM <= 512M\n");
+		sprintf(model, "pine64");
+	}
+
+	return 0;
+}
+
+int pine64_set_model(void)
+{
+	char model[128] = {0};
+	get_model_from_dram_size(model);
+
+	printf("Pine64 model: %s\n", model);
+	if(setenv("pine64_model", model))
+	{
+		printf("error:set variable [pine64_model] fail\n");
+	}
+	return 0;
+}

board/sunxi/common/pine64_model.h

@@ -0,0 +1,8 @@
+
+#ifndef PINE64_MODEL_H_H_
+#define PINE64_MODEL_H_H_
+
+int pine64_set_model(void);
+
+#endif
+

include/configs/sun50iw1p1.h

@@ -219,6 +219,7 @@
 #define CONFIG_CMD_BOOTA
 #define CONFIG_SUNXI_DMA
 #define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_MEMINFO
 
 
 #define SUNXI_DMA_LINK_NULL       (0x1ffff800)
@@ -343,14 +344,18 @@
 	"kernel_addr=41080000\0" \
 	"initrd_addr=45300000\0" \
 	"kernel_filename=pine64/Image\0" \
-	"fdt_filename=pine64/sun50i-a64-pine64-plus.dtb\0" \
+	"fdt_filename_prefix=pine64/sun50i-a64-\0" \
+	"fdt_filename_suffix=.dtb\0" \
 	"initrd_filename=initrd.img\0" \
 	"bootenv_filename=uEnv.txt\0" \
 	"load_bootenv=" \
 		"fatload mmc 0:1 ${load_addr} ${bootenv_filename}\0" \
 	"import_bootenv=" \
 		"env import -t ${load_addr} ${filesize}\0" \
 	"load_dtb=" \
+		"if test ${fdt_filename} = \"\"; then " \
+			"setenv fdt_filename ${fdt_filename_prefix}${pine64_model}${fdt_filename_suffix}; " \
+		"fi; " \
 		"fatload mmc 0:1 ${fdt_addr} ${fdt_filename}; " \
 		"fdt addr ${fdt_addr}; fdt resize\0" \
 	"load_kernel=" \
@@ -417,4 +422,5 @@
 #define CONFIG_MMC_LOGICAL_OFFSET 0
 #define CONFIG_CMD_ECHO
 
+#define CONFIG_PINE64_MODEL
 #endif /* __CONFIG_H */