[U-Boot] [PATCH] ARM: zynq: Move BOOTM_NETBSD to Kconfig

Michal Simek monstr at monstr.eu
Thu Oct 24 11:17:47 UTC 2019 

po 14. 10. 2019 v 11:26 odesílatel Michal Simek
<michal.simek at xilinx.com> napsal:
>
> The commit 4b0bcfa7c4ec ("Kconfig: Migrate CONFIG_BOOTM_* options")
> moved BOOTM_ options to Kconfig that's why align zynq defconfig with it.
>
> Disabling NETBSD was done by commit d6f48ea5ce18
> ("ARM: zynq: Do not enable NETBSD support by default").
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  configs/zynq_cc108_defconfig           | 1 +
>  configs/zynq_dlc20_rev1_0_defconfig    | 1 +
>  configs/zynq_microzed_defconfig        | 1 +
>  configs/zynq_minized_defconfig         | 1 +
>  configs/zynq_picozed_defconfig         | 1 +
>  configs/zynq_virt_defconfig            | 1 +
>  configs/zynq_z_turn_defconfig          | 1 +
>  configs/zynq_zc702_defconfig           | 1 +
>  configs/zynq_zc706_defconfig           | 1 +
>  configs/zynq_zc770_xm010_defconfig     | 1 +
>  configs/zynq_zc770_xm011_defconfig     | 1 +
>  configs/zynq_zc770_xm011_x16_defconfig | 1 +
>  configs/zynq_zc770_xm012_defconfig     | 1 +
>  configs/zynq_zc770_xm013_defconfig     | 1 +
>  configs/zynq_zed_defconfig             | 1 +
>  configs/zynq_zybo_defconfig            | 1 +
>  configs/zynq_zybo_z7_defconfig         | 1 +
>  include/configs/zynq-common.h          | 2 --
>  18 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig
> index 495c5df60828..3980c5ecbc4e 100644
> --- a/configs/zynq_cc108_defconfig
> +++ b/configs/zynq_cc108_defconfig
> @@ -18,6 +18,7 @@ CONFIG_USE_PREBOOT=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_GPIO=y
> diff --git a/configs/zynq_dlc20_rev1_0_defconfig b/configs/zynq_dlc20_rev1_0_defconfig
> index 00d1a598dde0..e6a67310f1be 100644
> --- a/configs/zynq_dlc20_rev1_0_defconfig
> +++ b/configs/zynq_dlc20_rev1_0_defconfig
> @@ -21,6 +21,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
> index 751d3735bada..3724b8e9cbb6 100644
> --- a/configs/zynq_microzed_defconfig
> +++ b/configs/zynq_microzed_defconfig
> @@ -16,6 +16,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_minized_defconfig b/configs/zynq_minized_defconfig
> index d9657f962197..e3acee1239e3 100644
> --- a/configs/zynq_minized_defconfig
> +++ b/configs/zynq_minized_defconfig
> @@ -16,6 +16,7 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_USE_PREBOOT=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
> index c72307a89d1b..b550b90e99ea 100644
> --- a/configs/zynq_picozed_defconfig
> +++ b/configs/zynq_picozed_defconfig
> @@ -10,6 +10,7 @@ CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
>  CONFIG_USE_PREBOOT=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_virt_defconfig b/configs/zynq_virt_defconfig
> index 58ce970a1b4d..807e71f123b9 100644
> --- a/configs/zynq_virt_defconfig
> +++ b/configs/zynq_virt_defconfig
> @@ -16,6 +16,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_MEMTEST=y
>  CONFIG_CMD_DFU=y
> diff --git a/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig
> index 799277c58e9a..a231dcadaf23 100644
> --- a/configs/zynq_z_turn_defconfig
> +++ b/configs/zynq_z_turn_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
> index 74e8b3e32ee9..f64bf18751cb 100644
> --- a/configs/zynq_zc702_defconfig
> +++ b/configs/zynq_zc702_defconfig
> @@ -20,6 +20,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_MEMTEST=y
>  CONFIG_CMD_DFU=y
> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
> index f83103915845..36a9204be210 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -23,6 +23,7 @@ CONFIG_SPL_FPGA_SUPPORT=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
> index 301bc2dffd66..fff8ddc3fb3a 100644
> --- a/configs/zynq_zc770_xm010_defconfig
> +++ b/configs/zynq_zc770_xm010_defconfig
> @@ -20,6 +20,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_FPGA_LOADBP=y
>  CONFIG_CMD_FPGA_LOADFS=y
> diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
> index 8bc49ea06687..72fceeb49489 100644
> --- a/configs/zynq_zc770_xm011_defconfig
> +++ b/configs/zynq_zc770_xm011_defconfig
> @@ -19,6 +19,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
>  CONFIG_USE_PREBOOT=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
> +# CONFIG_BOOTM_NETBSD is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_FPGA_LOADBP=y
>  CONFIG_CMD_FPGA_LOADFS=y
> diff --git a/configs/zynq_zc770_xm011_x16_defconfig b/configs/zynq_zc770_xm011_x16_defconfig
> index 70429a2f2545..279dfed373d5 100644
> --- a/configs/zynq_zc770_xm011_x16_defconfig
> +++ b/configs/zynq_zc770_xm011_x16_defconfig
> @@ -19,6 +19,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
>  CONFIG_USE_PREBOOT=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
> +# CONFIG_BOOTM_NETBSD is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_FPGA_LOADBP=y
>  CONFIG_CMD_FPGA_LOADFS=y
> diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
> index 78cdd9c9c745..997836ca38df 100644
> --- a/configs/zynq_zc770_xm012_defconfig
> +++ b/configs/zynq_zc770_xm012_defconfig
> @@ -16,6 +16,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
>  CONFIG_USE_PREBOOT=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_IMLS=y
>  CONFIG_CMD_FPGA_LOADBP=y
>  CONFIG_CMD_FPGA_LOADFS=y
> diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
> index c6678784afc1..674a715736d2 100644
> --- a/configs/zynq_zc770_xm013_defconfig
> +++ b/configs/zynq_zc770_xm013_defconfig
> @@ -18,6 +18,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_FPGA_LOADBP=y
>  CONFIG_CMD_FPGA_LOADFS=y
> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
> index 38bf3e45e650..cfc637b4085e 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> index 71d1638d451a..3eaa4b4f0e83 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/zynq_zybo_z7_defconfig b/configs/zynq_zybo_z7_defconfig
> index 0cc525c63788..bb193e456015 100644
> --- a/configs/zynq_zybo_z7_defconfig
> +++ b/configs/zynq_zybo_z7_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_OS_BOOT=y
>  CONFIG_SPL_SPI_LOAD=y
>  CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
> +# CONFIG_BOOTM_NETBSD is not set
>  CONFIG_CMD_THOR_DOWNLOAD=y
>  CONFIG_CMD_DFU=y
>  # CONFIG_CMD_FLASH is not set
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index b6c9f2c8dd5b..274cc191128e 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -227,8 +227,6 @@
>  /* Boot FreeBSD/vxWorks from an ELF image */
>  #define CONFIG_SYS_MMC_MAX_DEVICE      1
>
> -#undef CONFIG_BOOTM_NETBSD
> -
>  /* MMC support */
>  #ifdef CONFIG_MMC_SDHCI_ZYNQ
>  #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
> --
> 2.17.1
>

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