All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files
@ 2016-03-21 13:47 Bin Meng
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
                   ` (3 more replies)
  0 siblings, 4 replies; 15+ messages in thread
From: Bin Meng @ 2016-03-21 13:47 UTC (permalink / raw)
  To: u-boot

Some boards' defconfig files are out of order. Clean this up.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

Changes in v2: None

 configs/am3517_evm_defconfig                 |  4 ++--
 configs/am437x_sk_evm_defconfig              |  2 +-
 configs/chromebook_jerry_defconfig           |  2 --
 configs/chromebook_link_defconfig            |  2 +-
 configs/chromebook_samus_defconfig           |  4 ++--
 configs/chromebox_panther_defconfig          |  2 +-
 configs/cm_t43_defconfig                     | 21 ++++++++++-----------
 configs/colibri_t20_defconfig                |  1 -
 configs/colibri_vf_defconfig                 |  1 -
 configs/firefly-rk3288_defconfig             |  2 --
 configs/galileo_defconfig                    |  2 +-
 configs/harmony_defconfig                    |  1 -
 configs/k2e_evm_defconfig                    |  2 +-
 configs/k2g_evm_defconfig                    |  6 +++---
 configs/k2hk_evm_defconfig                   |  2 +-
 configs/k2l_evm_defconfig                    |  2 +-
 configs/kwb_defconfig                        |  2 +-
 configs/ls1021aqds_ddr4_nor_defconfig        |  5 ++---
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig |  5 ++---
 configs/ls1021aqds_nor_defconfig             |  5 ++---
 configs/ls1021aqds_nor_lpuart_defconfig      |  5 ++---
 configs/ls1021aqds_sdcard_qspi_defconfig     |  4 ++--
 configs/ls1043aqds_nand_defconfig            |  7 +++----
 configs/ls1043aqds_nor_ddr3_defconfig        |  7 +++----
 configs/ls1043aqds_qspi_defconfig            |  6 +++---
 configs/ls1043aqds_sdcard_ifc_defconfig      |  7 +++----
 configs/ls1043aqds_sdcard_qspi_defconfig     |  8 ++++----
 configs/medcom-wide_defconfig                |  1 -
 configs/nyan-big_defconfig                   |  4 +---
 configs/omap3_logic_defconfig                |  2 +-
 configs/paz00_defconfig                      |  1 -
 configs/pcm052_defconfig                     |  1 -
 configs/rock2_defconfig                      |  2 --
 configs/seaboard_defconfig                   |  1 -
 configs/tec_defconfig                        |  1 -
 configs/tseries_mmc_defconfig                |  2 +-
 configs/tseries_nand_defconfig               |  2 +-
 configs/tseries_spi_defconfig                |  2 +-
 configs/uniphier_pro4_defconfig              |  1 -
 configs/ventana_defconfig                    |  1 -
 configs/vexpress_aemv8a_dram_defconfig       |  1 -
 configs/vexpress_aemv8a_juno_defconfig       |  1 -
 configs/vexpress_aemv8a_semi_defconfig       |  1 -
 configs/vf610twr_defconfig                   |  1 -
 configs/vf610twr_nand_defconfig              |  1 -
 configs/xilinx-ppc405-generic_defconfig      | 12 +++++-------
 configs/xilinx-ppc440-generic_defconfig      | 14 ++++++--------
 configs/xilinx_zynqmp_ep_defconfig           |  2 +-
 48 files changed, 68 insertions(+), 103 deletions(-)

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 9ac43f0..6a38f98 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -3,13 +3,13 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_AM3517_EVM=y
 CONFIG_SPL=y
 CONFIG_FIT=y
-CONFIG_SYS_PROMPT="AM3517_EVM # "
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_SYS_PROMPT="AM3517_EVM # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_GPIO=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig
index 149a028..fa54ebd 100644
--- a/configs/am437x_sk_evm_defconfig
+++ b/configs/am437x_sk_evm_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
+CONFIG_DMA=y
 CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
@@ -23,4 +24,3 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
-CONFIG_DMA=y
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 4c72035..b00e2bf 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -55,8 +55,6 @@ CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_DM_VIDEO=y
-CONFIG_I2C_EDID=y
-CONFIG_VIDEO_ROTATION=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 8a39740..9cf7b0e 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -4,8 +4,8 @@ CONFIG_DM_I2C=y
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
 CONFIG_TARGET_CHROMEBOOK_LINK=y
-CONFIG_HAVE_MRC=y
 CONFIG_ENABLE_MRC_CACHE=y
+CONFIG_HAVE_MRC=y
 CONFIG_SMP=y
 CONFIG_HAVE_VGA_BIOS=y
 CONFIG_FIT=y
diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index 448446d..fd1d9ca 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -8,14 +8,14 @@ CONFIG_HAVE_MRC=y
 CONFIG_HAVE_REFCODE=y
 CONFIG_SMP=y
 CONFIG_HAVE_VGA_BIOS=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_BOOTSTAGE=y
-CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 3b32e51..7a27154 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -2,8 +2,8 @@ CONFIG_X86=y
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebox_panther"
 CONFIG_TARGET_CHROMEBOX_PANTHER=y
-CONFIG_HAVE_MRC=y
 CONFIG_ENABLE_MRC_CACHE=y
+CONFIG_HAVE_MRC=y
 CONFIG_HAVE_VGA_BIOS=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 28a96fb..c03a553 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_CM_T43=y
+CONFIG_DM_SERIAL=y
 CONFIG_DM_GPIO=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="CM-T43 # "
@@ -10,17 +11,15 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
-CONFIG_DM_SERIAL=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_ISSI=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SYS_NS16550=y
+CONFIG_OF_LIBFDT=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 778aae7..b69da2f 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -14,7 +14,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 7356b77..27a41e7 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -17,4 +17,3 @@ CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
 CONFIG_FSL_LPUART=y
 CONFIG_FSL_DSPI=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index d27e4a5..cb394cd 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -47,8 +47,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_DM_VIDEO=y
-CONFIG_I2C_EDID=y
-CONFIG_VIDEO_ROTATION=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 832ac4d..6620a85 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -14,9 +14,9 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
+CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index 561b27b..c150f6e 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -15,7 +15,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index 0949468..a3fa758 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -13,5 +13,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SYS_NS16550=y
 CONFIG_DM_ETH=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
index b721a1c..0545812 100644
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@ -5,14 +5,14 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="k2g-evm"
 CONFIG_SPL=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_CMD_REMOTEPROC=y
-CONFIG_REMOTEPROC_TI_POWER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_REMOTEPROC=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SYS_NS16550=y
 CONFIG_DM_ETH=y
+CONFIG_REMOTEPROC_TI_POWER=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 579c6b8..83efcbb 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -13,5 +13,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SYS_NS16550=y
 CONFIG_DM_ETH=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index af1dc2c..d2ebb1d 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -13,5 +13,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SYS_NS16550=y
 CONFIG_DM_ETH=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
index a5602a0..c07e1e5 100644
--- a/configs/kwb_defconfig
+++ b/configs/kwb_defconfig
@@ -26,8 +26,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_NETCONSOLE=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index 96576ce..b858de9 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -1,14 +1,13 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
-CONFIG_DM_SERIAL=y
-CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 86a27c6..70b4a10 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -1,14 +1,13 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
-CONFIG_DM_SERIAL=y
-CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index f357383..70a3445 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -1,13 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_OF_STDOUT_VIA_ALIAS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index 202c865..a633393 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
@@ -11,4 +11,3 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig
index cd75af6..127b8b4 100644
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
diff --git a/configs/ls1043aqds_nand_defconfig b/configs/ls1043aqds_nand_defconfig
index 4ba0cef..1694458 100644
--- a/configs/ls1043aqds_nand_defconfig
+++ b/configs/ls1043aqds_nand_defconfig
@@ -1,14 +1,13 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1043AQDS=y
+CONFIG_DM_SPI=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT"
-CONFIG_SYS_NS16550=y
-CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
-CONFIG_DM_SPI=y
-CONFIG_OF_LIBFDT=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig
index 0a79e98..a90c4ad 100644
--- a/configs/ls1043aqds_nor_ddr3_defconfig
+++ b/configs/ls1043aqds_nor_ddr3_defconfig
@@ -1,12 +1,11 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1043AQDS=y
+CONFIG_DM_SPI=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_NS16550=y
-CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
-CONFIG_DM_SPI=y
-CONFIG_OF_LIBFDT=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig
index 3864dd6..2536821 100644
--- a/configs/ls1043aqds_qspi_defconfig
+++ b/configs/ls1043aqds_qspi_defconfig
@@ -1,12 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1043AQDS=y
-CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,QSPI_BOOT"
+CONFIG_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,QSPI_BOOT"
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
-CONFIG_DM_SPI=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/ls1043aqds_sdcard_ifc_defconfig b/configs/ls1043aqds_sdcard_ifc_defconfig
index 622d26e..07b3edc 100644
--- a/configs/ls1043aqds_sdcard_ifc_defconfig
+++ b/configs/ls1043aqds_sdcard_ifc_defconfig
@@ -1,14 +1,13 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1043AQDS=y
+CONFIG_DM_SPI=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
-CONFIG_SYS_NS16550=y
-CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
-CONFIG_DM_SPI=y
-CONFIG_OF_LIBFDT=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig b/configs/ls1043aqds_sdcard_qspi_defconfig
index 02597f2..9967973 100644
--- a/configs/ls1043aqds_sdcard_qspi_defconfig
+++ b/configs/ls1043aqds_sdcard_qspi_defconfig
@@ -1,13 +1,13 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1043AQDS=y
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
+CONFIG_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
+CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
-CONFIG_DM_SPI=y
+CONFIG_SYS_NS16550=y
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index 631ed18..95bb570 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -16,7 +16,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 604aacf..fa3c700 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -28,16 +28,14 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_DISPLAY=y
-CONFIG_I2C_EDID=y
 CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_TEGRA124=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index a58b85a..d1221bf 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -3,8 +3,8 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_LOGIC=y
 CONFIG_SPL=y
 CONFIG_FIT=y
-CONFIG_SYS_PROMPT="OMAP Logic # "
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_SYS_PROMPT="OMAP Logic # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index f044551..4d5c758 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -15,7 +15,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig
index f97f110..49159ce 100644
--- a/configs/pcm052_defconfig
+++ b/configs/pcm052_defconfig
@@ -11,4 +11,3 @@ CONFIG_VYBRID_GPIO=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_FSL_LPUART=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 68e674d..5f4c093 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -45,8 +45,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_DM_VIDEO=y
-CONFIG_I2C_EDID=y
-CONFIG_VIDEO_ROTATION=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index cd3820d..00cd081 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -15,7 +15,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 9b1d2fc..56970c4 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -16,7 +16,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
index 3fe06eb..5abd7f0 100644
--- a/configs/tseries_mmc_defconfig
+++ b/configs/tseries_mmc_defconfig
@@ -24,7 +24,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_NETCONSOLE=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_OF_LIBFDT=y
diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
index 2993537..19d9004 100644
--- a/configs/tseries_nand_defconfig
+++ b/configs/tseries_nand_defconfig
@@ -25,7 +25,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_NETCONSOLE=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_OF_LIBFDT=y
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index 4c6d544..ae93795 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -29,7 +29,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_OF_LIBFDT=y
diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig
index 989f614..7d50f1c 100644
--- a/configs/uniphier_pro4_defconfig
+++ b/configs/uniphier_pro4_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_ARCH_UNIPHIER_PH1_PRO4=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 9e4e7f6..0cce4d4 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -15,7 +15,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig
index 0b5799a..440dccf 100644
--- a/configs/vexpress_aemv8a_dram_defconfig
+++ b/configs/vexpress_aemv8a_dram_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DM_SERIAL=y
-CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
 CONFIG_SYS_PROMPT="VExpress64# "
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 07036cc..c702800 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS64_JUNO=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DM_SERIAL=y
-CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
 CONFIG_SYS_PROMPT="VExpress64# "
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 16d6796..d7f7294 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS64_BASE_FVP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DM_SERIAL=y
-CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
 CONFIG_SYS_PROMPT="VExpress64# "
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index 7c83887..d959293 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -14,4 +14,3 @@ CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
 CONFIG_FSL_LPUART=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index 4591526..b6a96f2 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -14,4 +14,3 @@ CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
 CONFIG_FSL_LPUART=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
index 85bc3b9..2008a8d 100644
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@@ -1,17 +1,15 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC405_GENERIC=y
+CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc405-generic"
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000"
 CONFIG_SYS_PROMPT="xlx-ppc405:/# "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_MALLOC_SIMPLE=y
-CONFIG_XILINX_UARTLITE=y
-CONFIG_SYS_NS16550=y
 CONFIG_OF_EMBED=y
-CONFIG_OF_CONTROL=y
-CONFIG_FIT=y
-CONFIG_FIT_VERBOSE=y
-CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc405-generic"
+CONFIG_SYS_NS16550=y
+CONFIG_XILINX_UARTLITE=y
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
index 3bf2c4f..8df33d3 100644
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@@ -1,17 +1,15 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC440_GENERIC=y
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1"
-CONFIG_SYS_PROMPT="board:/# "
-CONFIG_SYS_MALLOC_SIMPLE=y
-CONFIG_XILINX_UARTLITE=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_EMBED=y
-CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1"
+CONFIG_SYS_PROMPT="board:/# "
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
+CONFIG_OF_EMBED=y
 CONFIG_NETCONSOLE=y
+CONFIG_SYS_NS16550=y
+CONFIG_XILINX_UARTLITE=y
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index c2bbb47..8f3d38c 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_ZYNQMP_USB=y
-CONFIG_NAND_ARASAN=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep108"
 CONFIG_FIT=y
@@ -26,5 +25,6 @@ CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_ZYNQ_SDHCI=y
+CONFIG_NAND_ARASAN=y
 CONFIG_ZYNQ_GEM=y
 # CONFIG_REGEX is not set
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-21 13:47 [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Bin Meng
@ 2016-03-21 13:47 ` Bin Meng
  2016-03-21 16:25   ` Joe Hershberger
                     ` (2 more replies)
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 " Bin Meng
                   ` (2 subsequent siblings)
  3 siblings, 3 replies; 15+ messages in thread
From: Bin Meng @ 2016-03-21 13:47 UTC (permalink / raw)
  To: u-boot

Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
to use that.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

Changes in v2: None

 configs/MPC8544DS_defconfig   | 1 +
 drivers/net/Kconfig           | 6 ++++++
 include/configs/MPC8536DS.h   | 1 -
 include/configs/MPC8544DS.h   | 1 -
 include/configs/MPC8572DS.h   | 1 -
 include/configs/MPC8641HPCN.h | 1 -
 include/configs/r2dplus.h     | 5 -----
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index 9790d8a..8937682 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -5,5 +5,6 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_RTL8139=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bc2f51d..3ac6b66 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -102,6 +102,12 @@ config PCH_GBE
 	  This MAC is present in Intel Platform Controller Hub EG20T. It
 	  supports 10/100/1000 Mbps operation.
 
+config RTL8139
+	bool "Realtek 8139 series Ethernet controller driver"
+	help
+	  This driver supports Realtek 8139 series fast ethernet family of
+	  PCI chipsets/adapters.
+
 config XILINX_AXIEMAC
 	depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
 	select PHYLIB
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 9298c30..980cb99 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -527,7 +527,6 @@
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#undef CONFIG_RTL8139
 
 #ifndef CONFIG_PCI_PNP
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BUS
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 494c46f..2372d5f 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -298,7 +298,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#define CONFIG_RTL8139
 
 #ifndef CONFIG_PCI_PNP
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BUS
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index cfcd5b9..95f59e0 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -490,7 +490,6 @@
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#undef CONFIG_RTL8139
 
 #ifndef CONFIG_PCI_PNP
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCIE3_IO_BUS
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index bd0a3f5..1f4ed2a 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -362,7 +362,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
 
-#define CONFIG_RTL8139
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 2d1e56a..82e7a89 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -110,9 +110,4 @@
 #define CONFIG_PCI_SYS_PHYS	(CONFIG_SYS_SDRAM_BASE & 0x1fffffff)
 #define CONFIG_PCI_SYS_SIZE	CONFIG_SYS_SDRAM_SIZE
 
-/*
- * Network device (RTL8139) support
- */
-#define CONFIG_RTL8139
-
 #endif /* __CONFIG_H */
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 to Kconfig
  2016-03-21 13:47 [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Bin Meng
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
@ 2016-03-21 13:47 ` Bin Meng
  2016-03-21 16:08   ` Stephen Warren
                     ` (2 more replies)
  2016-03-21 16:26 ` [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Joe Hershberger
  2016-03-23  2:00 ` [U-Boot] [U-Boot, v2, " Tom Rini
  3 siblings, 3 replies; 15+ messages in thread
From: Bin Meng @ 2016-03-21 13:47 UTC (permalink / raw)
  To: u-boot

Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
to use that.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

Changes in v2:
- Rebase on top of u-boot/master
- Update board config headers to remove additional useless lines

 configs/beaver_defconfig            | 1 +
 configs/cardhu_defconfig            | 1 +
 configs/chromebox_panther_defconfig | 1 +
 configs/jetson-tk1_defconfig        | 1 +
 configs/minnowmax_defconfig         | 1 +
 configs/p2371-2180_defconfig        | 1 +
 configs/trimslice_defconfig         | 1 +
 drivers/net/Kconfig                 | 6 ++++++
 include/configs/beaver.h            | 3 ---
 include/configs/cardhu.h            | 3 ---
 include/configs/chromebox_panther.h | 2 --
 include/configs/jetson-tk1.h        | 3 ---
 include/configs/minnowmax.h         | 1 -
 include/configs/p2371-2180.h        | 3 ---
 include/configs/r7780mp.h           | 3 ---
 include/configs/sh7785lcr.h         | 3 ---
 include/configs/trimslice.h         | 3 ---
 17 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index fcfbf65..9e6a5c3 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 808e0e2..eba46e7 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 7a27154..3d79502 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -27,6 +27,7 @@ CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
+CONFIG_RTL8169=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index c07b278..d964f1c 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index ea39e6a..efb9c1e 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -29,6 +29,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
+CONFIG_RTL8169=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART=y
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 392c539..a8b1247 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index a0b3a3e..2d8579b4 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_RTL8169=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SFLASH=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3ac6b66..2a229b8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -108,6 +108,12 @@ config RTL8139
 	  This driver supports Realtek 8139 series fast ethernet family of
 	  PCI chipsets/adapters.
 
+config RTL8169
+	bool "Realtek 8169 series Ethernet controller driver"
+	help
+	  This driver supports Realtek 8169 series gigabit ethernet family of
+	  PCI/PCIe chipsets/adapters.
+
 config XILINX_AXIEMAC
 	depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
 	select PHYLIB
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index c672a8e..f68d8ee 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -63,9 +63,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index fc2dc5a..acfe968 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -66,9 +66,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/chromebox_panther.h b/include/configs/chromebox_panther.h
index d5b3390..05266e8 100644
--- a/include/configs/chromebox_panther.h
+++ b/include/configs/chromebox_panther.h
@@ -10,6 +10,4 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#define CONFIG_RTL8169
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 763d2ec..59dbb20 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -60,9 +60,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 10ca05f..e0006d8 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -20,7 +20,6 @@
 #define CONFIG_SMSC_LPC47M
 
 #define CONFIG_PCI_PNP
-#define CONFIG_RTL8169
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
 					"stdout=vga,serial\0" \
 					"stderr=vga,serial\0"
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 01fd743..c55f07e 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -56,9 +56,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 82a056c..e2da244 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -124,9 +124,6 @@
 #endif /* CONFIG_CMD_PCI */
 
 #if defined(CONFIG_CMD_NET)
-/*
-#define CONFIG_RTL8169
-*/
 /* AX88796L Support(NE2000 base chip) */
 #define CONFIG_DRIVER_AX88796L
 #define CONFIG_DRIVER_NE2000_BASE	0xA4100000
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 2ba0c58..e85256d 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -148,9 +148,6 @@
 #define CONFIG_PCI_SYS_BUS	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_PCI_SYS_SIZE	CONFIG_SYS_SDRAM_SIZE
 
-/* Network device (RTL8169) support */
-#define CONFIG_RTL8169
-
 /* ENV setting */
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE	1
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 92ebb6a..ca188be 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -58,9 +58,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
-/* PCI networking support */
-#define CONFIG_RTL8169
-
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 to Kconfig
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 " Bin Meng
@ 2016-03-21 16:08   ` Stephen Warren
  2016-03-21 16:27   ` Joe Hershberger
  2016-03-23  2:00   ` [U-Boot] [U-Boot,v2,3/3] " Tom Rini
  2 siblings, 0 replies; 15+ messages in thread
From: Stephen Warren @ 2016-03-21 16:08 UTC (permalink / raw)
  To: u-boot

On 03/21/2016 07:47 AM, Bin Meng wrote:
> Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
> to use that.

Acked-by: Stephen Warren <swaren@nvidia.com>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
@ 2016-03-21 16:25   ` Joe Hershberger
  2016-03-21 17:01   ` Scott Wood
  2016-03-23  2:00   ` [U-Boot] [U-Boot,v2,2/3] " Tom Rini
  2 siblings, 0 replies; 15+ messages in thread
From: Joe Hershberger @ 2016-03-21 16:25 UTC (permalink / raw)
  To: u-boot

On Mon, Mar 21, 2016 at 8:47 AM, Bin Meng <bmeng.cn@gmail.com> wrote:
> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
> to use that.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files
  2016-03-21 13:47 [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Bin Meng
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 " Bin Meng
@ 2016-03-21 16:26 ` Joe Hershberger
  2016-03-23  2:00 ` [U-Boot] [U-Boot, v2, " Tom Rini
  3 siblings, 0 replies; 15+ messages in thread
From: Joe Hershberger @ 2016-03-21 16:26 UTC (permalink / raw)
  To: u-boot

On Mon, Mar 21, 2016 at 8:47 AM, Bin Meng <bmeng.cn@gmail.com> wrote:
> Some boards' defconfig files are out of order. Clean this up.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 to Kconfig
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 " Bin Meng
  2016-03-21 16:08   ` Stephen Warren
@ 2016-03-21 16:27   ` Joe Hershberger
  2016-03-23  2:00   ` [U-Boot] [U-Boot,v2,3/3] " Tom Rini
  2 siblings, 0 replies; 15+ messages in thread
From: Joe Hershberger @ 2016-03-21 16:27 UTC (permalink / raw)
  To: u-boot

On Mon, Mar 21, 2016 at 8:47 AM, Bin Meng <bmeng.cn@gmail.com> wrote:
> Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
> to use that.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
  2016-03-21 16:25   ` Joe Hershberger
@ 2016-03-21 17:01   ` Scott Wood
  2016-03-22  2:14     ` Bin Meng
  2016-03-23  2:00   ` [U-Boot] [U-Boot,v2,2/3] " Tom Rini
  2 siblings, 1 reply; 15+ messages in thread
From: Scott Wood @ 2016-03-21 17:01 UTC (permalink / raw)
  To: u-boot

On 03/21/2016 08:44 AM, Bin Meng wrote:
> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
> to use that.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> 
> Changes in v2: None
> 
>  configs/MPC8544DS_defconfig   | 1 +
>  drivers/net/Kconfig           | 6 ++++++
>  include/configs/MPC8536DS.h   | 1 -
>  include/configs/MPC8544DS.h   | 1 -
>  include/configs/MPC8572DS.h   | 1 -
>  include/configs/MPC8641HPCN.h | 1 -
>  include/configs/r2dplus.h     | 5 -----
>  7 files changed, 7 insertions(+), 9 deletions(-)

What about the defconfig for MPC8641HPCN and r2dplus?

-Scott

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-21 17:01   ` Scott Wood
@ 2016-03-22  2:14     ` Bin Meng
  2016-03-22 22:25       ` Joe Hershberger
  0 siblings, 1 reply; 15+ messages in thread
From: Bin Meng @ 2016-03-22  2:14 UTC (permalink / raw)
  To: u-boot

On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote:
> On 03/21/2016 08:44 AM, Bin Meng wrote:
>> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
>> to use that.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>> Changes in v2: None
>>
>>  configs/MPC8544DS_defconfig   | 1 +
>>  drivers/net/Kconfig           | 6 ++++++
>>  include/configs/MPC8536DS.h   | 1 -
>>  include/configs/MPC8544DS.h   | 1 -
>>  include/configs/MPC8572DS.h   | 1 -
>>  include/configs/MPC8641HPCN.h | 1 -
>>  include/configs/r2dplus.h     | 5 -----
>>  7 files changed, 7 insertions(+), 9 deletions(-)
>
> What about the defconfig for MPC8641HPCN and r2dplus?
>

Looks they should be added automatically by moveconfig, but somehow
they were not.

Hi Joe, Masahiro,

Do you know why moveconfig fails to handle these two board files?

Regards,
Bin

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-22  2:14     ` Bin Meng
@ 2016-03-22 22:25       ` Joe Hershberger
  2016-03-22 22:50         ` Tom Rini
  0 siblings, 1 reply; 15+ messages in thread
From: Joe Hershberger @ 2016-03-22 22:25 UTC (permalink / raw)
  To: u-boot

Hi Bin,

On Mon, Mar 21, 2016 at 9:14 PM, Bin Meng <bmeng.cn@gmail.com> wrote:
> On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote:
>> On 03/21/2016 08:44 AM, Bin Meng wrote:
>>> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
>>> to use that.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>>  configs/MPC8544DS_defconfig   | 1 +
>>>  drivers/net/Kconfig           | 6 ++++++
>>>  include/configs/MPC8536DS.h   | 1 -
>>>  include/configs/MPC8544DS.h   | 1 -
>>>  include/configs/MPC8572DS.h   | 1 -
>>>  include/configs/MPC8641HPCN.h | 1 -
>>>  include/configs/r2dplus.h     | 5 -----
>>>  7 files changed, 7 insertions(+), 9 deletions(-)
>>
>> What about the defconfig for MPC8641HPCN and r2dplus?
>>
>
> Looks they should be added automatically by moveconfig, but somehow
> they were not.
>
> Hi Joe, Masahiro,
>
> Do you know why moveconfig fails to handle these two board files?

I've seen it miss moves for several reasons. Maybe your build env
failed to create the intermediate files for those targets?

-Joe

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-22 22:25       ` Joe Hershberger
@ 2016-03-22 22:50         ` Tom Rini
  2016-03-23  0:56           ` Bin Meng
  0 siblings, 1 reply; 15+ messages in thread
From: Tom Rini @ 2016-03-22 22:50 UTC (permalink / raw)
  To: u-boot

On Tue, Mar 22, 2016 at 05:25:04PM -0500, Joe Hershberger wrote:
> Hi Bin,
> 
> On Mon, Mar 21, 2016 at 9:14 PM, Bin Meng <bmeng.cn@gmail.com> wrote:
> > On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote:
> >> On 03/21/2016 08:44 AM, Bin Meng wrote:
> >>> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
> >>> to use that.
> >>>
> >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> >>> ---
> >>>
> >>> Changes in v2: None
> >>>
> >>>  configs/MPC8544DS_defconfig   | 1 +
> >>>  drivers/net/Kconfig           | 6 ++++++
> >>>  include/configs/MPC8536DS.h   | 1 -
> >>>  include/configs/MPC8544DS.h   | 1 -
> >>>  include/configs/MPC8572DS.h   | 1 -
> >>>  include/configs/MPC8641HPCN.h | 1 -
> >>>  include/configs/r2dplus.h     | 5 -----
> >>>  7 files changed, 7 insertions(+), 9 deletions(-)
> >>
> >> What about the defconfig for MPC8641HPCN and r2dplus?
> >>
> >
> > Looks they should be added automatically by moveconfig, but somehow
> > they were not.
> >
> > Hi Joe, Masahiro,
> >
> > Do you know why moveconfig fails to handle these two board files?
> 
> I've seen it miss moves for several reasons. Maybe your build env
> failed to create the intermediate files for those targets?

Please note that I've fixed this up locally and will be pushing shortly,
so no need for a v3.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/89787042/attachment.sig>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-22 22:50         ` Tom Rini
@ 2016-03-23  0:56           ` Bin Meng
  0 siblings, 0 replies; 15+ messages in thread
From: Bin Meng @ 2016-03-23  0:56 UTC (permalink / raw)
  To: u-boot

On Wed, Mar 23, 2016 at 6:50 AM, Tom Rini <trini@konsulko.com> wrote:
> On Tue, Mar 22, 2016 at 05:25:04PM -0500, Joe Hershberger wrote:
>> Hi Bin,
>>
>> On Mon, Mar 21, 2016 at 9:14 PM, Bin Meng <bmeng.cn@gmail.com> wrote:
>> > On Tue, Mar 22, 2016 at 1:01 AM, Scott Wood <scott.wood@nxp.com> wrote:
>> >> On 03/21/2016 08:44 AM, Bin Meng wrote:
>> >>> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
>> >>> to use that.
>> >>>
>> >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> >>> ---
>> >>>
>> >>> Changes in v2: None
>> >>>
>> >>>  configs/MPC8544DS_defconfig   | 1 +
>> >>>  drivers/net/Kconfig           | 6 ++++++
>> >>>  include/configs/MPC8536DS.h   | 1 -
>> >>>  include/configs/MPC8544DS.h   | 1 -
>> >>>  include/configs/MPC8572DS.h   | 1 -
>> >>>  include/configs/MPC8641HPCN.h | 1 -
>> >>>  include/configs/r2dplus.h     | 5 -----
>> >>>  7 files changed, 7 insertions(+), 9 deletions(-)
>> >>
>> >> What about the defconfig for MPC8641HPCN and r2dplus?
>> >>
>> >
>> > Looks they should be added automatically by moveconfig, but somehow
>> > they were not.
>> >
>> > Hi Joe, Masahiro,
>> >
>> > Do you know why moveconfig fails to handle these two board files?
>>
>> I've seen it miss moves for several reasons. Maybe your build env
>> failed to create the intermediate files for those targets?
>
> Please note that I've fixed this up locally and will be pushing shortly,
> so no need for a v3.

Thanks Tom!

Regards,
Bin

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [U-Boot, v2, 1/3] defconfig: Reorder boards' defconfig files
  2016-03-21 13:47 [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Bin Meng
                   ` (2 preceding siblings ...)
  2016-03-21 16:26 ` [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Joe Hershberger
@ 2016-03-23  2:00 ` Tom Rini
  3 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-03-23  2:00 UTC (permalink / raw)
  To: u-boot

On Mon, Mar 21, 2016 at 06:47:40AM -0700, Bin Meng wrote:

> Some boards' defconfig files are out of order. Clean this up.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/28b8f7bc/attachment.sig>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [U-Boot,v2,2/3] net: Move CONFIG_RTL8139 to Kconfig
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
  2016-03-21 16:25   ` Joe Hershberger
  2016-03-21 17:01   ` Scott Wood
@ 2016-03-23  2:00   ` Tom Rini
  2 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-03-23  2:00 UTC (permalink / raw)
  To: u-boot

On Mon, Mar 21, 2016 at 06:47:41AM -0700, Bin Meng wrote:

> Introduce CONFIG_RTL8139 in Kconfig and move over boards' defconfig
> to use that.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Manually fixed up the boards Scott noted and then, applied to
u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/a069132e/attachment.sig>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [U-Boot] [U-Boot,v2,3/3] net: Move CONFIG_RTL8169 to Kconfig
  2016-03-21 13:47 ` [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 " Bin Meng
  2016-03-21 16:08   ` Stephen Warren
  2016-03-21 16:27   ` Joe Hershberger
@ 2016-03-23  2:00   ` Tom Rini
  2 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-03-23  2:00 UTC (permalink / raw)
  To: u-boot

On Mon, Mar 21, 2016 at 06:47:42AM -0700, Bin Meng wrote:

> Introduce CONFIG_RTL8169 in Kconfig and move over boards' defconfig
> to use that.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Acked-by: Stephen Warren <swaren@nvidia.com>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/80d94fe2/attachment.sig>

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2016-03-23  2:00 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-21 13:47 [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Bin Meng
2016-03-21 13:47 ` [U-Boot] [PATCH v2 2/3] net: Move CONFIG_RTL8139 to Kconfig Bin Meng
2016-03-21 16:25   ` Joe Hershberger
2016-03-21 17:01   ` Scott Wood
2016-03-22  2:14     ` Bin Meng
2016-03-22 22:25       ` Joe Hershberger
2016-03-22 22:50         ` Tom Rini
2016-03-23  0:56           ` Bin Meng
2016-03-23  2:00   ` [U-Boot] [U-Boot,v2,2/3] " Tom Rini
2016-03-21 13:47 ` [U-Boot] [PATCH v2 3/3] net: Move CONFIG_RTL8169 " Bin Meng
2016-03-21 16:08   ` Stephen Warren
2016-03-21 16:27   ` Joe Hershberger
2016-03-23  2:00   ` [U-Boot] [U-Boot,v2,3/3] " Tom Rini
2016-03-21 16:26 ` [U-Boot] [PATCH v2 1/3] defconfig: Reorder boards' defconfig files Joe Hershberger
2016-03-23  2:00 ` [U-Boot] [U-Boot, v2, " Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.