All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/9] GE Board cleanups
@ 2020-11-04 16:18 Sebastian Reichel
  2020-11-04 16:18 ` [PATCH 1/9] board: ge: bx50v3: Update MAINTAINERS Sebastian Reichel
                   ` (8 more replies)
  0 siblings, 9 replies; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

Hi,

This series contains a collection of cleanups and fixes for
the GE boards. They are mostly independent patches, but all
of them just touch the GE boards so I grouped them together:

PATCH 1-3: Update/Create MAINTAINERS files for all GE boards
PATCH 4: Fix regression due to recent device tree change
PATCH 5: Fix NFS config bug for Bx50v3
PATCH 6-7: simple cleanups without functional change
PATCH 8: slightly reduce the valid VPD size in the EEPROM
PATCH 9: support b850v3 watchdog reboot detection

Thanks,

-- Sebastian

Ian Ray (3):
  board: ge: bx50v3: correct CONFIG_CMD_NFS
  board: ge: reduce VPD EEPROM partition size
  board: ge: bx50v3: check b850v3 power management watchdog

Sebastian Reichel (6):
  board: ge: bx50v3: Update MAINTAINERS
  board: ge: ppd: Update MAINTAINERS
  board: ge: b1x5v2: Add MAINTAINERS
  board: ge: common: vpd: fix name
  board: ge: bx50v3: drop unused pinmux defines
  board: ge: bx50v3: reduce magic numbers

 arch/arm/dts/imx53-ppd-uboot.dtsi    |  2 +-
 arch/arm/dts/imx6q-bx50v3-uboot.dtsi |  2 +-
 board/ge/b1x5v2/MAINTAINERS          |  9 +++++
 board/ge/bx50v3/MAINTAINERS          | 11 +++--
 board/ge/bx50v3/bx50v3.c             | 60 +++++++++++-----------------
 board/ge/common/vpd_reader.c         |  2 +-
 board/ge/mx53ppd/MAINTAINERS         | 10 +++--
 include/configs/ge_bx50v3.h          |  8 ++--
 8 files changed, 53 insertions(+), 51 deletions(-)
 create mode 100644 board/ge/b1x5v2/MAINTAINERS

