From b880fcf02128401c823f2a42aca6ae52df5f8625 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 19 Aug 2015 09:33:42 -0600 Subject: Tidy up some defconfig files Several files are out of order. This means that when the moveconfig tool moves CONFIG options to Kconfig it generates a large diff. To avoid this, reorder the files first. Signed-off-by: Simon Glass --- configs/T1042D4RDB_SPIFLASH_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/T1042D4RDB_SPIFLASH_defconfig') diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig index 2504499ba7..1ff088d27a 100644 --- a/configs/T1042D4RDB_SPIFLASH_defconfig +++ b/configs/T1042D4RDB_SPIFLASH_defconfig @@ -1,6 +1,6 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4" CONFIG_PPC=y CONFIG_MPC85xx=y CONFIG_TARGET_T104XRDB=y +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SPI_FLASH=y -- cgit From a77fda1f7df4739d044ca9fcf413b1c93cef111e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 19 Aug 2015 09:33:43 -0600 Subject: net: Move CONFIG_E1000 options to Kconfig Move config for the E1000 Ethernet driver to Kconfig and tidy up affected boards. Signed-off-by: Simon Glass Acked-by: Joe Hershberger --- configs/T1042D4RDB_SPIFLASH_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs/T1042D4RDB_SPIFLASH_defconfig') diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig index 1ff088d27a..ca7243a143 100644 --- a/configs/T1042D4RDB_SPIFLASH_defconfig +++ b/configs/T1042D4RDB_SPIFLASH_defconfig @@ -4,3 +4,5 @@ CONFIG_TARGET_T104XRDB=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4" CONFIG_SPI_FLASH=y +CONFIG_NETDEVICES=y +CONFIG_E1000=y -- cgit