Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: zynq: Move BOOTM_NETBSD to Kconfig

Browse source 
The commit 4b0bcfa7c4 ("Kconfig: Migrate CONFIG_BOOTM_* options")
moved BOOTM_ options to Kconfig that's why align zynq defconfig with it.

Disabling NETBSD was done by commit d6f48ea5ce
("ARM: zynq: Do not enable NETBSD support by default").

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2019-10-14 09:38:39 +02:00
parent 96e8e52bb8
commit c4690c54b7
18 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configs/zynq_cc108_defconfig
View file

@ -18,6 +18,7 @@ CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y

1
configs/zynq_dlc20_rev1_0_defconfig
View file

@ -21,6 +21,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_microzed_defconfig
View file

@ -16,6 +16,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_minized_defconfig
View file

@ -16,6 +16,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_picozed_defconfig
View file

@ -10,6 +10,7 @@ CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_virt_defconfig
View file

@ -16,6 +16,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y

1
configs/zynq_z_turn_defconfig
View file

@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_zc702_defconfig
View file

@ -20,6 +20,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y

1
configs/zynq_zc706_defconfig
View file

@ -23,6 +23,7 @@ CONFIG_SPL_FPGA_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_zc770_xm010_defconfig
View file

@ -20,6 +20,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADFS=y

1
configs/zynq_zc770_xm011_defconfig
View file

@ -19,6 +19,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADFS=y

1
configs/zynq_zc770_xm011_x16_defconfig
View file

@ -19,6 +19,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADFS=y

1
configs/zynq_zc770_xm012_defconfig
View file

@ -16,6 +16,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y
CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADFS=y

1
configs/zynq_zc770_xm013_defconfig
View file

@ -18,6 +18,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADFS=y

1
configs/zynq_zed_defconfig
View file

@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_zybo_defconfig
View file

@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/zynq_zybo_z7_defconfig
View file

@ -19,6 +19,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
# CONFIG_BOOTM_NETBSD is not set
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

2
include/configs/zynq-common.h
View file

@ -227,8 +227,6 @@
/* Boot FreeBSD/vxWorks from an ELF image */ /* Boot FreeBSD/vxWorks from an ELF image */
#define CONFIG_SYS_MMC_MAX_DEVICE 1 #define CONFIG_SYS_MMC_MAX_DEVICE 1
#undef CONFIG_BOOTM_NETBSD
/* MMC support */ /* MMC support */
#ifdef CONFIG_MMC_SDHCI_ZYNQ #ifdef CONFIG_MMC_SDHCI_ZYNQ
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1