-- 
2.28.0

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 1/9] board: ge: bx50v3: Update MAINTAINERS
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-11-04 16:18 ` [PATCH 2/9] board: ge: ppd: " Sebastian Reichel
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

This updates the Bx50v3 MAINTAINERS file, so that it also catches
changes to the related device tree files. Additionally the list of
files has been sorted alphabetically and I added myself as maintainer.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 board/ge/bx50v3/MAINTAINERS | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/board/ge/bx50v3/MAINTAINERS b/board/ge/bx50v3/MAINTAINERS
index 91d5c86013b0..fafbd78c2a06 100644
--- a/board/ge/bx50v3/MAINTAINERS
+++ b/board/ge/bx50v3/MAINTAINERS
@@ -1,9 +1,14 @@
-GE_BX50V3 BOARD
+GE BX50V3 BOARD
 M:	Ian Ray <ian.ray@ge.com>
+M:	Sebastian Reichel <sebastian.reichel@collabora.com>
 S:	Maintained
+F:	arch/arm/dts/imx6q-b450v3.dts
+F:	arch/arm/dts/imx6q-b650v3.dts
+F:	arch/arm/dts/imx6q-b850v3.dts
+F:	arch/arm/dts/imx6q-bx50v3*
 F:	board/ge/bx50v3/
-F:	include/configs/ge_bx50v3.h
-F:	configs/ge_bx50v3_defconfig
 F:	configs/ge_b450v3_defconfig
 F:	configs/ge_b650v3_defconfig
 F:	configs/ge_b850v3_defconfig
+F:	configs/ge_bx50v3_defconfig
+F:	include/configs/ge_bx50v3.h
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 2/9] board: ge: ppd: Update MAINTAINERS
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
  2020-11-04 16:18 ` [PATCH 1/9] board: ge: bx50v3: Update MAINTAINERS Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-11-05  9:12   ` Martyn Welch
  2020-11-04 16:18 ` [PATCH 3/9] board: ge: b1x5v2: Add MAINTAINERS Sebastian Reichel
                   ` (6 subsequent siblings)
  8 siblings, 1 reply; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

This updates the PPD MAINTAINERS file doing a couple of changes:

 * Replace Martyn with myself, since he no longer has the hardware
   available and add Ian Ray as maintainer
 * Fix the board directory path, which was still listing freescale/
   instead of ge/
 * Order the list of files alphabetically
 * Add board specific device tree files to the file list

Cc: Martyn Welch <martyn.welch@collabora.com>
Cc: Ian Ray <ian.ray@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 board/ge/mx53ppd/MAINTAINERS | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/board/ge/mx53ppd/MAINTAINERS b/board/ge/mx53ppd/MAINTAINERS
index 9b64b5d3893a..2c06c8ee86c9 100644
--- a/board/ge/mx53ppd/MAINTAINERS
+++ b/board/ge/mx53ppd/MAINTAINERS
@@ -1,7 +1,9 @@
-MX53PPD BOARD
+GE PPD BOARD
 M:	Antti M?entausta <antti.maentausta@ge.com>
-M:	Martyn Welch <martyn.welch@collabora.co.uk>
+M:	Ian Ray <ian.ray@ge.com>
+M:	Sebastian Reichel <sebastian.reichel@collabora.com>
 S:	Maintained
-F:	board/freescale/mx53ppd/
-F:	include/configs/mx53ppd.h
+F:	arch/arm/dts/imx53-ppd*
+F:	board/ge/mx53ppd/
 F:	configs/mx53ppd_defconfig
+F:	include/configs/mx53ppd.h
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 3/9] board: ge: b1x5v2: Add MAINTAINERS
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
  2020-11-04 16:18 ` [PATCH 1/9] board: ge: bx50v3: Update MAINTAINERS Sebastian Reichel
  2020-11-04 16:18 ` [PATCH 2/9] board: ge: ppd: " Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-11-04 16:18 ` [PATCH 4/9] board: ge: common: vpd: fix name Sebastian Reichel
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

Introduce maintainers file for the GE B1x5 board.

Cc: Huan 'Kitty' Wang <HuanWang@ge.com>
Cc: Ian Ray <ian.ray@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 board/ge/b1x5v2/MAINTAINERS | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 board/ge/b1x5v2/MAINTAINERS

diff --git a/board/ge/b1x5v2/MAINTAINERS b/board/ge/b1x5v2/MAINTAINERS
new file mode 100644
index 000000000000..f22d49283559
--- /dev/null
+++ b/board/ge/b1x5v2/MAINTAINERS
@@ -0,0 +1,9 @@
+GE B1X5V2 BOARD
+M:	Huan 'Kitty' Wang <HuanWang@ge.com>
+M:	Ian Ray <ian.ray@ge.com>
+M:	Sebastian Reichel <sebastian.reichel@collabora.com>
+S:	Maintained
+F:	arch/arm/dts/imx6dl-b1x5v2.dts
+F:	board/ge/b1x5v2/
+F:	configs/ge_b1x5v2_defconfig
+F:	include/configs/ge_b1x5v2.h
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 4/9] board: ge: common: vpd: fix name
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
                   ` (2 preceding siblings ...)
  2020-11-04 16:18 ` [PATCH 3/9] board: ge: b1x5v2: Add MAINTAINERS Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-12-08  8:00   ` sbabic at denx.de
  2020-11-04 16:18 ` [PATCH 5/9] board: ge: bx50v3: correct CONFIG_CMD_NFS Sebastian Reichel
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

Commit f692b479f02d changed the VPD partition name from "vpd" to
"vpd at 0". Fix the VPD reader code to use the new name, so that
the VPD code keeps working.

