This patch ensures that default configs allow multiple sun4i and sun7i devices boot and work nicely with the same NFS root. Tested with Cubietruck, Cubieboard2 and A10-Lime.
ROOT_NFS is enabled in sun4i_defconfig. GMAC is enabled in sun7i_defconfig for Cubietruck support. Also different localversion identifiers are set for sun4i and sun7i to avoid a possible clash between the names of directories with kernel modules. Signed-off-by: Siarhei Siamashka <siarhei.siamas...@gmail.com> --- arch/arm/configs/sun4i_defconfig | 6 ++++++ arch/arm/configs/sun7i_defconfig | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/sun4i_defconfig b/arch/arm/configs/sun4i_defconfig index edcafc1..bc08315 100644 --- a/arch/arm/configs/sun4i_defconfig +++ b/arch/arm/configs/sun4i_defconfig @@ -1,4 +1,5 @@ CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-sun4i" CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y @@ -67,6 +68,10 @@ CONFIG_XFRM_USER=y CONFIG_NET_KEY=y CONFIG_INET=y CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y CONFIG_NET_IPIP=y CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y @@ -284,6 +289,7 @@ CONFIG_CONFIGFS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y CONFIG_CIFS=y CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y diff --git a/arch/arm/configs/sun7i_defconfig b/arch/arm/configs/sun7i_defconfig index c585d7a..6f75e7b 100644 --- a/arch/arm/configs/sun7i_defconfig +++ b/arch/arm/configs/sun7i_defconfig @@ -1,4 +1,5 @@ CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-sun7i" CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y @@ -469,7 +470,7 @@ CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_TUN=m CONFIG_SUNXI_EMAC=y -CONFIG_PHYLIB=y +CONFIG_SUNXI_GMAC=y CONFIG_MICREL_KS8995MA=m CONFIG_PLIP=m CONFIG_PPP=y -- 1.8.3.2 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
