Skip to contentSkip to conversation

defconfig: Reorder boards' defconfig files

PATCH New Bin Meng 5 participants 15 messages Mar 21, 2016 – Mar 23, 2016

Subsystems (4)
Network drivers Arm/Zynq architecture Arm/versatile express platform Arm/uniphier architecture
lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH v2 1/3 defconfig: Reorder boards' defconfig files

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

Signed-off-by Bin Meng <[email protected]>

---

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(-)
configs/am3517_evm_defconfig +2 -2
index 9ac43f0..6a38f98 100644
@@ -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
configs/am437x_sk_evm_defconfig +1 -1
index 149a028..fa54ebd 100644
@@ -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
configs/chromebook_jerry_defconfig +0 -2
index 4c72035..b00e2bf 100644
@@ -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
configs/chromebook_link_defconfig +1 -1
index 8a39740..9cf7b0e 100644
@@ -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
configs/chromebook_samus_defconfig +2 -2
index 448446d..fd1d9ca 100644
@@ -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
configs/chromebox_panther_defconfig +1 -1
index 3b32e51..7a27154 100644
@@ -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
configs/cm_t43_defconfig +10 -11
index 28a96fb..c03a553 100644
@@ -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
configs/colibri_t20_defconfig +0 -1
index 778aae7..b69da2f 100644
@@ -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
configs/colibri_vf_defconfig +0 -1
index 7356b77..27a41e7 100644
@@ -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
configs/firefly-rk3288_defconfig +0 -2
index d27e4a5..cb394cd 100644
@@ -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
configs/galileo_defconfig +1 -1
index 832ac4d..6620a85 100644
@@ -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
configs/harmony_defconfig +0 -1
index 561b27b..c150f6e 100644
@@ -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
configs/k2e_evm_defconfig +1 -1
index 0949468..a3fa758 100644
@@ -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
configs/k2g_evm_defconfig +3 -3
index b721a1c..0545812 100644
@@ -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
configs/k2hk_evm_defconfig +1 -1
index 579c6b8..83efcbb 100644
@@ -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
configs/k2l_evm_defconfig +1 -1
index af1dc2c..d2ebb1d 100644
@@ -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
configs/kwb_defconfig +1 -1
index a5602a0..c07e1e5 100644
@@ -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
configs/ls1021aqds_ddr4_nor_defconfig +2 -3
index 96576ce..b858de9 100644
@@ -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
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +2 -3
index 86a27c6..70b4a10 100644
@@ -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
configs/ls1021aqds_nor_defconfig +2 -3
index f357383..70a3445 100644
@@ -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
configs/ls1021aqds_nor_lpuart_defconfig +2 -3
index 202c865..a633393 100644
@@ -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
configs/ls1021aqds_sdcard_qspi_defconfig +2 -2
index cd75af6..127b8b4 100644
@@ -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
configs/ls1043aqds_nand_defconfig +3 -4
index 4ba0cef..1694458 100644
@@ -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
configs/ls1043aqds_nor_ddr3_defconfig +3 -4
index 0a79e98..a90c4ad 100644
@@ -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
configs/ls1043aqds_qspi_defconfig +3 -3
index 3864dd6..2536821 100644
@@ -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
configs/ls1043aqds_sdcard_ifc_defconfig +3 -4
index 622d26e..07b3edc 100644
@@ -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
configs/ls1043aqds_sdcard_qspi_defconfig +4 -4
index 02597f2..9967973 100644
@@ -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
configs/medcom-wide_defconfig +0 -1
index 631ed18..95bb570 100644
@@ -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
configs/nyan-big_defconfig +1 -3
index 604aacf..fa3c700 100644
@@ -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
configs/omap3_logic_defconfig +1 -1
index a58b85a..d1221bf 100644
@@ -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
configs/paz00_defconfig +0 -1
index f044551..4d5c758 100644
@@ -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
configs/pcm052_defconfig +0 -1
index f97f110..49159ce 100644
@@ -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
configs/rock2_defconfig +0 -2
index 68e674d..5f4c093 100644
@@ -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
configs/seaboard_defconfig +0 -1
index cd3820d..00cd081 100644
@@ -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
configs/tec_defconfig +0 -1
index 9b1d2fc..56970c4 100644
@@ -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
configs/tseries_mmc_defconfig +1 -1
index 3fe06eb..5abd7f0 100644
@@ -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
configs/tseries_nand_defconfig +1 -1
index 2993537..19d9004 100644
@@ -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
configs/tseries_spi_defconfig +1 -1
index 4c6d544..ae93795 100644
@@ -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
configs/uniphier_pro4_defconfig +0 -1
index 989f614..7d50f1c 100644
@@ -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"
configs/ventana_defconfig +0 -1
index 9e4e7f6..0cce4d4 100644
@@ -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
configs/vexpress_aemv8a_dram_defconfig +0 -1
index 0b5799a..440dccf 100644
@@ -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
configs/vexpress_aemv8a_juno_defconfig +0 -1
index 07036cc..c702800 100644
@@ -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
configs/vexpress_aemv8a_semi_defconfig +0 -1
index 16d6796..d7f7294 100644
@@ -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
configs/vf610twr_defconfig +0 -1
index 7c83887..d959293 100644
@@ -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
configs/vf610twr_nand_defconfig +0 -1
index 4591526..b6a96f2 100644
@@ -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
configs/xilinx-ppc405-generic_defconfig +5 -7
index 85bc3b9..2008a8d 100644
@@ -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
configs/xilinx-ppc440-generic_defconfig +6 -8
index 3bf2c4f..8df33d3 100644
@@ -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
configs/xilinx_zynqmp_ep_defconfig +1 -1
index c2bbb47..8f3d38c 100644
@@ -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
Signature · 1 line
1.8.2.1
author
#1 lore raw

