mpc85xx, socrates: add DM support

enable CONFIG_DM for the socrates board. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

mpc85xx, socrates: add DM support
enable CONFIG_DM for the socrates board. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
Heiko Schocher · Priyanka Jain
1 parent 81a7abe593
Showing 3 changed files with 27 additions and 7 deletions Side-by-side Diff
board/socrates/socrates.c
configs/socrates_defconfig
include/configs/socrates.h
@@ -432,4 +432,19 @@
 	}
 }
 #endif
+
+#if defined(CONFIG_OF_SEPARATE)
+void *board_fdt_blob_setup(void)
+{
+	void *fw_dtb;
+
+	fw_dtb = (void *)(CONFIG_SYS_TEXT_BASE - CONFIG_ENV_SECT_SIZE);
+	if (fdt_magic(fw_dtb) != FDT_MAGIC) {
+		printf("DTB is not passed via %x\n", (u32)fw_dtb);
+		return NULL;
+	}
+
+	return fw_dtb;
+}
+#endif
@@ -3,6 +3,7 @@
 CONFIG_MPC85xx=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_SOCRATES=y
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
@@ -15,6 +16,7 @@
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_REGINFO=y
 CONFIG_CMD_IMLS=y
+CONFIG_CMD_DM=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_PCI=y
  
@@ -31,7 +33,10 @@
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 # CONFIG_CMD_IRQ is not set
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="socrates"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_DM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
@@ -46,5 +51,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
 CONFIG_CONSOLE_EXTRA_INFO=y
-CONFIG_OF_LIBFDT=y
@@ -238,9 +238,10 @@
  * Environment
  */
 #define CONFIG_ENV_SECT_SIZE	0x20000 /* 128K(one sector) for env	*/
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - \
+				CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE		0x4000
-#define CONFIG_ENV_ADDR_REDUND	(CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR_REDUND	(CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND	(CONFIG_ENV_SIZE)
  
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
@@ -280,7 +281,7 @@
 	"bootfile=/home/tftp/syscon3/uImage\0"				\
 	"fdt_file=/home/tftp/syscon3/socrates.dtb\0"			\
 	"initrd_file=/home/tftp/syscon3/uinitrd.gz\0"			\
-	"uboot_addr=FFFA00000000\0"						\"						\
+	"uboot_addr=FFF600000000\0"						\"						\
 	"kernel_addr=FE000000\0"					\
 	"fdt_addr=FE1E0000\0"						\
 	"ramdisk_addr=FE200000\0"					\
@@ -303,9 +304,9 @@
 		"run nfsargs addip addcons;"				\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"update_uboot=tftp 100000 ${uboot_file};"			\
-		"protect off fffa0000 ffffffff;"			\
-		"era fffa0000 ffffffff;"				\
-		"cp.b 100000 fffa0000 ${filesize};"			\
+		"protect off fff60000 ffffffff;"			\
+		"era fff60000 ffffffff;"				\
+		"cp.b 100000 fff60000 ${filesize};"			\
 		"setenv filesize;saveenv\0"				\
 	"update_kernel=tftp 100000 ${bootfile};"			\
 		"era fe000000 fe1dffff;"				\
...	...	@@ -432,4 +432,19 @@
432	432	}
433	433	}
434	434	#endif
	435	+
	436	+#if defined(CONFIG_OF_SEPARATE)
	437	+void *board_fdt_blob_setup(void)
	438	+{
	439	+ void *fw_dtb;
	440	+
	441	+ fw_dtb = (void *)(CONFIG_SYS_TEXT_BASE - CONFIG_ENV_SECT_SIZE);
	442	+ if (fdt_magic(fw_dtb) != FDT_MAGIC) {
	443	+ printf("DTB is not passed via %x\n", (u32)fw_dtb);
	444	+ return NULL;
	445	+ }
	446	+
	447	+ return fw_dtb;
	448	+}
	449	+#endif
...	...	@@ -3,6 +3,7 @@
3	3	CONFIG_MPC85xx=y
4	4	# CONFIG_CMD_ERRATA is not set
5	5	CONFIG_TARGET_SOCRATES=y
	6	+# CONFIG_SYS_MALLOC_F is not set
6	7	CONFIG_FIT=y
7	8	CONFIG_FIT_VERBOSE=y
8	9	CONFIG_OF_BOARD_SETUP=y
...	...	@@ -15,6 +16,7 @@
15	16	CONFIG_HUSH_PARSER=y
16	17	CONFIG_CMD_REGINFO=y
17	18	CONFIG_CMD_IMLS=y
	19	+CONFIG_CMD_DM=y
18	20	CONFIG_CMD_I2C=y
19	21	CONFIG_CMD_NAND=y
20	22	CONFIG_CMD_PCI=y
21	23
...	...	@@ -31,7 +33,10 @@
31	33	# CONFIG_CMD_HASH is not set
32	34	CONFIG_CMD_EXT2=y
33	35	# CONFIG_CMD_IRQ is not set
	36	+CONFIG_OF_CONTROL=y
	37	+CONFIG_DEFAULT_DEVICE_TREE="socrates"
34	38	CONFIG_ENV_IS_IN_FLASH=y
	39	+CONFIG_DM=y
35	40	# CONFIG_MMC is not set
36	41	CONFIG_MTD_NOR_FLASH=y
37	42	CONFIG_FLASH_CFI_DRIVER=y
...	...	@@ -46,5 +51,4 @@
46	51	CONFIG_USB_STORAGE=y
47	52	CONFIG_VIDEO=y
48	53	CONFIG_CONSOLE_EXTRA_INFO=y
49		-CONFIG_OF_LIBFDT=y
...	...	@@ -238,9 +238,10 @@
238	238	* Environment
239	239	*/
240	240	#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
241		-#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
	241	+#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - \
	242	+ CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SECT_SIZE)
242	243	#define CONFIG_ENV_SIZE 0x4000
243		-#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
	244	+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
244	245	#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
245	246
246	247	#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
...	...	@@ -280,7 +281,7 @@
280	281	"bootfile=/home/tftp/syscon3/uImage\0" \
281	282	"fdt_file=/home/tftp/syscon3/socrates.dtb\0" \
282	283	"initrd_file=/home/tftp/syscon3/uinitrd.gz\0" \
283		- "uboot_addr=FFFA00000000\0" \" \
	284	+ "uboot_addr=FFF600000000\0" \" \
284	285	"kernel_addr=FE000000\0" \
285	286	"fdt_addr=FE1E0000\0" \
286	287	"ramdisk_addr=FE200000\0" \
...	...	@@ -303,9 +304,9 @@
303	304	"run nfsargs addip addcons;" \
304	305	"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
305	306	"update_uboot=tftp 100000 ${uboot_file};" \
306		- "protect off fffa0000 ffffffff;" \
307		- "era fffa0000 ffffffff;" \
308		- "cp.b 100000 fffa0000 ${filesize};" \
	307	+ "protect off fff60000 ffffffff;" \
	308	+ "era fff60000 ffffffff;" \
	309	+ "cp.b 100000 fff60000 ${filesize};" \
309	310	"setenv filesize;saveenv\0" \
310	311	"update_kernel=tftp 100000 ${bootfile};" \
311	312	"era fe000000 fe1dffff;" \