[PATCH] arm64: zynqmp: Move PANIC to Kconfig

Michal Simek monstr at monstr.eu
Thu Jan 16 08:12:38 CET 2020 

út 17. 12. 2019 v 16:14 odesílatel Michal Simek
<michal.simek at xilinx.com> napsal:
>
> Convert another option Kconfig.
>
> Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +
>  configs/xilinx_zynqmp_mini_defconfig                           | 1 +
>  configs/xilinx_zynqmp_mini_emmc0_defconfig                     | 1 +
>  configs/xilinx_zynqmp_mini_emmc1_defconfig                     | 1 +
>  configs/xilinx_zynqmp_mini_nand_defconfig                      | 1 +
>  configs/xilinx_zynqmp_mini_nand_single_defconfig               | 1 +
>  configs/xilinx_zynqmp_mini_qspi_defconfig                      | 1 +
>  configs/xilinx_zynqmp_virt_defconfig                           | 1 +
>  configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig               | 1 +
>  configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig               | 1 +
>  include/configs/xilinx_zynqmp.h                                | 1 -
>  11 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
> index 280983d187a1..71e0d2726ed0 100644
> --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
> +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
> @@ -56,5 +56,6 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
>  CONFIG_ZYNQ_SERIAL=y
>  CONFIG_SPI=y
>  CONFIG_ZYNQMP_GQSPI=y
> +CONFIG_PANIC_HANG=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
>  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig
> index e861cf691056..d953c91a66ed 100644
> --- a/configs/xilinx_zynqmp_mini_defconfig
> +++ b/configs/xilinx_zynqmp_mini_defconfig
> @@ -49,4 +49,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>  # CONFIG_DM_WARN is not set
>  # CONFIG_DM_DEVICE_REMOVE is not set
>  # CONFIG_MMC is not set
> +CONFIG_PANIC_HANG=y
>  # CONFIG_EFI_LOADER is not set
> diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> index 644223633bc7..cb2983d2476e 100644
> --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> @@ -55,4 +55,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
>  CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
> +CONFIG_PANIC_HANG=y
>  # CONFIG_EFI_LOADER is not set
> diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> index 5b468f1cfab6..f7bec364c386 100644
> --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> @@ -55,4 +55,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
>  CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
> +CONFIG_PANIC_HANG=y
>  # CONFIG_EFI_LOADER is not set
> diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig
> index d490f357b7ac..01e097199155 100644
> --- a/configs/xilinx_zynqmp_mini_nand_defconfig
> +++ b/configs/xilinx_zynqmp_mini_nand_defconfig
> @@ -51,4 +51,5 @@ CONFIG_MTD=y
>  CONFIG_MTD_RAW_NAND=y
>  CONFIG_NAND_ARASAN=y
>  CONFIG_SYS_NAND_MAX_CHIPS=2
> +CONFIG_PANIC_HANG=y
>  # CONFIG_EFI_LOADER is not set
> diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig
> index 21aafe1d275e..20e76cb11e8b 100644
> --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig
> +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig
> @@ -50,4 +50,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>  CONFIG_MTD=y
>  CONFIG_MTD_RAW_NAND=y
>  CONFIG_NAND_ARASAN=y
> +CONFIG_PANIC_HANG=y
>  # CONFIG_EFI_LOADER is not set
> diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
> index 902dceb0f622..c6e03cd256d4 100644
> --- a/configs/xilinx_zynqmp_mini_qspi_defconfig
> +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
> @@ -62,4 +62,5 @@ CONFIG_SPI_FLASH_WINBOND=y
>  # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>  CONFIG_SPI=y
>  CONFIG_ZYNQMP_GQSPI=y
> +CONFIG_PANIC_HANG=y
>  # CONFIG_EFI_LOADER is not set
> diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
> index 4047475d3c11..ab46d16791ab 100644
> --- a/configs/xilinx_zynqmp_virt_defconfig
> +++ b/configs/xilinx_zynqmp_virt_defconfig
> @@ -123,6 +123,7 @@ CONFIG_USB_HOST_ETHER=y
>  CONFIG_USB_ETHER_ASIX=y
>  CONFIG_WDT=y
>  CONFIG_WDT_CDNS=y
> +CONFIG_PANIC_HANG=y
>  CONFIG_SPL_GZIP=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
>  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> index ae85bb480526..0dfd38d46981 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> @@ -85,4 +85,5 @@ CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
>  CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
>  CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
>  CONFIG_USB_FUNCTION_THOR=y
> +CONFIG_PANIC_HANG=y
>  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
> index 3532ff27841a..6d27cc761fcc 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
> @@ -80,4 +80,5 @@ CONFIG_USB_ULPI_VIEWPORT=y
>  CONFIG_USB_ULPI=y
>  CONFIG_USB_GADGET=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_PANIC_HANG=y
>  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index e7eb8dbfcb45..b13765e17593 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -94,7 +94,6 @@
>  /* Console I/O Buffer Size */
>  #define CONFIG_SYS_CBSIZE              2048
>  #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
> -#define CONFIG_PANIC_HANG
>  #define CONFIG_SYS_MAXARGS             64
>
>  /* Ethernet driver */
> --
> 2.24.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs

More information about the U-Boot mailing list