diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-08-03 14:21:25 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-08-19 11:27:48 +0200 |
| commit | 98b532b42079a7ffd617ce0330d6778288b7c535 (patch) | |
| tree | 6239949c748e7695dfeb57b31d4350a852d82d60 | |
| parent | 16fa00a71147de0fb87062f912478a0551d148d3 (diff) | |
| download | u-boot-98b532b42079a7ffd617ce0330d6778288b7c535.tar.gz | |
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>
| -rw-r--r-- | configs/zynq_microzed_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_picozed_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zc702_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zc706_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zc70x_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zc770_xm010_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zc770_xm011_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zc770_xm012_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zc770_xm013_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zed_defconfig | 1 | ||||
| -rw-r--r-- | configs/zynq_zybo_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/zynq-common.h | 2 |
12 files changed, 12 insertions, 1 deletions
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index c878924c70..129faf4f2c 100644 --- 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 af77a9d9d3..62be59be22 100644 --- 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 c7faee78da..2aba08f525 100644 --- 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 0f96d16c08..db11e6fe5b 100644 --- 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 525c538b98..abb02b1349 100644 --- 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 f1fc283036..52511a759a 100644 --- 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 8f9221db85..cae8fe0504 100644 --- 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 73ed13d9be..4361bf7875 100644 --- 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 211a41d91a..8f10d325a5 100644 --- 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 f3c63f9560..44885a17fe 100644 --- 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 0c6117d68e..7779836e54 100644 --- 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 cc72c8689a..e7ab50ad24 100644 --- 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 */ |