[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2024.01, updated. 8a9dd3daac182fef6e0269c2638563691c7b165e

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2024.01 has been updated
       via  8a9dd3daac182fef6e0269c2638563691c7b165e (commit)
       via  bff5df380a0f14937884be2319490f59b2d4f233 (commit)
      from  f51bdc96fb8cb505757c0ec1c87d002e7a8532ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a9dd3daac182fef6e0269c2638563691c7b165e
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Jun 7 13:15:44 2024 +0200

    ARM: imx9: opos93: use default when in Serial Downloader mode

commit bff5df380a0f14937884be2319490f59b2d4f233
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Jun 7 12:54:55 2024 +0200

    ARM: imx9: handle env when booting via in Serial Downloader mode

-----------------------------------------------------------------------

Summary of changes:
 arch/arm/mach-imx/imx9/opos93.c      | 17 +++++++++++++++++
 arch/arm/mach-imx/imx9/soc.c         | 14 ++++++++++++++
 board/armadeus/opos93dev/opos93dev.c | 24 ------------------------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/arch/arm/mach-imx/imx9/opos93.c b/arch/arm/mach-imx/imx9/opos93.c
index 26a5ee56a5..9ffb23b7b6 100644
--- a/arch/arm/mach-imx/imx9/opos93.c
+++ b/arch/arm/mach-imx/imx9/opos93.c
@@ -52,6 +52,23 @@ int board_init(void)
 	return 0;
 }
 
+int __weak opos93_board_late_init(void)
+{
+        return 0;
+}
+
+int board_late_init(void)
+{
+	enum boot_device dev = get_boot_device();
+
+	if (dev == USB_BOOT) {
+		env_set_default(NULL, 0);
+		env_set("preboot", "");
+	}
+
+	return opos93_board_late_init();
+}
+
 #ifdef CONFIG_SPL_BUILD
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 86b45be3d8..bf03764e11 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -605,6 +605,20 @@ enum env_location env_get_location(enum env_operation op, int prio)
 		return ENVL_UNKNOWN;
 
 	switch (dev) {
+	case USB_BOOT:
+		if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
+			return ENVL_SPI_FLASH;
+		if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND))
+			return ENVL_NAND;
+		if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC))
+			return ENVL_MMC;
+		if (CONFIG_IS_ENABLED(ENV_IS_IN_EXT4))
+			return ENVL_EXT4;
+		if (CONFIG_IS_ENABLED(ENV_IS_IN_FAT))
+			return ENVL_FAT;
+		if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE))
+			return ENVL_NOWHERE;
+		return ENVL_UNKNOWN;
 	case QSPI_BOOT:
 		if (CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH))
 			return ENVL_SPI_FLASH;
diff --git a/board/armadeus/opos93dev/opos93dev.c b/board/armadeus/opos93dev/opos93dev.c
index b61dd07727..88ebc7c4e9 100644
--- a/board/armadeus/opos93dev/opos93dev.c
+++ b/board/armadeus/opos93dev/opos93dev.c
@@ -3,27 +3,3 @@
 // Copyright 2023 Armadeus Systems <co...@ar...>
 //
 
-#include <common.h>
-#include <env.h>
-#include <init.h>
-#include <miiphy.h>
-#include <netdev.h>
-#include <asm/global_data.h>
-#include <asm/arch-imx9/ccm_regs.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch-imx9/imx93_pins.h>
-#include <asm/arch/clock.h>
-#include <power/pmic.h>
-#include <dm/device.h>
-#include <dm/uclass.h>
-#include <usb.h>
-#include <dwc3-uboot.h>
-
-int board_late_init(void)
-{
-#ifdef CONFIG_ENV_IS_IN_MMC
-	//board_late_mmc_env_init();
-#endif
-
-	return 0;
-}


hooks/post-receive
-- 
armadeus/u-boot