Skip to contentSkip to conversation

powerpc: convert socrates board to DM

PATCH New Heiko Schocher 2 participants 21 messages Oct 16, 2019 – Nov 7, 2019 PowerPC

lore
Share & tools
lore
#0 lore raw

v2 cover powerpc: convert socrates board to DM

convert the socrates board to use DM.

needed pending PCI patch
http://patchwork.ozlabs.org/patch/1176108/

fixes compiler warnings:
===================== WARNING ====================== This board does not use CONFIG_DM. CONFIG_DM will be compulsory starting with the v2020.01 release. Failure to update may result in board removal.
See doc/driver-model/migration.rst for more info.
====================================================
===================== WARNING ====================== This board does not use CONFIG_DM_USB. Please update the board to use CONFIG_DM_USB before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info.
====================================================
===================== WARNING ====================== This board does not use CONFIG_DM_PCI Please update the board to use CONFIG_DM_PCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info.
====================================================
===================== WARNING ====================== This board does not use CONFIG_DM_VIDEO Please update the board to use CONFIG_DM_VIDEO before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info.
====================================================

Travis build:
https://travis-ci.org/hsdenx/u-boot-test/builds/597488733

Changes in v2:
- use separate PCI driver for mpc85xx as Z.q. Hou mentioned:
and drop the patchseries:
pci: pcie_fsl: add support for none PCIe devices
http://patchwork.ozlabs.org/project/uboot/list/?series=134976
END

Heiko Schocher (9):
mpc85xx, socrates: suppress unknown flash warning
mpc85xx: add socrates dts from linux mpc85xx, dts, socrates: add u-boot specific dtsi mpc85xx, socrates: add DM support mpc85xx, socrates: get rid of DM_USB warning mpc85xx, socrates: disable VIDEO
mpc85xx, socrates: enable DM I2C
mpc85xx, socrates: enable DM serial mpc85xx, socrates: add DM PCI support

 arch/powerpc/dts/Makefile             |   1 +
 arch/powerpc/dts/socrates-u-boot.dtsi |  40 +++
 arch/powerpc/dts/socrates.dts         | 349 ++++++++++++++++++++++++++
 board/socrates/MAINTAINERS            |   4 +-
 board/socrates/law.c                  |   2 -
 board/socrates/socrates.c             | 222 ++--------------
 configs/socrates_defconfig            |  24 +-
 include/configs/socrates.h            |  68 +----
 8 files changed, 439 insertions(+), 271 deletions(-)
 create mode 100644 arch/powerpc/dts/socrates-u-boot.dtsi
 create mode 100644 arch/powerpc/dts/socrates.dts
Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 1/9 mpc85xx, socrates: suppress unknown flash warning

suppress warning:
Flash: ## Unknown flash on Bank 1 - Size = 0x00000000 = 0 MB

---

Changes in v2: None

 include/configs/socrates.h | 1 +
 1 file changed, 1 insertion(+)
include/configs/socrates.h +1 -0
index c7c30d367a..4192148b52 100644
@@ -96,6 +96,7 @@
  */
 #define CONFIG_SYS_LBC_CACHE_BASE	0xf0000000	/* Localbus cacheable	 */
 
+#define CONFIG_SYS_FLASH_QUIET_TEST
 #define CONFIG_SYS_FLASH0		0xFE000000
 #define CONFIG_SYS_FLASH1		0xFC000000
 #define CONFIG_SYS_FLASH_BANKS_LIST	{ CONFIG_SYS_FLASH1, CONFIG_SYS_FLASH0 }
Signature · 1 line
2.21.0
#2 lore raw

PATCH v2 2/9 mpc85xx: add socrates dts from linux

In reply to Heiko Schocher

add socrates device tree from linux:

commit 71ae5fc87c34 ("Merge tag 'linux-kselftest-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest")

and added SPDX license identifier.
Did not fix checkpatch warnings:
arch/powerpc/dts/socrates.dts:235: check: Please don't use multiple blank lines arch/powerpc/dts/socrates.dts:238: error: code indent should use tabs where possible

Also, add me as board maintainer.

---

Changes in v2: None

 arch/powerpc/dts/Makefile     |   1 +
 arch/powerpc/dts/socrates.dts | 349 ++++++++++++++++++++++++++++++++++
 board/socrates/MAINTAINERS    |   3 +-
 3 files changed, 352 insertions(+), 1 deletion(-)
 create mode 100644 arch/powerpc/dts/socrates.dts
arch/powerpc/dts/Makefile +1 -0
index 021c85f00f..3195351c9c 100644
@@ -8,6 +8,7 @@ dtb-$(CONFIG_TARGET_P2041RDB) += p2041rdb.dtb
 dtb-$(CONFIG_TARGET_P3041DS) += p3041ds.dtb
 dtb-$(CONFIG_TARGET_P4080DS) += p4080ds.dtb
 dtb-$(CONFIG_TARGET_P5040DS) += p5040ds.dtb
+dtb-$(CONFIG_TARGET_SOCRATES) += socrates.dtb
 dtb-$(CONFIG_TARGET_T1024RDB) += t1024rdb.dtb
 dtb-$(CONFIG_TARGET_T1042D4RDB) += t1042d4rdb.dtb
 dtb-$(CONFIG_TARGET_T2080QDS) += t2080qds.dtb
arch/powerpc/dts/socrates.dts new file +349 -0

349 lines not on this page · raw message

board/socrates/MAINTAINERS +2 -1
index 293b8e6d01..c5607fc342 100644
@@ -1,6 +1,7 @@
 SOCRATES BOARD
-#M:	-
+M:	Heiko Schocher <[email protected]>
 S:	Maintained
 F:	board/socrates/
 F:	include/configs/socrates.h
 F:	configs/socrates_defconfig
+F:	arch/powerpc/dts/socrates.dts
Signature · 1 line
2.21.0
#3 lore raw

PATCH v2 3/9 mpc85xx, dts, socrates: add u-boot specific dtsi

In reply to Heiko Schocher

add u-boot specific dtsi file for socrates board.

---

