- fix DRAM bank detection for unified binary

- fix 32bit RPi4 config
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAl3w+BwSHG1icnVnZ2Vy
 QHN1c2UuY29tAAoJEC9tfk32wqh+NN0P/12PTurFaiQqBWg27iysIwON9McHpUgU
 UvhE/iEgcu6ZOnByElQGda7077zw9pp1toNUd8TvCYhPb1JRN+njd0ALk2k04NRu
 C1s11fbm+SVe7Dizn8PQcJda/efk8vo68jlRVGKPcrH51P+iIvgi5J8K96EQcef5
 zPrQkRUyYP2ucXvvyKbax+B6n7xBSo7dF3psUP+xDSOZkBvxmoWd2QAplRPpJ8/D
 A0FfXSSt89mnCkBvanY7h1B9GGIh7hpJvFK5SJ9SaZbV5q/Z8AaOEFc3Q7q38CKN
 JRlkb5ZHIQ5rTmlww9xU7Ey5YSR3lfE7DmFx7cmw0NLXH14uAnUzVzEVoMPvLV9q
 gT8ueVXI8wLX+0oohAsDKxhCXCZOOKrTPPC967CPyxr+FsJf7WWP3aFmpCoS4lx4
 h2DnZjAurXByYaTejfZL+4bWVYBN5Sk3KGdq5vUyap5iwhqczUDREdkmMnoSYAcv
 pVjhwcl5V+kcdNXji4/1TLQqa3N6JZZRJFNNiYoyBw+b53V2NY5xqCT8BR+xX7Hm
 UypPhIos3lO6pM0kyneQe9RohMD0PR9S6ZsLKh39Mzh30cDcKYXTmnEpy+m+Bqah
 RiVd2ZvhA9Xo4LPLusK3n2hqmRvV0Xmpm78ebQmBFqvgJXM7rK8Qeq4ymQybLX6N
 BgTglX6j5zMw
 =nS+n
 -----END PGP SIGNATURE-----

Merge tag 'rpi-next-2020.01.2' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi

- fix DRAM bank detection for unified binary
- fix 32bit RPi4 config

board/raspberrypi/rpi/rpi.c

@@ -272,14 +272,17 @@ int dram_init(void)
 }
 
 #ifdef CONFIG_OF_BOARD
-#ifdef CONFIG_BCM2711
 int dram_init_banksize(void)
 {
-	return fdtdec_decode_ram_size(gd->fdt_blob, NULL, 0, NULL,
-				     (phys_size_t *)&gd->ram_size, gd->bd);
+	int ret;
+
+	ret = fdtdec_setup_memory_banksize();
+	if (ret)
+		return ret;
+
+	return fdtdec_setup_mem_size_base();
 }
 #endif
-#endif
 
 static void set_fdtfile(void)
 {

configs/rpi_4_32b_defconfig

@@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00008000
 CONFIG_TARGET_RPI_4_32B=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x4000
-CONFIG_NR_DRAM_BANKS=1
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set