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

- Enhanced e850-96 support

diff --cc board/samsung/e850-96/e850-96.c
index 4d4f8d14c6defcc2783c09e1faee43a8d0a5758e,4e034b9bd3be63deab774e0f14e2a4b7cdcea7ed..a6c264d124816a082b10a65624a0e46d6de3bee7
--- 1/board/samsung/e850-96/e850-96.c
--- 2/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();
  }
  
 -int board_init(void)
 -{
 -      return 0;
 -}
 -
+ /* 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_late_init(void)
  {
        int err;

diff --cc configs/e850-96_defconfig
Simple merge