PATCH v2 2/3 net: Move CONFIG_RTL8139 to Kconfig

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

Signed-off-by Bin Meng <[email protected]>

---

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(-)
configs/MPC8544DS_defconfig +1 -0
index 9790d8a..8937682 100644
@@ -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
drivers/net/Kconfig +6 -0
index bc2f51d..3ac6b66 100644
@@ -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
include/configs/MPC8536DS.h +0 -1
index 9298c30..980cb99 100644
@@ -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
include/configs/MPC8544DS.h +0 -1
index 494c46f..2372d5f 100644
@@ -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
include/configs/MPC8572DS.h +0 -1
index cfcd5b9..95f59e0 100644
@@ -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
include/configs/MPC8641HPCN.h +0 -1
index bd0a3f5..1f4ed2a 100644
@@ -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
include/configs/r2dplus.h +0 -5
index 2d1e56a..82e7a89 100644
@@ -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 */
Signature · 1 line
1.8.2.1
#3 lore raw

PATCH v2 2/3 net: Move CONFIG_RTL8139 to Kconfig

In reply to Bin Meng
Quoted 8 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2: None

Quoted 8 lines
 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

author
#4 lore raw

PATCH v2 2/3 net: Move CONFIG_RTL8139 to Kconfig

Quoted 18 lines · Scott Wood
Quoted 8 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2: None

Quoted 8 lines
 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(-)
Quoted 2 lines

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

#5 lore raw

PATCH v2 2/3 net: Move CONFIG_RTL8139 to Kconfig

Hi Bin,

Quoted 22 lines · Bin Meng
Quoted 18 lines · Scott Wood
Quoted 8 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2: None

Quoted 8 lines
 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(-)
Quoted 2 lines

What about the defconfig for MPC8641HPCN and r2dplus?

Quoted 6 lines

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

#6 lore raw

PATCH v2 2/3 net: Move CONFIG_RTL8139 to Kconfig

Quoted 28 lines · Joe Hershberger

Hi Bin,

Quoted 25 lines · Bin Meng
Quoted 18 lines · Scott Wood
Quoted 8 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2: None

Quoted 8 lines
 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(-)
Quoted 2 lines

What about the defconfig for MPC8641HPCN and r2dplus?

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

Quoted 6 lines
Quoted 3 lines

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.

Signature · 8 lines
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>
author
#7 lore raw

PATCH v2 2/3 net: Move CONFIG_RTL8139 to Kconfig

Quoted 31 lines · Tom Rini
Quoted 30 lines · Joe Hershberger

Hi Bin,

Quoted 27 lines · Bin Meng
Quoted 18 lines · Scott Wood
Quoted 8 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2: None

Quoted 8 lines
 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(-)
Quoted 2 lines

What about the defconfig for MPC8641HPCN and r2dplus?

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

Hi Joe, Masahiro,

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

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

#8 lore raw

PATCH v2 2/3 net: Move CONFIG_RTL8139 to Kconfig

In reply to Bin Meng
Quoted 5 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>
Acked-by Joe Hershberger <[email protected]>

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

Signature · 8 lines
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>
author
#9 lore raw

PATCH v2 3/3 net: Move CONFIG_RTL8169 to Kconfig

In reply to Bin Meng

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

Signed-off-by Bin Meng <[email protected]>

---

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(-)
configs/beaver_defconfig +1 -0
index fcfbf65..9e6a5c3 100644
@@ -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
configs/cardhu_defconfig +1 -0
index 808e0e2..eba46e7 100644
@@ -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
configs/chromebox_panther_defconfig +1 -0
index 7a27154..3d79502 100644
@@ -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
configs/jetson-tk1_defconfig +1 -0
index c07b278..d964f1c 100644
@@ -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
configs/minnowmax_defconfig +1 -0
index ea39e6a..efb9c1e 100644
@@ -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
configs/p2371-2180_defconfig +1 -0
index 392c539..a8b1247 100644
@@ -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
configs/trimslice_defconfig +1 -0
index a0b3a3e..2d8579b4 100644
@@ -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
drivers/net/Kconfig +6 -0
index 3ac6b66..2a229b8 100644
@@ -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
include/configs/beaver.h +0 -3
index c672a8e..f68d8ee 100644
@@ -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
include/configs/cardhu.h +0 -3
index fc2dc5a..acfe968 100644
@@ -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
include/configs/chromebox_panther.h +0 -2
index d5b3390..05266e8 100644
@@ -10,6 +10,4 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#define CONFIG_RTL8169
-
 #endif	/* __CONFIG_H */
include/configs/jetson-tk1.h +0 -3
index 763d2ec..59dbb20 100644
@@ -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
include/configs/minnowmax.h +0 -1
index 10ca05f..e0006d8 100644
@@ -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"
include/configs/p2371-2180.h +0 -3
index 01fd743..c55f07e 100644
@@ -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
include/configs/r7780mp.h +0 -3
index 82a056c..e2da244 100644
@@ -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
include/configs/sh7785lcr.h +0 -3
index 2ba0c58..e85256d 100644
@@ -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
include/configs/trimslice.h +0 -3
index 92ebb6a..ca188be 100644
@@ -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
Signature · 1 line
1.8.2.1
#12 lore raw

PATCH v2 3/3 net: Move CONFIG_RTL8169 to Kconfig

In reply to Bin Meng
Quoted 6 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>
Acked-by Stephen Warren <[email protected]>
Acked-by Joe Hershberger <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
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>
#14 lore raw

PATCH v2 1/3 defconfig: Reorder boards' defconfig files

In reply to Bin Meng
Quoted 4 lines · Bin Meng

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

Signed-off-by Bin Meng <[email protected]>
Acked-by Joe Hershberger <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
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>