Fixes: f692b479f02d ("i2c: eeprom: Use reg property instead of offset and size")
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 board/ge/common/vpd_reader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/ge/common/vpd_reader.c b/board/ge/common/vpd_reader.c
index 421fee592291..c28d2c03cfeb 100644
--- a/board/ge/common/vpd_reader.c
+++ b/board/ge/common/vpd_reader.c
@@ -209,7 +209,7 @@ int read_i2c_vpd(struct vpd_cache *cache,
 	u8 *data;
 	int size;
 
-	ret = uclass_get_device_by_name(UCLASS_I2C_EEPROM, "vpd", &dev);
+	ret = uclass_get_device_by_name(UCLASS_I2C_EEPROM, "vpd at 0", &dev);
 	if (ret)
 		return ret;
 
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 5/9] board: ge: bx50v3: correct CONFIG_CMD_NFS
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
                   ` (3 preceding siblings ...)
  2020-11-04 16:18 ` [PATCH 4/9] board: ge: common: vpd: fix name Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-12-08  8:00   ` sbabic at denx.de
  2020-11-04 16:18 ` [PATCH 6/9] board: ge: bx50v3: drop unused pinmux defines Sebastian Reichel
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

From: Ian Ray <ian.ray@ge.com>

Fix typo in NFS command configuration check.

Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 include/configs/ge_bx50v3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 4fdc2b659626..c328a12ce172 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -48,7 +48,7 @@
 
 #define CONFIG_LOADADDR	0x12000000
 
-#ifdef CONFIG_NFS_CMD
+#ifdef CONFIG_CMD_NFS
 #define NETWORKBOOT \
         "setnetworkboot=" \
                 "setenv ipaddr 172.16.2.10; setenv serverip 172.16.2.20; " \
@@ -130,7 +130,7 @@
 #define CONFIG_USBBOOTCOMMAND \
 	"echo Unsupported; " \
 
-#ifdef CONFIG_NFS_CMD
+#ifdef CONFIG_CMD_NFS
 #define CONFIG_BOOTCOMMAND CONFIG_NETWORKBOOTCOMMAND
 #elif CONFIG_CMD_USB
 #define CONFIG_BOOTCOMMAND CONFIG_USBBOOTCOMMAND
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 6/9] board: ge: bx50v3: drop unused pinmux defines
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
                   ` (4 preceding siblings ...)
  2020-11-04 16:18 ` [PATCH 5/9] board: ge: bx50v3: correct CONFIG_CMD_NFS Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-12-08  7:59   ` sbabic at denx.de
  2020-11-04 16:18 ` [PATCH 7/9] board: ge: bx50v3: reduce magic numbers Sebastian Reichel
                   ` (2 subsequent siblings)
  8 siblings, 1 reply; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

Remove pinmux defines, that are no longer used after
converting the code to devicetree.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 board/ge/bx50v3/bx50v3.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 8a38ac5d4e4c..5ad265af8a72 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -50,21 +50,6 @@ static struct vpd_cache vpd;
 	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |	\
 	PAD_CTL_HYS)
 
-#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP | PAD_CTL_PUE |	\
-	PAD_CTL_SPEED_HIGH | PAD_CTL_DSE_48ohm | PAD_CTL_SRE_FAST)
-
-#define ENET_CLK_PAD_CTRL (PAD_CTL_SPEED_MED | \
-	PAD_CTL_DSE_120ohm | PAD_CTL_SRE_FAST)
-
-#define ENET_RX_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
-	PAD_CTL_SPEED_HIGH   | PAD_CTL_SRE_FAST)
-
-#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
-	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |	\
-	PAD_CTL_ODE | PAD_CTL_SRE_FAST)
-
-#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
-
 int dram_init(void)
 {
 	gd->ram_size = imx_ddr_size();
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 7/9] board: ge: bx50v3: reduce magic numbers
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
                   ` (5 preceding siblings ...)
  2020-11-04 16:18 ` [PATCH 6/9] board: ge: bx50v3: drop unused pinmux defines Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-12-08  7:59   ` sbabic at denx.de
  2020-11-04 16:18 ` [PATCH 8/9] board: ge: reduce VPD EEPROM partition size Sebastian Reichel
  2020-11-04 16:18 ` [PATCH 9/9] board: ge: bx50v3: check b850v3 power management watchdog Sebastian Reichel
  8 siblings, 1 reply; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

