zynq: Make CONFIG_OF_EMBED default case

Use embedded DTB to let users use u-boot instead of u-boot-dtb.bin.
And fix SPL to use this target.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index c878924c70de2b707b7b206350d121213ab268e4..129faf4f2cd7a250eba3f680a5b8abf4bb664fa7 100644 (file)
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -10,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index af77a9d9d34549f00c1590e774a9558ec89c973e..62be59be22c087f1114e41fdb43586e89c367e21 100644 (file)
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index c7faee78da9a5a884b4c67717c6bd46d1c9c128d..2aba08f5251d22664497fb2f3ffeb50595d29ae9 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -9,3 +9,4 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 0f96d16c080ca86ccbc7746cb54a352aa9ab0f9f..db11e6fe5b2050ad7c00ecc0fcaad231fbfc4f92 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -10,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index 525c538b983411cbd3a39c5d7c3dbd16c7b42439..abb02b1349f734a54e3413e02b157f6cffeebda6 100644 (file)
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -10,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index f1fc283036000153ac393375d0694dad3b1883f6..52511a759aee316082d791ffd379e466b1f30f35 100644 (file)
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -11,4 +11,5 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
index 8f9221db85e3cda1c163d1c8e017b14c14ba8a54..cae8fe0504d9863bde492fa4c6c2209f8ecafa2c 100644 (file)
--- a/configs/zynq_zc770_xm011_defconfig
+++ b/configs/zynq_zc770_xm011_defconfig
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 73ed13d9be8ac2e2d813d1df6e180e1c9b5dbaa3..4361bf787589d1121311dc64587173149c543884 100644 (file)
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -9,3 +9,4 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 211a41d91a56174c9b23ef34a1184a5df715ee31..8f10d325a50c6070ca4137f8856970bb3ae49bae 100644 (file)
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index f3c63f9560b641f5732b8ddc1fd4562d54ee2861..44885a17fe35de8ef98c791adc923e61ddafc0d1 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -10,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 0c6117d68e77966085bfdefa7e33bb0128a91a4f..7779836e541022aca99c1c000b86dfa22af7ba2c 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -10,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_EMBED=y

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index cc72c8689a3262dbb030f866ec34b32106a8e87c..e7ab50ad24c33b0a347cb08a6d9b8dc4f75be348 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -319,7 +319,7 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_LIBDISK_SUPPORT
 #define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot-dtb.img"
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot.img"
 #endif
 
 /* Disable dcache for SPL just for sure */