Merge branch 'master' of git://git.denx.de/u-boot-ubi
diff --git a/common/board_f.c b/common/board_f.c
index 213d044..afafec5 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -11,7 +11,6 @@
#include <common.h>
#include <console.h>
-#include <cpu.h>
#include <dm.h>
#include <environment.h>
#include <fdtdec.h>
@@ -166,33 +165,6 @@
}
#endif
-#if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU)
-static int print_cpuinfo(void)
-{
- struct udevice *dev;
- char desc[512];
- int ret;
-
- ret = uclass_first_device_err(UCLASS_CPU, &dev);
- if (ret) {
- debug("%s: Could not get CPU device (err = %d)\n",
- __func__, ret);
- return ret;
- }
-
- ret = cpu_get_desc(dev, desc, sizeof(desc));
- if (ret) {
- debug("%s: Could not get CPU description (err = %d)\n",
- dev->name, ret);
- return ret;
- }
-
- printf("%s", desc);
-
- return 0;
-}
-#endif
-
static int announce_dram_init(void)
{
puts("DRAM: ");
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index 1588416..a45f3ba 100644
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -6,6 +6,7 @@
CONFIG_TARGET_IMX8QXP_MEK=y
CONFIG_NR_DRAM_BANKS=3
CONFIG_BOOTDELAY=3
+# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_CMD_CPU=y
# CONFIG_CMD_IMPORTENV is not set
CONFIG_CMD_CLK=y
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 98411c4..864f322 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -290,6 +290,8 @@
#define CONFIG_SPL_BSS_START_ADDR 0x100000
#define CONFIG_SPL_BSS_MAX_SIZE 0x100000
+#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000
+
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
#endif /* __CONFIG_ZYNQ_COMMON_H */
diff --git a/include/init.h b/include/init.h
index afc953d..a58d7a6 100644
--- a/include/init.h
+++ b/include/init.h
@@ -109,14 +109,7 @@
*/
int init_cache_f_r(void);
-#if !CONFIG_IS_ENABLED(CPU)
-/**
- * print_cpuinfo() - Display information about the CPU
- *
- * Return: 0 if OK, -ve on error
- */
int print_cpuinfo(void);
-#endif
int timer_init(void);
int reserve_mmu(void);
int misc_init_f(void);