Changes in v2: None

 arch/powerpc/dts/socrates-u-boot.dtsi | 40 +++++++++++++++++++++++++++
 board/socrates/MAINTAINERS            |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 arch/powerpc/dts/socrates-u-boot.dtsi
arch/powerpc/dts/socrates-u-boot.dtsi new file +40 -0
new file mode 100644
index 0000000000..14a7c245dc
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019
+ * Heiko Schocher, DENX Software Engineering, hs at denx.de
+ */
+/ {
+	binman {
+		filename = "u-boot-socrates.bin";
+		pad-byte = <0xff>;
+		// Place dtb one sector before u-boot-nodtb.bin
+		blob {
+			filename = "dts/dt.dtb";
+		};
+		u-boot-nodtb {
+			filename = "u-boot-nodtb.bin";
+			offset = <0x20000>;
+		};
+	};
+
+	chosen {
+		stdout-path = &serial0;
+	};
+
+	soc8544 at e0000000 {
+		i2c at 3000 {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
+
+&pci0 {
+	clock-frequency = <33000000>;
+	ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
+		  0x01000000 0x0 0xe2000000 0xe2000000 0x0 0x01000000>;
+};
+
+&serial0 {
+	u-boot,dm-pre-reloc;
+	clock-frequency = <333333330>;
+};
board/socrates/MAINTAINERS +1 -0
index c5607fc342..2b27a73c18 100644
@@ -5,3 +5,4 @@ F:	board/socrates/
 F:	include/configs/socrates.h
 F:	configs/socrates_defconfig
 F:	arch/powerpc/dts/socrates.dts
+F:	arch/powerpc/dts/socrates-u-boot.dtsi
Signature · 1 line
2.21.0
#4 lore raw

PATCH v2 4/9 mpc85xx, socrates: add DM support

In reply to Heiko Schocher

enable CONFIG_DM for the socrates board.

---

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(-)
board/socrates/socrates.c +15 -0
index da9ae5bebb..8f9583360b 100644
@@ -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
configs/socrates_defconfig +5 -1
index 58d135b907..1730d5793b 100644
@@ -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
include/configs/socrates.h +7 -6
index 4192148b52..4e10786ed8 100644
@@ -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;"				\
Signature · 1 line
2.21.0
#5 lore raw

PATCH v2 4/9 mpc85xx, socrates: add DM support

Quoted 124 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support

enable CONFIG_DM for the socrates board.

---

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(-)
board/socrates/socrates.c index renamed from board/socrates/socrates.c +0 -0

da9ae5bebb..8f9583360b 100644

board/socrates/socrates.c +15 -0
@@ -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
configs/socrates_defconfig index renamed from configs/socrates_defconfig +0 -0

58d135b907..1730d5793b 100644

configs/socrates_defconfig +1 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -31,7 +33,10 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set

CONFIG_CMD_EXT2=y
# CONFIG_CMD_IRQ is not set

configs/socrates_defconfig +2 -0
+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

configs/socrates_defconfig +0 -0
@@ -46,4 +51,3 @@ CONFIG_USB=y

CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y
CONFIG_CONSOLE_EXTRA_INFO=y

configs/socrates_defconfig +0 -1
-CONFIG_OF_LIBFDT=y
include/configs/socrates.h index renamed from include/configs/socrates.h +0 -0

4192148b52..4e10786ed8 100644

include/configs/socrates.h +2 -2
@@ -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 */

include/configs/socrates.h +1 -1
@@ -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"					\
include/configs/socrates.h +3 -4
@@ -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

Quoted 1 line

______

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

#6 lore raw

PATCH v2 4/9 mpc85xx, socrates: add DM support

Hello Priyanka Jain,

Am 23.10.2019 um 13:18 schrieb Priyanka Jain:

Quoted 124 lines
Quoted 124 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support

enable CONFIG_DM for the socrates board.

---

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(-)
board/socrates/socrates.c index renamed from board/socrates/socrates.c +0 -0

da9ae5bebb..8f9583360b 100644

board/socrates/socrates.c +15 -0
@@ -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
configs/socrates_defconfig index renamed from configs/socrates_defconfig +0 -0

58d135b907..1730d5793b 100644

configs/socrates_defconfig +1 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -31,7 +33,10 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set

CONFIG_CMD_EXT2=y
# CONFIG_CMD_IRQ is not set

configs/socrates_defconfig +2 -0
+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

configs/socrates_defconfig +0 -0
@@ -46,4 +51,3 @@ CONFIG_USB=y

CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y
CONFIG_CONSOLE_EXTRA_INFO=y

configs/socrates_defconfig +0 -1
-CONFIG_OF_LIBFDT=y
include/configs/socrates.h index renamed from include/configs/socrates.h +0 -0

4192148b52..4e10786ed8 100644

include/configs/socrates.h +2 -2
@@ -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 */

include/configs/socrates.h +1 -1
@@ -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"					\
include/configs/socrates.h +3 -4
@@ -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

Quoted 3 lines
Quoted 1 line

______

Travis build error. Please check
https://travis-ci.org/p-priyanka-jain/u-boot-fsl-qoriq/jobs/601663817

I could not open this webpage, I get in my brwoser the error:

We couldn't find the repository
p-priyanka-jain/u-boot-fsl-qoriq

Quoted 20 lines

+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

Quoted 1 line

--priyankajain

Hmm, I did a travis buld before posting, see:
https://travis-ci.org/hsdenx/u-boot-test/builds/597488733

Based on which tree, had you applied the patches?

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#7 lore raw

PATCH v2 4/9 mpc85xx, socrates: add DM support

Am 28.10.2019 um 06:02 schrieb Heiko Schocher:

Quoted 156 lines

Hello Priyanka Jain,

Am 23.10.2019 um 13:18 schrieb Priyanka Jain:

Quoted 124 lines
Quoted 124 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support

enable CONFIG_DM for the socrates board.

---

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(-)
board/socrates/socrates.c index renamed from board/socrates/socrates.c +0 -0

da9ae5bebb..8f9583360b 100644

board/socrates/socrates.c +15 -0
@@ -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
configs/socrates_defconfig index renamed from configs/socrates_defconfig +0 -0

58d135b907..1730d5793b 100644

configs/socrates_defconfig +1 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -31,7 +33,10 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set

CONFIG_CMD_EXT2=y
# CONFIG_CMD_IRQ is not set

configs/socrates_defconfig +2 -0
+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

configs/socrates_defconfig +0 -0
@@ -46,4 +51,3 @@ CONFIG_USB=y

CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y
CONFIG_CONSOLE_EXTRA_INFO=y

configs/socrates_defconfig +0 -1
-CONFIG_OF_LIBFDT=y
include/configs/socrates.h index renamed from include/configs/socrates.h +0 -0

4192148b52..4e10786ed8 100644

include/configs/socrates.h +2 -2
@@ -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    */

include/configs/socrates.h +0 -0
@@ -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"                    \

include/configs/socrates.h +3 -3
@@ -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;"                \
Signature · 1 line
2.21.0
Quoted 3 lines
Quoted 1 line

______

Travis build error. Please check
https://travis-ci.org/p-priyanka-jain/u-boot-fsl-qoriq/jobs/601663817

I could not open this webpage, I get in my brwoser the error:

We couldn't find the repository
p-priyanka-jain/u-boot-fsl-qoriq

Quoted 20 lines

+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

Quoted 6 lines
Quoted 1 line

--priyankajain

Hmm, I did a travis buld before posting, see:
https://travis-ci.org/hsdenx/u-boot-test/builds/597488733

Based on which tree, had you applied the patches?

rebased tree on current mainline master:

ffc379b42c - Merge tag 'mips-pull-2019-10-25' of git://git.denx.de/u-boot-mips

Board builds without errors for me locally, started travis build:

https://travis-ci.org/hsdenx/u-boot-test/builds/603742219

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#8 lore raw

PATCH v2 4/9 mpc85xx, socrates: add DM support

Hello Priyanka Jain,

Am 28.10.2019 um 06:49 schrieb Heiko Schocher:

Quoted 166 lines

Am 28.10.2019 um 06:02 schrieb Heiko Schocher:

Quoted 156 lines

Hello Priyanka Jain,

Am 23.10.2019 um 13:18 schrieb Priyanka Jain:

Quoted 124 lines
Quoted 124 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support

enable CONFIG_DM for the socrates board.

---

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(-)
board/socrates/socrates.c index renamed from board/socrates/socrates.c +0 -0

da9ae5bebb..8f9583360b 100644

board/socrates/socrates.c +15 -0
@@ -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
configs/socrates_defconfig index renamed from configs/socrates_defconfig +0 -0

58d135b907..1730d5793b 100644

configs/socrates_defconfig +1 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -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

configs/socrates_defconfig +0 -0
@@ -31,7 +33,10 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set

CONFIG_CMD_EXT2=y
# CONFIG_CMD_IRQ is not set

configs/socrates_defconfig +2 -0
+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

configs/socrates_defconfig +0 -0
@@ -46,4 +51,3 @@ CONFIG_USB=y

CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y
CONFIG_CONSOLE_EXTRA_INFO=y

configs/socrates_defconfig +0 -1
-CONFIG_OF_LIBFDT=y
include/configs/socrates.h index renamed from include/configs/socrates.h +0 -0

4192148b52..4e10786ed8 100644

include/configs/socrates.h +2 -2
@@ -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    */

include/configs/socrates.h +0 -0
@@ -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"                    \

include/configs/socrates.h +3 -3
@@ -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;"                \
Signature · 1 line
2.21.0
Quoted 3 lines
Quoted 1 line

______

Travis build error. Please check
https://travis-ci.org/p-priyanka-jain/u-boot-fsl-qoriq/jobs/601663817

I could not open this webpage, I get in my brwoser the error:

We couldn't find the repository
p-priyanka-jain/u-boot-fsl-qoriq

Quoted 20 lines

+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

Quoted 6 lines
Quoted 1 line

--priyankajain

Hmm, I did a travis buld before posting, see:
https://travis-ci.org/hsdenx/u-boot-test/builds/597488733

Based on which tree, had you applied the patches?

Quoted 7 lines

rebased tree on current mainline master:

ffc379b42c - Merge tag 'mips-pull-2019-10-25' of git://git.denx.de/u-boot-mips

Board builds without errors for me locally, started travis build:

https://travis-ci.org/hsdenx/u-boot-test/builds/603742219

gentle ping .... above travis build is also fine ...

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#9 lore raw

PATCH v2 4/9 mpc85xx, socrates: add DM support

Quoted 218 lines

-----Original Message-----
From: Heiko Schocher <[email protected]>
Sent: Wednesday, October 30, 2019 6:12 PM
To: Priyanka Jain <[email protected]>
Cc: U-Boot Mailing List <[email protected]>
Subject: Re: [U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support

Hello Priyanka Jain,

Am 28.10.2019 um 06:49 schrieb Heiko Schocher:

Quoted 49 lines

Am 28.10.2019 um 06:02 schrieb Heiko Schocher:

Quoted 46 lines

Hello Priyanka Jain,

Am 23.10.2019 um 13:18 schrieb Priyanka Jain:

Quoted 43 lines
Quoted 43 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 4/9] mpc85xx, socrates: add DM support

enable CONFIG_DM for the socrates board.

---

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(-)
board/socrates/socrates.c +0 -0
index da9ae5bebb..8f9583360b 100644
@@ -432,3 +432,18 @@ void video_get_info_str (int line_number, char
 *info)
     }
 }

#endif

board/socrates/socrates.c +13 -0
+
+#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;
+    }
+
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

