This patch ensures that default configs allow multiple sun4i, sun5i 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. USB_NET is enabled for sun5i because it can allow to use USB ethernet dongles. Also different localversion identifiers are set for in the config files 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/sun5i_defconfig | 7 +++++++ arch/arm/configs/sun7i_defconfig | 8 +++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/sun4i_defconfig b/arch/arm/configs/sun4i_defconfig index dcd586d..38a6073 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 @@ -69,6 +70,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 @@ -286,6 +291,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/sun5i_defconfig b/arch/arm/configs/sun5i_defconfig index 7b0d01d..c01d2f4 100644 --- a/arch/arm/configs/sun5i_defconfig +++ b/arch/arm/configs/sun5i_defconfig @@ -1,4 +1,5 @@ CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-sun5i" CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y @@ -66,6 +67,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 @@ -104,6 +109,7 @@ CONFIG_SCSI_MULTI_LUN=y CONFIG_NETDEVICES=y CONFIG_SUNXI_EMAC=y CONFIG_PHYLIB=y +CONFIG_USB_USBNET=y CONFIG_INPUT_FF_MEMLESS=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set @@ -217,6 +223,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 b463645..a7c8d94 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 @@ -70,6 +71,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 @@ -119,7 +124,7 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SW_SATA_AHCI_PLATFORM=y CONFIG_NETDEVICES=y CONFIG_SUNXI_EMAC=y -CONFIG_PHYLIB=y +CONFIG_SUNXI_GMAC=y CONFIG_RTL8192CU_SW=m CONFIG_INPUT_FF_MEMLESS=y CONFIG_INPUT_POLLDEV=y @@ -286,6 +291,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 -- 2.4.10 -- 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.
