aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2014-01-04 17:33:44 +0000
committerZoltan Herpai <wigyori@uid0.hu>2014-01-04 17:33:44 +0000
commit815ceabd9dbbae62b30edad7b9e2923d6624fdfb (patch)
tree29e9377de897986a4db66838ded770661b8e96d7
parent9712b2d6fa5759cb6573c30bc623821e232e3e60 (diff)
downloadupstream-815ceabd9dbbae62b30edad7b9e2923d6624fdfb.tar.gz
upstream-815ceabd9dbbae62b30edad7b9e2923d6624fdfb.tar.bz2
upstream-815ceabd9dbbae62b30edad7b9e2923d6624fdfb.zip
sunxi: emac changes - move emac into module - add into profiles where appropriate
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 39200
-rw-r--r--target/linux/sunxi/config-3.122
-rw-r--r--target/linux/sunxi/modules.mk12
-rw-r--r--target/linux/sunxi/profiles/a20-olinuxino.mk2
-rw-r--r--target/linux/sunxi/profiles/cubieboard.mk2
-rw-r--r--target/linux/sunxi/profiles/cubieboard2.mk2
-rw-r--r--target/linux/sunxi/profiles/pcduino.mk2
6 files changed, 17 insertions, 5 deletions
diff --git a/target/linux/sunxi/config-3.12 b/target/linux/sunxi/config-3.12
index 4158cf6e2e..6d97ba0f41 100644
--- a/target/linux/sunxi/config-3.12
+++ b/target/linux/sunxi/config-3.12
@@ -375,7 +375,7 @@ CONFIG_SPARSE_IRQ=y
# CONFIG_STAGING is not set
CONFIG_STOP_MACHINE=y
CONFIG_STRICT_DEVMEM=y
-CONFIG_SUN4I_EMAC=y
+# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN4I_TIMER=y
CONFIG_SWP_EMULATE=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/target/linux/sunxi/modules.mk b/target/linux/sunxi/modules.mk
index 1a54677046..9a4782ddf2 100644
--- a/target/linux/sunxi/modules.mk
+++ b/target/linux/sunxi/modules.mk
@@ -54,3 +54,15 @@ define KernelPackage/ata-sunxi/description
endef
$(eval $(call KernelPackage,ata-sunxi))
+
+define KernelPackage/sun4i-emac
+ SUBMENU:=$(NETWORK_DEVICES_MENU)
+ TITLE:=AllWinner EMAC Ethernet support
+ DEPENDS:=@TARGET_sunxi
+ KCONFIG:=CONFIG_SUN4I_EMAC
+ FILES:=$(LINUX_DIR)/drivers/net/ethernet/allwinner/sun4i-emac.ko
+ AUTOLOAD:=$(call AutoProbe,sun4i-emac)
+endef
+
+$(eval $(call KernelPackage,sun4i-emac))
+
diff --git a/target/linux/sunxi/profiles/a20-olinuxino.mk b/target/linux/sunxi/profiles/a20-olinuxino.mk
index e7de86a5fe..576417184b 100644
--- a/target/linux/sunxi/profiles/a20-olinuxino.mk
+++ b/target/linux/sunxi/profiles/a20-olinuxino.mk
@@ -8,7 +8,7 @@
define Profile/A20-OLinuXino_MICRO
NAME:=A20 OLinuXino Micro
PACKAGES:=\
- uboot-sunxi-A20-OLinuXino_MICRO kmod-ata-sunxi
+ uboot-sunxi-A20-OLinuXino_MICRO kmod-ata-sunxi kmod-sun4i-emac
endef
define Profile/A20-OLinuXino_MICRO/Description
diff --git a/target/linux/sunxi/profiles/cubieboard.mk b/target/linux/sunxi/profiles/cubieboard.mk
index 2d4e8c2f9b..27db74f2cb 100644
--- a/target/linux/sunxi/profiles/cubieboard.mk
+++ b/target/linux/sunxi/profiles/cubieboard.mk
@@ -8,7 +8,7 @@
define Profile/Cubieboard
NAME:=Cubieboard
PACKAGES:=\
- uboot-sunxi-Cubieboard kmod-ata-sunxi
+ uboot-sunxi-Cubieboard kmod-ata-sunxi kmod-sun4i-emac
endef
define Profile/Cubieboard/Description
diff --git a/target/linux/sunxi/profiles/cubieboard2.mk b/target/linux/sunxi/profiles/cubieboard2.mk
index b211c45f88..13c29a36be 100644
--- a/target/linux/sunxi/profiles/cubieboard2.mk
+++ b/target/linux/sunxi/profiles/cubieboard2.mk
@@ -8,7 +8,7 @@
define Profile/Cubieboard2
NAME:=Cubieboard2
PACKAGES:=\
- uboot-sunxi-Cubieboard2 kmod-ata-sunxi
+ uboot-sunxi-Cubieboard2 kmod-ata-sunxi kmod-sun4i-emac
endef
define Profile/Cubieboard2/Description
diff --git a/target/linux/sunxi/profiles/pcduino.mk b/target/linux/sunxi/profiles/pcduino.mk
index 1f35ddb1b3..2be185a2dd 100644
--- a/target/linux/sunxi/profiles/pcduino.mk
+++ b/target/linux/sunxi/profiles/pcduino.mk
@@ -8,7 +8,7 @@
define Profile/pcDuino
NAME:=pcDuino
PACKAGES:=\
- uboot-sunxi-pcDuino
+ uboot-sunxi-pcDuino kmod-sun4i-emac
endef
define Profile/pcDuino/Description