configs/socrates_defconfig

Quoted 8 lines

+    return fw_dtb;

board/socrates/socrates.c +2 -0
+}
+#endif
(quoted diff) +0 -0

b/configs/socrates_defconfig index 58d135b907..1730d5793b 100644

configs/socrates_defconfig +0 -0
@@ -3,6 +3,7 @@

CONFIG_SYS_TEXT_BASE=0xfff80000  CONFIG_MPC85xx=y #

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

configs/socrates_defconfig CONFIG_BOARD_EARLY_INIT_R=y

Quoted 6 lines

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

configs/socrates_defconfig +0 -0
@@ -15,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y

CONFIG_HUSH_PARSER=y

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

configs/socrates_defconfig CONFIG_CMD_DATE=y # CONFIG_CMD_HASH is

Quoted 6 lines

CONFIG_CMD_REGINFO=y  CONFIG_CMD_IMLS=y
+CONFIG_CMD_DM=y
CONFIG_CMD_I2C=y
CONFIG_CMD_NAND=y
CONFIG_CMD_PCI=y

configs/socrates_defconfig +0 -0
@@ -31,7 +33,10 @@ CONFIG_CMD_DATE=y # CONFIG_CMD_HASH is

not set

Quoted 64 lines
Quoted 64 lines
Quoted 64 lines
Quoted 64 lines