Use VPD product ID instead of confidx, so that we can easily reuse the
product ID defines and avoid some magic numbers.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 board/ge/bx50v3/bx50v3.c | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 5ad265af8a72..8e7b90a10c76 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -43,7 +43,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int confidx;  /* Default to generic. */
+#define VPD_PRODUCT_B850 1
+#define VPD_PRODUCT_B650 2
+#define VPD_PRODUCT_B450 3
+
+static int productid;  /* Default to generic. */
 static struct vpd_cache vpd;
 
 #define NC_PAD_CTRL (PAD_CTL_PUS_100K_UP |	\
@@ -112,7 +116,7 @@ static void do_enable_hdmi(struct display_info_t const *dev)
 
 static int is_b850v3(void)
 {
-	return confidx == 3;
+	return productid == VPD_PRODUCT_B850;
 }
 
 static int detect_lcd(struct display_info_t const *dev)
@@ -299,9 +303,6 @@ int overwrite_console(void)
 #define VPD_TYPE_INVALID 0x00
 #define VPD_BLOCK_NETWORK 0x20
 #define VPD_BLOCK_HWID 0x44
-#define VPD_PRODUCT_B850 1
-#define VPD_PRODUCT_B650 2
-#define VPD_PRODUCT_B450 3
 #define VPD_HAS_MAC1 0x1
 #define VPD_HAS_MAC2 0x2
 #define VPD_MAC_ADDRESS_LENGTH 6
@@ -397,28 +398,13 @@ int board_early_init_f(void)
 	return 0;
 }
 
