| Message ID | 7c195e5a31c971e0ca6b1bb18b2c7261372b3863.1523946749.git.michal.simek@xilinx.com |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] xilinx: Sync defconfigs based on latest NET Kconfig changes | expand |
On Tue, Apr 17, 2018 at 08:32:31AM +0200, Michal Simek wrote: > Sync CMD_MII, CMD_NFS, CMD_TFTPPUT and BOOTP options. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> I forgot to sync everyone before tagging, oops. I'll do that now.
On 17.4.2018 21:39, Tom Rini wrote: > On Tue, Apr 17, 2018 at 08:32:31AM +0200, Michal Simek wrote: > >> Sync CMD_MII, CMD_NFS, CMD_TFTPPUT and BOOTP options. >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> > > I forgot to sync everyone before tagging, oops. I'll do that now. > Wonderful. This patch can be skipped. Thanks, Michal
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 79eec95493ab..6ba70223e292 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -30,17 +30,14 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_SAVES=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPPUT=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_NETCONSOLE=y -CONFIG_BOOTP_BOOTPATH=y -CONFIG_BOOTP_GATEWAY=y -CONFIG_BOOTP_HOSTNAME=y CONFIG_SPL_DM=y CONFIG_XILINX_GPIO=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index cfe7e9240069..1619df303dbb 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set -# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index b95cde1e179d..5e55ebdaf84f 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set -# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y diff --git a/configs/xilinx_zynqmp_zc1232_revA_defconfig b/configs/xilinx_zynqmp_zc1232_revA_defconfig index 97575465f3ed..f4e680d1be11 100644 --- a/configs/xilinx_zynqmp_zc1232_revA_defconfig +++ b/configs/xilinx_zynqmp_zc1232_revA_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_CLK=y CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADP=y # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_SPL_OF_CONTROL=y diff --git a/configs/xilinx_zynqmp_zc1254_revA_defconfig b/configs/xilinx_zynqmp_zc1254_revA_defconfig index 44640fb758a1..77b4ada4e271 100644 --- a/configs/xilinx_zynqmp_zc1254_revA_defconfig +++ b/configs/xilinx_zynqmp_zc1254_revA_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_CLK=y CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADP=y # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_SPL_OF_CONTROL=y diff --git a/configs/xilinx_zynqmp_zc1275_revA_defconfig b/configs/xilinx_zynqmp_zc1275_revA_defconfig index ea14a60ac65e..17c1be879dd4 100644 --- a/configs/xilinx_zynqmp_zc1275_revA_defconfig +++ b/configs/xilinx_zynqmp_zc1275_revA_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_CLK=y CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADP=y # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_SPL_OF_CONTROL=y diff --git a/configs/xilinx_zynqmp_zc1275_revB_defconfig b/configs/xilinx_zynqmp_zc1275_revB_defconfig index 5002d17166dc..b073282e6508 100644 --- a/configs/xilinx_zynqmp_zc1275_revB_defconfig +++ b/configs/xilinx_zynqmp_zc1275_revB_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_MMC=y # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_SPL_OF_CONTROL=y
Sync CMD_MII, CMD_NFS, CMD_TFTPPUT and BOOTP options. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- configs/microblaze-generic_defconfig | 5 +---- configs/topic_miami_defconfig | 1 - configs/topic_miamilite_defconfig | 1 - configs/xilinx_zynqmp_zc1232_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1254_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1275_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1275_revB_defconfig | 1 - 7 files changed, 1 insertion(+), 10 deletions(-)