CONFIG_CMD_EXT2=y # CONFIG_CMD_IRQ is not set

configs/socrates_defconfig +2 -0
+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

configs/socrates_defconfig +0 -0
@@ -46,4 +51,3 @@ CONFIG_USB=y

CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y
CONFIG_CONSOLE_EXTRA_INFO=y

configs/socrates_defconfig +0 -1
-CONFIG_OF_LIBFDT=y
(quoted diff) +0 -0

b/include/configs/socrates.h index
4192148b52..4e10786ed8 100644

include/configs/socrates.h +2 -1
@@ -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

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line

______

Travis build error. Please check
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftr
avis-ci.org%2Fp-priyanka-jain%2Fu-boot-fsl-qoriq%2Fjobs%2F601663817&

amp;data=02%7C01%7Cpriyanka.jain%40nxp.com%7C75c425905c7740dccac40 8d

Quoted 1 line
Quoted 1 line
Quoted 1 line

75d369e75%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637080361 4802

Quoted 1 line
Quoted 1 line
Quoted 1 line

71654&amp;sdata=aiP71HVnPZ8xkm3HvR5Th%2FddRvx2hARyS%2BX5Af29sp0 %3D&a

Quoted 27 lines
Quoted 27 lines
Quoted 1 line

mp;reserved=0

I could not open this webpage, I get in my brwoser the error:

We couldn't find the repository
p-priyanka-jain/u-boot-fsl-qoriq

Quoted 20 lines

+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

Quoted 5 lines
Quoted 5 lines
Quoted 1 line

--priyankajain

Hmm, I did a travis buld before posting, see:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftra
vis-ci.org%2Fhsdenx%2Fu-boot-

test%2Fbuilds%2F597488733&amp;data=02%7C

Quoted 1 line
Quoted 1 line

01%7Cpriyanka.jain%40nxp.com%7C75c425905c7740dccac408d75d369e75%7C 686

Quoted 1 line
Quoted 1 line

ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637080361480271654&amp;s data=

Quoted 6 lines
Quoted 3 lines

wIoTacqJcwS1H3KOIzML31Xq4G4sC6iuihrQUaz833U%3D&amp;reserved=0

Based on which tree, had you applied the patches?

rebased tree on current mainline master:

Quoted 7 lines

ffc379b42c - Merge tag 'mips-pull-2019-10-25' of
git://git.denx.de/u-boot-mips

Board builds without errors for me locally, started travis build:

https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftrav
is-ci.org%2Fhsdenx%2Fu-boot-

test%2Fbuilds%2F603742219&amp;data=02%7C01

Quoted 1 line

%7Cpriyanka.jain%40nxp.com%7C75c425905c7740dccac408d75d369e75%7C68 6ea1

Quoted 1 line
Quoted 8 lines

d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637080361480271654&amp;sdat a=Aij1

Quoted 1 line

kZipCwNT0I9TmW6nQGTQWaf%2Fc%2F8h1HYIErtZgkw%3D&amp;reserved=0

gentle ping .... above travis build is also fine ...

bye,
Heiko

Thanks for confirmation. I will check this.

--priyankajain

Quoted 4 lines

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de

#10 lore raw

PATCH v2 5/9 mpc85xx, socrates: get rid of DM_USB warning

In reply to Heiko Schocher

add some defines and get rid of USB warning.

---

Changes in v2: None

 configs/socrates_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
configs/socrates_defconfig +2 -1
index 1730d5793b..2c87ec5134 100644
@@ -3,7 +3,6 @@ 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
@@ -37,6 +36,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socrates"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_DM=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
@@ -47,6 +47,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_RTC_RX8025=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
Signature · 1 line
2.21.0
#11 lore raw

PATCH v2 6/9 mpc85xx, socrates: disable VIDEO

In reply to Heiko Schocher

disable video, as not really needed longer.

---

Changes in v2: None

 board/socrates/socrates.c  | 180 +------------------------------------
 configs/socrates_defconfig |   3 -
 include/configs/socrates.h |  15 ----
 3 files changed, 2 insertions(+), 196 deletions(-)
board/socrates/socrates.c +2 -178
index 8f9583360b..f51b0203f7 100644
@@ -231,6 +231,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 	val[i++] = gd->bd->bi_flashstart;
 	val[i++] = gd->bd->bi_flashsize;
 
+#if defined(CONFIG_VIDEO_MB862xx)
 	if (mb862xx.frameAdrs == CONFIG_SYS_LIME_BASE) {
 		/* Fixup LIME mapping */
 		val[i++] = 2;			/* chip select number */
@@ -238,6 +239,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 		val[i++] = CONFIG_SYS_LIME_BASE;
 		val[i++] = CONFIG_SYS_LIME_SIZE;
 	}
+#endif
 
 	/* Fixup FPGA mapping */
 	val[i++] = 3;				/* chip select number */
@@ -255,184 +257,6 @@ int ft_board_setup(void *blob, bd_t *bd)
 }
 #endif /* CONFIG_OF_BOARD_SETUP */
 