-static void set_confidx(const struct vpd_cache* vpd)
-{
-	switch (vpd->product_id) {
-	case VPD_PRODUCT_B450:
-		confidx = 1;
-		break;
-	case VPD_PRODUCT_B650:
-		confidx = 2;
-		break;
-	case VPD_PRODUCT_B850:
-		confidx = 3;
-		break;
-	}
-}
-
 int board_init(void)
 {
 	if (!read_i2c_vpd(&vpd, vpd_callback)) {
 		int ret, rescan;
 
 		vpd.is_read = true;
-		set_confidx(&vpd);
+		productid = vpd.product_id;
 
 		ret = fdtdec_resetup(&rescan);
 		if (!ret && rescan) {
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 8/9] board: ge: reduce VPD EEPROM partition size
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
                   ` (6 preceding siblings ...)
  2020-11-04 16:18 ` [PATCH 7/9] board: ge: bx50v3: reduce magic numbers Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-12-08  7:59   ` sbabic at denx.de
  2020-11-04 16:18 ` [PATCH 9/9] board: ge: bx50v3: check b850v3 power management watchdog Sebastian Reichel
  8 siblings, 1 reply; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

From: Ian Ray <ian.ray@ge.com>

Reduce vital product data size to match the latest specification.

Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 arch/arm/dts/imx53-ppd-uboot.dtsi    | 2 +-
 arch/arm/dts/imx6q-bx50v3-uboot.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/imx53-ppd-uboot.dtsi b/arch/arm/dts/imx53-ppd-uboot.dtsi
index d61b7cb87642..b293e27a03ca 100644
--- a/arch/arm/dts/imx53-ppd-uboot.dtsi
+++ b/arch/arm/dts/imx53-ppd-uboot.dtsi
@@ -28,7 +28,7 @@
 		#size-cells = <1>;
 
 		vpd at 0 {
-			reg = <0 1022>;
+			reg = <0 800>;
 		};
 
 		bootcount: bootcount at 1022 {
diff --git a/arch/arm/dts/imx6q-bx50v3-uboot.dtsi b/arch/arm/dts/imx6q-bx50v3-uboot.dtsi
index 01321cab781b..2de3b850ec8a 100644
--- a/arch/arm/dts/imx6q-bx50v3-uboot.dtsi
+++ b/arch/arm/dts/imx6q-bx50v3-uboot.dtsi
@@ -27,7 +27,7 @@
 		#size-cells = <1>;
 
 		vpd at 0 {
-			reg = <0 1022>;
+			reg = <0 800>;
 		};
 
 		bootcount: bootcount {
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 9/9] board: ge: bx50v3: check b850v3 power management watchdog
  2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
                   ` (7 preceding siblings ...)
  2020-11-04 16:18 ` [PATCH 8/9] board: ge: reduce VPD EEPROM partition size Sebastian Reichel
@ 2020-11-04 16:18 ` Sebastian Reichel
  2020-12-08  7:59   ` sbabic at denx.de
  8 siblings, 1 reply; 17+ messages in thread
From: Sebastian Reichel @ 2020-11-04 16:18 UTC (permalink / raw)
  To: u-boot

From: Ian Ray <ian.ray@ge.com>

Set `bootcause' from b850v3 power management watchdog status.

Boot cause "REVERT" is no longer used, remove it.

Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 board/ge/bx50v3/bx50v3.c    | 17 +++++++++++++++++
 include/configs/ge_bx50v3.h |  4 +---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 8e7b90a10c76..4754647fb4ad 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -384,6 +384,7 @@ static iomux_v3_cfg_t const misc_pads[] = {
 	MX6_PAD_GPIO_9__WDOG1_B         | MUX_PAD_CTRL(NC_PAD_CTRL),
 };
 #define SUS_S3_OUT	IMX_GPIO_NR(4, 11)
+#define PWGIN_IN	IMX_GPIO_NR(4, 14)
 #define WIFI_EN	IMX_GPIO_NR(6, 14)
 
 int board_early_init_f(void)
@@ -416,6 +417,9 @@ int board_init(void)
 	gpio_request(SUS_S3_OUT, "sus_s3_out");
 	gpio_direction_output(SUS_S3_OUT, 1);
 
+	gpio_request(PWGIN_IN, "pwgin_in");
+	gpio_direction_input(PWGIN_IN);
+
 	gpio_request(WIFI_EN, "wifi_en");
 	gpio_direction_output(WIFI_EN, 1);
 
@@ -465,6 +469,17 @@ void pmic_init(void)
 	}
 }
 
+static void detect_boot_cause(void)
+{
+	const char *cause = "POR";
+
+	if (is_b850v3())
+		if (!gpio_get_value(PWGIN_IN))
+			cause = "PM_WDOG";
+
+	env_set("bootcause", cause);
+}
+
 int board_late_init(void)
 {
 	process_vpd(&vpd);
@@ -478,6 +493,8 @@ int board_late_init(void)
 	else
 		env_set("videoargs", "video=LVDS-1:1024x768 at 65");
 
+	detect_boot_cause();
+
 	/* board specific pmic init */
 	pmic_init();
 
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index c328a12ce172..e5c580b3f910 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -56,7 +56,7 @@
                 "setenv netmask 255.255.255.0; setenv ethaddr ca:fe:de:ca:f0:11; " \
                 "setenv bootargs root=/dev/nfs nfsroot=${nfsserver}:/srv/nfs/,v3,tcp rw rootwait" \
                 "setenv bootargs $bootargs ip=${ipaddr}:${nfsserver}:${gatewayip}:${netmask}::eth0:off " \
-                "setenv bootargs $bootargs cma=128M bootcause=POR ${videoargs} " \
+                "setenv bootargs $bootargs cma=128M bootcause=${bootcause} ${videoargs} " \
                 "setenv bootargs $bootargs systemd.mask=helix-network-defaults.service " \
                 "setenv bootargs $bootargs watchdog.handle_boot_enabled=1\0" \
         "networkboot=" \
@@ -74,7 +74,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	NETWORKBOOT \
-	"bootcause=POR\0" \
 	"image=/boot/fitImage\0" \
 	"dev=mmc\0" \
 	"devnum=2\0" \
@@ -104,7 +103,6 @@
 		"setenv partnum 1; run hasfirstboot || setenv partnum 2; " \
 		"run hasfirstboot || setenv partnum 0; " \
 		"if test ${partnum} != 0; then " \
-			"setenv bootcause REVERT; " \
 			"run swappartitions loadimage doboot; " \
 		"fi; " \
 		"run failbootcmd\0" \
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 2/9] board: ge: ppd: Update MAINTAINERS
  2020-11-04 16:18 ` [PATCH 2/9] board: ge: ppd: " Sebastian Reichel
@ 2020-11-05  9:12   ` Martyn Welch
  0 siblings, 0 replies; 17+ messages in thread
From: Martyn Welch @ 2020-11-05  9:12 UTC (permalink / raw)
  To: u-boot

On Wed, 2020-11-04 at 17:18 +0100, Sebastian Reichel wrote:
> This updates the PPD MAINTAINERS file doing a couple of changes:
> 
>  * Replace Martyn with myself, since he no longer has the hardware
>    available and add Ian Ray as maintainer
>  * Fix the board directory path, which was still listing freescale/
>    instead of ge/
>  * Order the list of files alphabetically
>  * Add board specific device tree files to the file list
> 
> Cc: Martyn Welch <martyn.welch@collabora.com>
> Cc: Ian Ray <ian.ray@ge.com>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Acked-by: Martyn Welch <martyn.welch@collabora.com>

> ---
>  board/ge/mx53ppd/MAINTAINERS | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/board/ge/mx53ppd/MAINTAINERS
> b/board/ge/mx53ppd/MAINTAINERS
> index 9b64b5d3893a..2c06c8ee86c9 100644
> --- a/board/ge/mx53ppd/MAINTAINERS
> +++ b/board/ge/mx53ppd/MAINTAINERS
> @@ -1,7 +1,9 @@
> -MX53PPD BOARD
> +GE PPD BOARD
>  M:	Antti M?entausta <antti.maentausta@ge.com>
> -M:	Martyn Welch <martyn.welch@collabora.co.uk>
> +M:	Ian Ray <ian.ray@ge.com>
> +M:	Sebastian Reichel <sebastian.reichel@collabora.com>
>  S:	Maintained
> -F:	board/freescale/mx53ppd/
> -F:	include/configs/mx53ppd.h
> +F:	arch/arm/dts/imx53-ppd*
> +F:	board/ge/mx53ppd/
>  F:	configs/mx53ppd_defconfig
> +F:	include/configs/mx53ppd.h

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 9/9] board: ge: bx50v3: check b850v3 power management watchdog
  2020-11-04 16:18 ` [PATCH 9/9] board: ge: bx50v3: check b850v3 power management watchdog Sebastian Reichel
@ 2020-12-08  7:59   ` sbabic at denx.de
  0 siblings, 0 replies; 17+ messages in thread
From: sbabic at denx.de @ 2020-12-08  7:59 UTC (permalink / raw)
  To: u-boot

> From: Ian Ray <ian.ray@ge.com>
> Set `bootcause' from b850v3 power management watchdog status.
> Boot cause "REVERT" is no longer used, remove it.
> Signed-off-by: Ian Ray <ian.ray@ge.com>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 7/9] board: ge: bx50v3: reduce magic numbers
  2020-11-04 16:18 ` [PATCH 7/9] board: ge: bx50v3: reduce magic numbers Sebastian Reichel
@ 2020-12-08  7:59   ` sbabic at denx.de
  0 siblings, 0 replies; 17+ messages in thread
From: sbabic at denx.de @ 2020-12-08  7:59 UTC (permalink / raw)
  To: u-boot

> Use VPD product ID instead of confidx, so that we can easily reuse the
> product ID defines and avoid some magic numbers.
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 8/9] board: ge: reduce VPD EEPROM partition size
  2020-11-04 16:18 ` [PATCH 8/9] board: ge: reduce VPD EEPROM partition size Sebastian Reichel
@ 2020-12-08  7:59   ` sbabic at denx.de
  0 siblings, 0 replies; 17+ messages in thread
From: sbabic at denx.de @ 2020-12-08  7:59 UTC (permalink / raw)
  To: u-boot

> From: Ian Ray <ian.ray@ge.com>
> Reduce vital product data size to match the latest specification.
> Signed-off-by: Ian Ray <ian.ray@ge.com>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 6/9] board: ge: bx50v3: drop unused pinmux defines
  2020-11-04 16:18 ` [PATCH 6/9] board: ge: bx50v3: drop unused pinmux defines Sebastian Reichel
@ 2020-12-08  7:59   ` sbabic at denx.de
  0 siblings, 0 replies; 17+ messages in thread
