Hi,
On 09/04/14 04:47, Siarhei Siamashka wrote:
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.
forcing this into the local version doesn't feel like the good solution
to this problem.
there is the hardcoded path (like abusing LOCALVERSION), but also the
MAC address path, and the soc-detect path.
the MAC address can be used to give the image name on dhcp, or make
MAC.img symlinks in /var/lib/tftpdir as `tftp` will download MAC.img if
no file name is given.
or extending u-boot-sunxi using soc-detect to set a variable with the
sunNi value, or sunNi-AXX, or the aw16NN or aw16NN-aXX or... or use
soc-detect to make uImage multi-sunxi.
Signed-off-by: Siarhei Siamashka <[email protected]>
---
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
can you resend the unification part (excluding LOCALVERSION) in a
separated commit?
Thanks!
Alejandro Mery
--
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 [email protected].
For more options, visit https://groups.google.com/d/optout.