-#define DEFAULT_BRIGHTNESS	25
-#define BACKLIGHT_ENABLE	(1 << 31)
-
-static const gdc_regs init_regs [] =
-{
-	{0x0100, 0x00010f00},
-	{0x0020, 0x801901df},
-	{0x0024, 0x00000000},
-	{0x0028, 0x00000000},
-	{0x002c, 0x00000000},
-	{0x0110, 0x00000000},
-	{0x0114, 0x00000000},
-	{0x0118, 0x01df0320},
-	{0x0004, 0x041f0000},
-	{0x0008, 0x031f031f},
-	{0x000c, 0x017f0349},
-	{0x0010, 0x020c0000},
-	{0x0014, 0x01df01e9},
-	{0x0018, 0x00000000},
-	{0x001c, 0x01e00320},
-	{0x0100, 0x80010f00},
-	{0x0, 0x0}
-};
-
-const gdc_regs *board_get_regs (void)
-{
-	return init_regs;
-}
-
-int lime_probe(void)
-{
-	uint cfg_br2;
-	uint cfg_or2;
-	int type;
-
-	cfg_br2 = get_lbc_br(2);
-	cfg_or2 = get_lbc_or(2);
-
-	/* Configure GPCM for CS2 */
-	set_lbc_br(2, 0);
-	set_lbc_or(2, 0xfc000410);
-	set_lbc_br(2, (CONFIG_SYS_LIME_BASE) | 0x00001901);
-
-	/* Get controller type */
-	type = mb862xx_probe(CONFIG_SYS_LIME_BASE);
-
-	/* Restore previous CS2 configuration */
-	set_lbc_br(2, 0);
-	set_lbc_or(2, cfg_or2);
-	set_lbc_br(2, cfg_br2);
-
-	return (type == MB862XX_TYPE_LIME) ? 1 : 0;
-}
-
-/* Returns Lime base address */
-unsigned int board_video_init (void)
-{
-	if (!lime_probe())
-		return 0;
-
-	mb862xx.winSizeX = 800;
-	mb862xx.winSizeY = 480;
-	mb862xx.gdfIndex = GDF_15BIT_555RGB;
-	mb862xx.gdfBytesPP = 2;
-
-	return CONFIG_SYS_LIME_BASE;
-}
-
-#define W83782D_REG_CFG		0x40
-#define W83782D_REG_BANK_SEL	0x4e
-#define W83782D_REG_ADCCLK	0x4b
-#define W83782D_REG_BEEP_CTRL	0x4d
-#define W83782D_REG_BEEP_CTRL2	0x57
-#define W83782D_REG_PWMOUT1	0x5b
-#define W83782D_REG_VBAT	0x5d
-
-static int w83782d_hwmon_init(void)
-{
-	u8 buf;
-
-	if (i2c_read(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_CFG, 1, &buf, 1))
-		return -1;
-
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_CFG, 0x80);
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_BANK_SEL, 0);
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_ADCCLK, 0x40);
-
-	buf = i2c_reg_read(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_BEEP_CTRL);
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_BEEP_CTRL,
-		      buf | 0x80);
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_BEEP_CTRL2, 0);
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_PWMOUT1, 0x47);
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_VBAT, 0x01);
-
-	buf = i2c_reg_read(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_CFG);
-	i2c_reg_write(CONFIG_SYS_I2C_W83782G_ADDR, W83782D_REG_CFG,
-		      (buf & 0xf4) | 0x01);
-	return 0;
-}
-
-static void board_backlight_brightness(int br)
-{
-	u32 reg;
-	u8 buf;
-	u8 old_buf;
-
-	/* Select bank 0 */
-	if (i2c_read(CONFIG_SYS_I2C_W83782G_ADDR, 0x4e, 1, &old_buf, 1))
-		goto err;
-	else
-		buf = old_buf & 0xf8;
-
-	if (i2c_write(CONFIG_SYS_I2C_W83782G_ADDR, 0x4e, 1, &buf, 1))
-		goto err;
-
-	if (br > 0) {
-		/* PWMOUT1 duty cycle ctrl */
-		buf = 255 / (100 / br);
-		if (i2c_write(CONFIG_SYS_I2C_W83782G_ADDR, 0x5b, 1, &buf, 1))
-			goto err;
-
-		/* LEDs on */
-		reg = in_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c));
-		if (!(reg & BACKLIGHT_ENABLE))
-			out_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c),
-				 reg | BACKLIGHT_ENABLE);
-	} else {
-		buf = 0;
-		if (i2c_write(CONFIG_SYS_I2C_W83782G_ADDR, 0x5b, 1, &buf, 1))
-			goto err;
-
-		/* LEDs off */
-		reg = in_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c));
-		reg &= ~BACKLIGHT_ENABLE;
-		out_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c), reg);
-	}
-	/* Restore previous bank setting */
-	if (i2c_write(CONFIG_SYS_I2C_W83782G_ADDR, 0x4e, 1, &old_buf, 1))
-		goto err;
-
-	return;
-err:
-	printf("W83782G I2C access failed\n");
-}
-
-void board_backlight_switch (int flag)
-{
-	char * param;
-	int rc;
-
-	if (w83782d_hwmon_init())
-		printf ("hwmon IC init failed\n");
-
-	if (flag) {
-		param = env_get("brightness");
-		rc = param ? simple_strtol(param, NULL, 10) : -1;
-		if (rc < 0)
-			rc = DEFAULT_BRIGHTNESS;
-	} else {
-		rc = 0;
-	}
-	board_backlight_brightness(rc);
-}
-
-#if defined(CONFIG_CONSOLE_EXTRA_INFO)
-/*
- * Return text to be printed besides the logo.
- */
-void video_get_info_str (int line_number, char *info)
-{
-	if (line_number == 1) {
-		strcpy (info, " Board: Socrates");
-	} else {
-		info [0] = '\0';
-	}
-}
-#endif
-
 #if defined(CONFIG_OF_SEPARATE)
 void *board_fdt_blob_setup(void)
 {
configs/socrates_defconfig +0 -3
index 2c87ec5134..be88cefe3e 100644
@@ -27,7 +27,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
-CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
@@ -50,5 +49,3 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
-CONFIG_CONSOLE_EXTRA_INFO=y
include/configs/socrates.h +0 -15
index 4e10786ed8..c35e8aed77 100644
@@ -148,21 +148,6 @@
 #define CONFIG_SYS_BR2_PRELIM		0xc80018a1	/* UPMB, 32-bit	*/
 #define CONFIG_SYS_OR2_PRELIM		0xfc000000	/* 64 MB	*/
 
-#define CONFIG_VIDEO_MB862xx
-#define CONFIG_VIDEO_MB862xx_ACCEL
-#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
-#define VIDEO_FB_16BPP_PIXEL_SWAP
-#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_VIDEO_BMP_GZIP
-#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)	/* decompressed img */
-
-/* SDRAM Clock frequency, 100MHz (0x0000) or 133MHz (0x10000) */
-#define CONFIG_SYS_MB862xx_CCF		0x10000
-/* SDRAM parameter */
-#define CONFIG_SYS_MB862xx_MMR		0x4157BA63
-
 /* Serial Port */
 
 #define CONFIG_SYS_NS16550_SERIAL
Signature · 1 line
2.21.0
#12 lore raw

PATCH v2 6/9 mpc85xx, socrates: disable VIDEO

Quoted 9 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 6/9] mpc85xx, socrates: disable VIDEO

