From: Otavio Salvador Date: Mon, 18 Jun 2012 15:08:27 +0000 (-0300) Subject: linux-imx (2.6.35.3): Fix support for NFS root X-Git-Tag: 2.1~1771 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2e29f70171d9e8aa549697acca95276e867f1de9;p=meta-freescale.git linux-imx (2.6.35.3): Fix support for NFS root This allows use of alternative NFS ports and regular NFS root on same kernel. This has also enabled the feature for the supported machines. Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig index 62982c14..852e2e84 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig @@ -1745,7 +1745,7 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set -# CONFIG_ROOT_NFS is not set +CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig index 9f8e278f..41a061e4 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx28evk/defconfig @@ -1864,7 +1864,7 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set -# CONFIG_ROOT_NFS is not set=y +CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig index 42e1d742..7aa8c283 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx51evk/defconfig @@ -2249,7 +2249,7 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set -# CONFIG_ROOT_NFS is not set=y +CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig index 63ff96f5..f6f1b9bf 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53ard/defconfig @@ -2281,7 +2281,7 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set -# CONFIG_ROOT_NFS is not set=y +CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig index 0d3b2dcd..b0c88fbc 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/imx53qsb/defconfig @@ -2278,7 +2278,7 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set -# CONFIG_ROOT_NFS is not set=y +CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx/NFS-Fix-nfsroot-support.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx/NFS-Fix-nfsroot-support.patch new file mode 100644 index 00000000..870f0c5f --- /dev/null +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx/NFS-Fix-nfsroot-support.patch @@ -0,0 +1,31 @@ +From 4a6353dad68074bb7ae08817cd7beb5cd13f2359 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Mon, 18 Jun 2012 12:02:56 -0300 +Subject: [PATCH] NFS: Fix nfsroot support + +The NFS support to use alternative ports breaks building of regular +NFS root support as the API has been change in an incompatible way. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Otavio Salvador +--- + fs/nfs/nfsroot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c +index df101d9..e1578e1 100644 +--- a/fs/nfs/nfsroot.c ++++ b/fs/nfs/nfsroot.c +@@ -506,7 +506,7 @@ static int __init root_nfs_get_handle(void) + if (!request.fh) + goto out; + set_sockaddr(&sin, servaddr, htons(mount_port)); +- status = nfs_mount(&request); ++ status = nfs_mount(&request, NFS_MNT_PROGRAM); + if (status < 0) + printk(KERN_ERR "Root-NFS: Server returned error %d " + "while mounting %s\n", status, nfs_export_path); +-- +1.7.10 + diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb index f116b51d..0ab783bf 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Linux kernel for imx platforms" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -PR = "r22" +PR = "r23" inherit kernel COMPATIBLE_MACHINE = "(mxs|mx5)" @@ -12,6 +12,7 @@ COMPATIBLE_MACHINE = "(mxs|mx5)" SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;tag=rel_imx_2.6.35_11.09.01 \ file://0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch \ file://egalax_ts-enable-single-event-support.patch \ + file://NFS-Fix-nfsroot-support.patch \ file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ file://1130-ENGR00157473-MX5X-UART-disable-UART2-DMA-to-make-G.patch \ file://1132-ENGR00155891-mx53_loco-enable-mc34708-s-WDI-functio.patch \