[U-Boot] [PATCH v2 2/3] zynqmp: Move config IDENT_STRING to defconfig

[Michal Simek]

On 1.8.2016 06:49, Siva Durga Prasad Paladugu wrote:
> Move config IDENT_STRING to defconfig for all
> zynqmp boards.
> 
> Signed-off-by: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
> ---
> Changes for v2:
> - Appended revB in CONFIG_IDENT_ENTRY definition
>   for zcu102 RevB board
> ---
>  configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>  configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>  configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>  configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>  configs/xilinx_zynqmp_zcu102_defconfig           | 1 +
>  configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
>  include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 2 --
>  include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h | 2 --
>  include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h | 2 --
>  include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h | 2 --
>  include/configs/xilinx_zynqmp_zcu102.h           | 2 --
>  11 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> index 51637fc..de0e2d3 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> @@ -14,6 +14,7 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_HUSH_PARSER=y
> +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm015 dc1"
>  CONFIG_SYS_PROMPT="ZynqMP> "
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MEMTEST=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> index 9fa1562..1db0735 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> @@ -14,6 +14,7 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_HUSH_PARSER=y
> +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm016 dc2"
>  CONFIG_SYS_PROMPT="ZynqMP> "
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MEMTEST=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> index efa7b8c..7c6b5ab 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> @@ -13,6 +13,7 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_HUSH_PARSER=y
> +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm018 dc4"
>  CONFIG_SYS_PROMPT="ZynqMP> "
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MEMTEST=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> index a6818c1..2505fef 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> @@ -13,6 +13,7 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_HUSH_PARSER=y
> +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm019 dc5"
>  CONFIG_SYS_PROMPT="ZynqMP> "
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MEMTEST=y
> diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
> index b0303f6..a95f684 100644
> --- a/configs/xilinx_zynqmp_zcu102_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_defconfig
> @@ -13,6 +13,7 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_HUSH_PARSER=y
> +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102"
>  CONFIG_SYS_PROMPT="ZynqMP> "
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MEMTEST=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> index b2b5208..88ccf25 100644
> --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> @@ -13,6 +13,7 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_HUSH_PARSER=y
> +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102 revB"
>  CONFIG_SYS_PROMPT="ZynqMP> "
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MEMTEST=y
> diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
> index c9f4432..b19a552 100644
> --- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
> +++ b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
> @@ -15,8 +15,6 @@
>  #define CONFIG_AHCI
>  #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
>  
> -#define CONFIG_IDENT_STRING	" Xilinx ZynqMP ZC1751 xm015 dc1"
> -
>  #include <configs/xilinx_zynqmp.h>
>  
>  #endif /* __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H */
> diff --git a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
> index 526d0bb..0714d72 100644
> --- a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
> +++ b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
> @@ -12,8 +12,6 @@
>  
>  #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB1_XHCI_BASEADDR}
>  
> -#define CONFIG_IDENT_STRING	" Xilinx ZynqMP ZC1751 xm016 dc2"
> -
>  #include <configs/xilinx_zynqmp.h>
>  
>  #endif /* __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H */
> diff --git a/include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h b/include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h
> index 65277a6..4866b61 100644
> --- a/include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h
> +++ b/include/configs/xilinx_zynqmp_zc1751_xm018_dc4.h
> @@ -10,8 +10,6 @@
>  #ifndef __CONFIG_ZYNQMP_ZC1751_XM018_DC4_H
>  #define __CONFIG_ZYNQMP_ZC1751_XM018_DC4_H
>  
> -#define CONFIG_IDENT_STRING	" Xilinx ZynqMP ZC1751 xm018 dc4"
> -
>  #include <configs/xilinx_zynqmp.h>
>  
>  #endif /* __CONFIG_ZYNQMP_ZC1751_XM018_DC4_H */
> diff --git a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
> index 76350d9..6a0e397 100644
> --- a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
> +++ b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
> @@ -13,8 +13,6 @@
>  
>  #define CONFIG_ZYNQ_SDHCI0
>  
> -#define CONFIG_IDENT_STRING	" Xilinx ZynqMP ZC1751 xm019 dc5"
> -
>  #include <configs/xilinx_zynqmp.h>
>  
>  #endif /* __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H */
> diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
> index 7ceab32..adf2321 100644
> --- a/include/configs/xilinx_zynqmp_zcu102.h
> +++ b/include/configs/xilinx_zynqmp_zcu102.h
> @@ -45,8 +45,6 @@
>  
>  #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
>  
> -#define CONFIG_IDENT_STRING	" Xilinx ZynqMP ZCU102"
> -
>  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
>  #define CONFIG_CMD_EEPROM
>  #define CONFIG_ZYNQ_EEPROM_BUS		5
> 

Acked-by: Michal Simek <michal.simek at xilinx.com>

Tom: If 1/3 is fine feel free to take these two patches with it or I
will apply them to my tree and will send PR.

Thanks,
Michal