disable video, as not really needed longer.

I see the video driver code is getting removed by this patch. Please explain why video driver was required earlier and not now?

--priyankajain

[snip]

#13 lore raw

PATCH v2 6/9 mpc85xx, socrates: disable VIDEO

Hello Priyanka Jain,

Am 16.10.2019 um 08:56 schrieb Priyanka Jain:

Quoted 11 lines
Quoted 9 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 6/9] mpc85xx, socrates: disable VIDEO

disable video, as not really needed longer.

I see the video driver code is getting removed by this patch. Please explain why video driver was required earlier and not now?

I did not the original port of the board, but I think it was used for a splash image. Nowadays the customer mentioned he do not need any video support in U-Boot.

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#14 lore raw

PATCH v2 6/9 mpc85xx, socrates: disable VIDEO

Hello Priyanka Jain,

Am 16.10.2019 um 09:20 schrieb Heiko Schocher:

Quoted 10 lines

Hello Priyanka Jain,

Am 16.10.2019 um 08:56 schrieb Priyanka Jain:

Quoted 7 lines
Quoted 7 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 6/9] mpc85xx, socrates: disable VIDEO

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

disable video, as not really needed longer.

I see the video driver code is getting removed by this patch. Please explain why video driver was required earlier and not now?

I did not the original port of the board, but I think it was used for a splash image. Nowadays the customer mentioned he do not need any video support in U-Boot.

Answer from the customer:
Video support was only experimental at the beginning of the project, video chips haven't been assembled for release versions of socrates at any time.

Should I add this info into the commit message?

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#15 lore raw

PATCH v2 6/9 mpc85xx, socrates: disable VIDEO

Quoted 32 lines

-----Original Message-----
From: Heiko Schocher <[email protected]>
Sent: Wednesday, October 16, 2019 4:11 PM
To: Priyanka Jain <[email protected]>
Cc: U-Boot Mailing List <[email protected]>
Subject: Re: [U-Boot] [PATCH v2 6/9] mpc85xx, socrates: disable VIDEO

Hello Priyanka Jain,

Am 16.10.2019 um 09:20 schrieb Heiko Schocher:

Quoted 11 lines

Hello Priyanka Jain,

Am 16.10.2019 um 08:56 schrieb Priyanka Jain:

Quoted 8 lines
Quoted 8 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 6/9] mpc85xx, socrates: disable VIDEO

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

disable video, as not really needed longer.

I see the video driver code is getting removed by this patch. Please explain why video driver was required earlier and not now?

I did not the original port of the board, but I think it was used for a splash image. Nowadays the customer mentioned he do not need any video support in U-Boot.

Quoted 5 lines

Answer from the customer:
Video support was only experimental at the beginning of the project, video chips haven't been assembled for release versions of socrates at any time.

Should I add this info into the commit message?

Yes, that will be helpful

--priyankajain

Quoted 7 lines

bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de

#16 lore raw

PATCH v2 6/9 mpc85xx, socrates: disable VIDEO

Hello Priyanka Jain,

Am 16.10.2019 um 12:47 schrieb Priyanka Jain:

Quoted 32 lines
Quoted 32 lines

-----Original Message-----
From: Heiko Schocher <[email protected]>
Sent: Wednesday, October 16, 2019 4:11 PM
To: Priyanka Jain <[email protected]>
Cc: U-Boot Mailing List <[email protected]>
Subject: Re: [U-Boot] [PATCH v2 6/9] mpc85xx, socrates: disable VIDEO

Hello Priyanka Jain,

Am 16.10.2019 um 09:20 schrieb Heiko Schocher:

Quoted 19 lines

Hello Priyanka Jain,

Am 16.10.2019 um 08:56 schrieb Priyanka Jain:

Quoted 8 lines
Quoted 8 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 6/9] mpc85xx, socrates: disable VIDEO

Quoted 4 lines
Quoted 2 lines

disable video, as not really needed longer.

I see the video driver code is getting removed by this patch. Please explain why video driver was required earlier and not now?

I did not the original port of the board, but I think it was used for a splash image. Nowadays the customer mentioned he do not need any video support in U-Boot.

Quoted 6 lines
Quoted 5 lines

Answer from the customer:
Video support was only experimental at the beginning of the project, video chips haven't been assembled for release versions of socrates at any time.

Should I add this info into the commit message?

Yes, that will be helpful

Added to commit message, but waiting for more comments to this series.

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#17 lore raw

PATCH v2 7/9 mpc85xx, socrates: enable DM I2C

In reply to Heiko Schocher

enable DM I2C support for the socrates board.

---

Changes in v2: None

 configs/socrates_defconfig |  4 +++-
 include/configs/socrates.h | 18 +-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)
configs/socrates_defconfig +3 -1
index be88cefe3e..80b5631d07 100644
@@ -27,7 +27,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
-CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 # CONFIG_CMD_IRQ is not set
@@ -36,6 +35,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socrates"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_DM=y
 CONFIG_BLK=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_FSL=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
@@ -43,6 +44,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
+CONFIG_DM_RTC=y
 CONFIG_RTC_RX8025=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
include/configs/socrates.h +1 -17
index c35e8aed77..425d758e1d 100644
@@ -160,23 +160,7 @@
 #define CONFIG_SYS_BAUDRATE_TABLE  \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
 