From: sbabic at denx.de @ 2020-12-08  7:59 UTC (permalink / raw)
  To: u-boot

> Remove pinmux defines, that are no longer used after
> converting the code to devicetree.
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 5/9] board: ge: bx50v3: correct CONFIG_CMD_NFS
  2020-11-04 16:18 ` [PATCH 5/9] board: ge: bx50v3: correct CONFIG_CMD_NFS Sebastian Reichel
@ 2020-12-08  8:00   ` sbabic at denx.de
  0 siblings, 0 replies; 17+ messages in thread
From: sbabic at denx.de @ 2020-12-08  8:00 UTC (permalink / raw)
  To: u-boot

> From: Ian Ray <ian.ray@ge.com>
> Fix typo in NFS command configuration check.
> Signed-off-by: Ian Ray <ian.ray@ge.com>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 4/9] board: ge: common: vpd: fix name
  2020-11-04 16:18 ` [PATCH 4/9] board: ge: common: vpd: fix name Sebastian Reichel
@ 2020-12-08  8:00   ` sbabic at denx.de
  0 siblings, 0 replies; 17+ messages in thread
From: sbabic at denx.de @ 2020-12-08  8:00 UTC (permalink / raw)
  To: u-boot

> Commit f692b479f02d changed the VPD partition name from "vpd" to
> "vpd at 0". Fix the VPD reader code to use the new name, so that
> the VPD code keeps working.
> Fixes: f692b479f02d ("i2c: eeprom: Use reg property instead of offset and size")
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

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

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2020-12-08  8:00 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-04 16:18 [PATCH 0/9] GE Board cleanups Sebastian Reichel
2020-11-04 16:18 ` [PATCH 1/9] board: ge: bx50v3: Update MAINTAINERS Sebastian Reichel
2020-11-04 16:18 ` [PATCH 2/9] board: ge: ppd: " Sebastian Reichel
2020-11-05  9:12   ` Martyn Welch
2020-11-04 16:18 ` [PATCH 3/9] board: ge: b1x5v2: Add MAINTAINERS Sebastian Reichel
2020-11-04 16:18 ` [PATCH 4/9] board: ge: common: vpd: fix name Sebastian Reichel
2020-12-08  8:00   ` sbabic at denx.de
2020-11-04 16:18 ` [PATCH 5/9] board: ge: bx50v3: correct CONFIG_CMD_NFS Sebastian Reichel
2020-12-08  8:00   ` sbabic at denx.de
2020-11-04 16:18 ` [PATCH 6/9] board: ge: bx50v3: drop unused pinmux defines Sebastian Reichel
2020-12-08  7:59   ` sbabic at denx.de
2020-11-04 16:18 ` [PATCH 7/9] board: ge: bx50v3: reduce magic numbers Sebastian Reichel
2020-12-08  7:59   ` sbabic at denx.de
2020-11-04 16:18 ` [PATCH 8/9] board: ge: reduce VPD EEPROM partition size Sebastian Reichel
2020-12-08  7:59   ` sbabic at denx.de
2020-11-04 16:18 ` [PATCH 9/9] board: ge: bx50v3: check b850v3 power management watchdog Sebastian Reichel
2020-12-08  7:59   ` sbabic at denx.de

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.