[U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support

[Priyanka Jain]

>-----Original Message-----
>From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Heiko Schocher
>Sent: Wednesday, October 16, 2019 9:26 AM
>To: U-Boot Mailing List <u-boot at lists.denx.de>
>Subject: [U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support
>
>enable CONFIG_DM for the socrates board.
>
>Signed-off-by: Heiko Schocher <hs at denx.de>
>---
>
>Changes in v2: None
>
> board/socrates/socrates.c  | 15 +++++++++++++++  configs/socrates_defconfig
>|  6 +++++-  include/configs/socrates.h | 13 +++++++------
> 3 files changed, 27 insertions(+), 7 deletions(-)
>
>diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index
>da9ae5bebb..8f9583360b 100644
>--- a/board/socrates/socrates.c
>+++ b/board/socrates/socrates.c
>@@ -432,3 +432,18 @@ void video_get_info_str (int line_number, char *info)
> 	}
> }
> #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
>diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index
>58d135b907..1730d5793b 100644
>--- a/configs/socrates_defconfig
>+++ b/configs/socrates_defconfig
>@@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0xfff80000  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_BOARD_EARLY_INIT_R=y
>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_DATE=y
> # 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,4 +51,3 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_CONSOLE_EXTRA_INFO=y
>-CONFIG_OF_LIBFDT=y
>diff --git a/include/configs/socrates.h b/include/configs/socrates.h index
>4192148b52..4e10786ed8 100644
>--- a/include/configs/socrates.h
>+++ b/include/configs/socrates.h
>@@ -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=FFFA0000\0"
>	\
>+	"uboot_addr=FFF60000\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;"				\
>--
>2.21.0
>
>______
Travis build error. Please check
https://travis-ci.org/p-priyanka-jain/u-boot-fsl-qoriq/jobs/601663817

+This board does use CONFIG_LIBATA but has CONFIG_AHCI not
1481
+enabled. Please update the storage controller driver to use
1482
+CONFIG_AHCI before the v2019.07 release.
1483
+Error: arch/powerpc/dts/.socrates.dtb.pre.tmp:235.9-21 syntax error
1484
+FATAL ERROR: Unable to parse input tree
1485
+make[3]: *** [arch/powerpc/dts/socrates.dtb] Error 1
1486
+make[2]: *** [arch-dtbs] Error 2
1487
+make[1]: *** [dts/dt.dtb] Error 2
1488
+make: *** [sub-make] Error 2
1489

--priyankajain