-/*
- * I2C
- */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_FSL
-#define CONFIG_SYS_FSL_I2C_SPEED	102124
-#define CONFIG_SYS_FSL_I2C_SLAVE	0x7F
-#define CONFIG_SYS_FSL_I2C_OFFSET	0x3000
-#define CONFIG_SYS_FSL_I2C2_SPEED	102124
-#define CONFIG_SYS_FSL_I2C2_SLAVE	0x7F
-#define CONFIG_SYS_FSL_I2C2_OFFSET	0x3100
-
-/* I2C RTC */
-#define CONFIG_SYS_I2C_RTC_ADDR	0x32	/* at address 0x32		*/
-
-/* I2C W83782G HW-Monitoring IC */
-#define CONFIG_SYS_I2C_W83782G_ADDR	0x28	/* W83782G address 		*/
+#define CONFIG_SYS_SPD_BUS_NUM 0
 
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	4
 
Signature · 1 line
2.21.0
#18 lore raw

PATCH v2 8/9 mpc85xx, socrates: enable DM serial

In reply to Heiko Schocher

switch to DM_SERIAL support.

---

Changes in v2: None

 board/socrates/socrates.c  |  5 +++++
 configs/socrates_defconfig |  3 +++
 include/configs/socrates.h | 12 ------------
 3 files changed, 8 insertions(+), 12 deletions(-)
board/socrates/socrates.c +5 -0
index f51b0203f7..8549883508 100644
@@ -271,3 +271,8 @@ void *board_fdt_blob_setup(void)
 	return fw_dtb;
 }
 #endif
+
+int get_serial_clock(void)
+{
+	return 333333330;
+}
configs/socrates_defconfig +3 -0
index 80b5631d07..5bd60e0886 100644
@@ -46,6 +46,9 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_RX8025=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SERIAL_SEARCH_ALL=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
include/configs/socrates.h +0 -12
index 425d758e1d..7adaa344bc 100644
@@ -148,18 +148,6 @@
 #define CONFIG_SYS_BR2_PRELIM		0xc80018a1	/* UPMB, 32-bit	*/
 #define CONFIG_SYS_OR2_PRELIM		0xfc000000	/* 64 MB	*/
 
-/* Serial Port */
-
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
-#define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)
-
-#define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_CCSRBAR+0x4500)
-#define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_CCSRBAR+0x4600)
-
-#define CONFIG_SYS_BAUDRATE_TABLE  \
-	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
-
 #define CONFIG_SYS_SPD_BUS_NUM 0
 
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	4
Signature · 1 line
2.21.0
#19 lore raw

PATCH v2 9/9 mpc85xx, socrates: add DM PCI support

In reply to Heiko Schocher

add DM PCI support on the socrates board.
use PCIE_FSL now.

---

Changes in v2:
- use separate PCI driver for mpc85xx as Z.q. Hou mentioned:
and drop the patchseries:
pci: pcie_fsl: add support for none PCIe devices
http://patchwork.ozlabs.org/project/uboot/list/?series=134976
END

 board/socrates/law.c       |  2 --
 board/socrates/socrates.c  | 40 +++++---------------------------------
 configs/socrates_defconfig |  7 +++++++
 include/configs/socrates.h |  9 ---------
 4 files changed, 12 insertions(+), 46 deletions(-)
board/socrates/law.c +0 -2
index 44703e8aca..840941b63e 100644
@@ -31,9 +31,7 @@
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_DDR),
-	SET_LAW(CONFIG_SYS_PCI1_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_PCI),
 	SET_LAW(CONFIG_SYS_LBC_FLASH_BASE, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
-	SET_LAW(CONFIG_SYS_PCI1_IO_PHYS, LAW_SIZE_16M, LAW_TRGT_IF_PCI),
 #if defined(CONFIG_SYS_FPGA_BASE)
 	SET_LAW(CONFIG_SYS_FPGA_BASE, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
 #endif
board/socrates/socrates.c +5 -35
index 8549883508..5f58b4c21b 100644
@@ -50,7 +50,7 @@ int checkboard (void)
 	}
 	putc('\n');
 
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) || defined(CONFIG_DM_PCI)
 	/* Check the PCI_clk sel bit */
 	if (in_be32(&gur->porpllsr) & (1<<15)) {
 		src = "SYSCLK";
@@ -126,6 +126,10 @@ int misc_init_r (void)
 			       &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]);
 	}
 
+#if defined(CONFIG_DM_PCI)
+	pci_init();
+#endif
+
 	return 0;
 }
 
@@ -168,40 +172,6 @@ void local_bus_init (void)
 	upmconfig (UPMB, (uint *)UPMTableB, sizeof(UPMTableB)/sizeof(int));
 }
 
