From: Tom Rini <trini@konsulko.com>
Date: Fri, 25 Jul 2025 13:50:44 +0000 (-0600)
Subject: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-samsung
X-Git-Tag: v2025.10-rc1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=088d24eb96fb8ba64e3afee310a9f32ee36c22b0;p=thirdparty%2Fu-boot.git

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-samsung

- Enhanced e850-96 support
---

088d24eb96fb8ba64e3afee310a9f32ee36c22b0
diff --cc board/samsung/e850-96/e850-96.c
index 4d4f8d14c6d,4e034b9bd3b..a6c264d1248
--- a/board/samsung/e850-96/e850-96.c
+++ b/board/samsung/e850-96/e850-96.c
@@@ -17,6 -65,38 +65,33 @@@ int dram_init_banksize(void
  	return fdtdec_setup_memory_banksize();
  }
  
+ /* Read the unique SoC ID from OTP registers */
+ static u64 get_chip_id(void)
+ {
+ 	void __iomem *otp_base;
+ 	u64 val;
+ 
+ 	otp_base = map_sysmem(EXYNOS850_OTP_BASE, 12);
+ 	val = readl(otp_base + OTP_CHIPID0);
+ 	val |= (u64)readl(otp_base + OTP_CHIPID1) << 32UL;
+ 	unmap_sysmem(otp_base);
+ 
+ 	return val;
+ }
+ 
+ static void setup_serial(void)
+ {
+ 	char serial_str[17] = { 0 };
+ 	u64 serial_num;
+ 
+ 	if (env_get("serial#"))
+ 		return;
+ 
+ 	serial_num = get_chip_id();
+ 	snprintf(serial_str, sizeof(serial_str), "%016llx", serial_num);
+ 	env_set("serial#", serial_str);
+ }
+ 
 -int board_init(void)
 -{
 -	return 0;
 -}
 -
  int board_late_init(void)
  {
  	int err;