Xilinx: ARM: updated test def configs for NFS root operation

Now that we have both ethernet IPs up and running we need to specify
which ethernet to use for NFS root since the 2nd one is not hooked
up to a network.

It seems that NFS root doesn't work if eth0 is not specified on the
kernel command line.

diff --git a/arch/arm/configs/xilinx_test_defconfig b/arch/arm/configs/xilinx_test_defconfig
index 5cae0eb624778c2c4aee97cc57bdcfcbede85323..46bc1cf32a3373c31a11821407b04308068a13d6 100644 (file)
--- a/arch/arm/configs/xilinx_test_defconfig
+++ b/arch/arm/configs/xilinx_test_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Tue Sep 14 15:59:33 2010
+# Tue Oct  5 09:50:41 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -320,7 +320,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyDF0,9600n8 init=/test/pele_test.sh ip=10.10.70.1 root=/dev/nfs rw nfsroot=10.10.70.101:/exports/root,tcp earlyprintk mtdparts=xilinx_nand:16M(nandtest),-(nandother);physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
+CONFIG_CMDLINE="console=ttyDF0,9600n8 init=/test/pele_test.sh ip=10.10.70.1:::::eth0 root=/dev/nfs rw nfsroot=10.10.70.101:/exports/root,tcp earlyprintk mtdparts=xilinx_nand:16M(nandtest),-(nandother);physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -669,6 +669,7 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_KS8851_MLL is not set
 CONFIG_NETDEV_1000=y
 CONFIG_XILINX_PSS_EMAC=y
+# CONFIG_XILINX_PSS_EMAC_HWTSTAMP is not set
 # CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_RGMII is not set
 CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_GMII=y
 # CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_MII is not set

diff --git a/arch/arm/configs/xilinx_test_smp_defconfig b/arch/arm/configs/xilinx_test_smp_defconfig
index d9b4352cdf4c36a41284edf76be859686955aa7b..78bd2edb678c3426ef62ea5ce496e71d8416e93e 100644 (file)
--- a/arch/arm/configs/xilinx_test_smp_defconfig
+++ b/arch/arm/configs/xilinx_test_smp_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Tue Sep 14 16:00:23 2010
+# Tue Oct  5 09:54:32 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -325,7 +325,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyDF0,9600n8 init=/test/pele_test.sh ip=10.10.70.1 root=/dev/nfs rw nfsroot=10.10.70.101:/exports/root,tcp earlyprintk mtdparts=xilinx_nand:16M(nandtest),-(nandother);physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
+CONFIG_CMDLINE="console=ttyDF0,9600n8 init=/test/pele_test.sh ip=10.10.70.1:::::eth0 root=/dev/nfs rw nfsroot=10.10.70.101:/exports/root,tcp earlyprintk mtdparts=xilinx_nand:16M(nandtest),-(nandother);physmap-flash.0:1M(u-boot),5M(linux),9M(user),1M(scratch),-(rootfs)"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -674,6 +674,7 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_KS8851_MLL is not set
 CONFIG_NETDEV_1000=y
 CONFIG_XILINX_PSS_EMAC=y
+# CONFIG_XILINX_PSS_EMAC_HWTSTAMP is not set
 # CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_RGMII is not set
 CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_GMII=y
 # CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_MII is not set