-#if defined(CONFIG_PCI)
-/*
- * Initialize PCI Devices, report devices found.
- */
-
-#ifndef CONFIG_PCI_PNP
-static struct pci_config_table pci_mpc85xxads_config_table[] = {
-	{PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
-	 PCI_IDSEL_NUMBER, PCI_ANY_ID,
-	 pci_cfgfunc_config_device, {PCI_ENET0_IOADDR,
-				     PCI_ENET0_MEMADDR,
-				     PCI_COMMAND_MEMORY |
-				     PCI_COMMAND_MASTER}},
-	{}
-};
-#endif
-
-
-static struct pci_controller hose = {
-#ifndef CONFIG_PCI_PNP
-	config_table:pci_mpc85xxads_config_table,
-#endif
-};
-
-#endif /* CONFIG_PCI */
-
-
-void pci_init_board (void)
-{
-#ifdef CONFIG_PCI
-	pci_mpc85xx_init (&hose);
-#endif /* CONFIG_PCI */
-}
-
 #ifdef CONFIG_BOARD_EARLY_INIT_R
 int board_early_init_r (void)
 {
configs/socrates_defconfig +7 -0
index 5bd60e0886..1f4330d86b 100644
@@ -14,6 +14,10 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_REGINFO=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_DM=y
 CONFIG_CMD_I2C=y
@@ -44,6 +48,8 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
+CONFIG_DM_PCI=y
+CONFIG_PCI_MPC85XX=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_RX8025=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
@@ -53,4 +59,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 # CONFIG_USB_EHCI_HCD is not set
+CONFIG_USB_OHCI_PCI=y
 CONFIG_USB_STORAGE=y
include/configs/socrates.h +0 -9
index 7adaa344bc..a03005902f 100644
@@ -19,8 +19,6 @@
 /* High Level Configuration Options */
 #define CONFIG_SOCRATES		1
 
-#define CONFIG_PCI_INDIRECT_BRIDGE
-
 /*
  * Only possible on E500 Version 2 or newer cores.
  */
@@ -156,7 +154,6 @@
  * General PCI
  * Memory space is mapped 1-1.
  */
-#define CONFIG_SYS_PCI_PHYS		0x80000000	/* 1G PCI TLB */
 
 /* PCI is clocked by the external source@33 MHz */
 #define CONFIG_PCI_CLK_FREQ	33000000
@@ -167,10 +164,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS	CONFIG_SYS_PCI1_IO_BASE
 #define CONFIG_SYS_PCI1_IO_SIZE	0x01000000	/* 16M			*/
 
-#if defined(CONFIG_PCI)
-#undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup	*/
-#endif	/* CONFIG_PCI */
-
 #define CONFIG_TSEC1	1
 #define CONFIG_TSEC1_NAME	"TSEC0"
 #define CONFIG_TSEC3	1
@@ -292,8 +285,6 @@
 /* USB support */
 #define CONFIG_USB_OHCI_NEW		1
 #define CONFIG_PCI_OHCI			1
-#define CONFIG_PCI_OHCI_DEVNO		3 /* Number in PCI list */
-#define CONFIG_PCI_EHCI_DEVNO		(CONFIG_PCI_OHCI_DEVNO / 2)
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"ohci_pci"
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS	1
Signature · 1 line
2.21.0
#20 lore raw

v2 cover powerpc: convert socrates board to DM

In reply to Heiko Schocher
Quoted 90 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Heiko Schocher
Sent: Wednesday, October 16, 2019 9:26 AM
To: U-Boot Mailing List <[email protected]>
Subject: [U-Boot] [PATCH v2 0/9] powerpc: convert socrates board to DM

convert the socrates board to use DM.

needed pending PCI patch
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatchwo
rk.ozlabs.org%2Fpatch%2F1176108%2F&amp;data=02%7C01%7Cpriyanka.jain %40nxp.com%7Cd938ac783e094919420008d751eccfd3%7C686ea1d3bc2b4c6fa 92cd99c5c301635%7C0%7C0%7C637067949868856596&amp;sdata=R0csZibE6 UBNyNR7FKQgmLNQ7ABggMirfCsY2Cs6j4c%3D&amp;reserved=0

fixes compiler warnings:
===================== WARNING ====================== This board does not use CONFIG_DM. CONFIG_DM will be compulsory starting with the v2020.01 release.
Failure to update may result in board removal.
See doc/driver-model/migration.rst for more info.
====================================================
===================== WARNING ====================== This board does not use CONFIG_DM_USB. Please update the board to use CONFIG_DM_USB before the v2019.07 release.
Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info.
====================================================
===================== WARNING ====================== This board does not use CONFIG_DM_PCI Please update the board to use CONFIG_DM_PCI before the v2019.07 release.
Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info.
====================================================
===================== WARNING ====================== This board does not use CONFIG_DM_VIDEO Please update the board to use CONFIG_DM_VIDEO before the v2019.07 release.
Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info.
====================================================

Travis build:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftravis-
ci.org%2Fhsdenx%2Fu-boot- test%2Fbuilds%2F597488733&amp;data=02%7C01%7Cpriyanka.jain%40nxp.co m%7Cd938ac783e094919420008d751eccfd3%7C686ea1d3bc2b4c6fa92cd99c5c 301635%7C0%7C0%7C637067949868856596&amp;sdata=nxIa1Ur2OMMZBmFz iCT8lmc%2Bm14CFb29B9dOsucvyas%3D&amp;reserved=0

Changes in v2:
- use separate PCI driver for mpc85xx as Z.q. Hou mentioned:
and drop the patchseries:
pci: pcie_fsl: add support for none PCIe devices

https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatchwo
rk.ozlabs.org%2Fproject%2Fuboot%2Flist%2F%3Fseries%3D134976&amp;data= 02%7C01%7Cpriyanka.jain%40nxp.com%7Cd938ac783e094919420008d751eccf d3%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6370679498688565 96&amp;sdata=hPUIpB%2FRyEQkK94MP3%2F1mB8RNg9FyyL%2Bo0DqDHUQk4 k%3D&amp;reserved=0
END

Heiko Schocher (9):
mpc85xx, socrates: suppress unknown flash warning
mpc85xx: add socrates dts from linux mpc85xx, dts, socrates: add u-boot specific dtsi mpc85xx, socrates: add DM support mpc85xx, socrates: get rid of DM_USB warning mpc85xx, socrates: disable VIDEO
mpc85xx, socrates: enable DM I2C
mpc85xx, socrates: enable DM serial mpc85xx, socrates: add DM PCI support

arch/powerpc/dts/Makefile             |   1 +
arch/powerpc/dts/socrates-u-boot.dtsi |  40 +++
arch/powerpc/dts/socrates.dts         | 349 ++++++++++++++++++++++++++
board/socrates/MAINTAINERS            |   4 +-
board/socrates/law.c                  |   2 -
board/socrates/socrates.c             | 222 ++--------------
configs/socrates_defconfig            |  24 +-
include/configs/socrates.h            |  68 +----
8 files changed, 439 insertions(+), 271 deletions(-)  create mode 100644

arch/powerpc/dts/socrates-u-boot.dtsi
create mode 100644 arch/powerpc/dts/socrates.dts

--
2.21.0

Quoted 9 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.de
nx.de%2Flistinfo%2Fu- boot&amp;data=02%7C01%7Cpriyanka.jain%40nxp.com%7Cd938ac783e09491 9420008d751eccfd3%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63 7067949868856596&amp;sdata=TDp2Uz0QQfscE2sB4H6XQBNA4jT6rguzrximO6 LSfz0%3D&amp;reserved=0

Series applied to mpc85xx master, awaiting upstream.

Thanks
priyankajain