From 7b424b6ec94e8c8bd229827a47d465f6accda4b0 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 9 Mar 2015 12:42:52 +0100 Subject: [PATCH 1/4] lime2: fix gmac vs emac kernel issue The Olimex lime2 has gigabit ethernet instead of fast ethernet of other limes. So it uses the gmac driver instead of the emac driver in linux kernel. --- .../linux/linux/olinuxino-a20lime2/defconfig | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig b/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig index 32e2c88..3dd12ea 100644 --- a/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig @@ -482,7 +482,47 @@ CONFIG_NETDEVICES=y CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_TUN=m -CONFIG_SUNXI_EMAC=y +CONFIG_ETHERNET=y +CONFIG_NET_VENDOR_BROADCOM=y +# CONFIG_B44 is not set +# CONFIG_NET_CALXEDA_XGMAC is not set +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_NET_VENDOR_CIRRUS=y +# CONFIG_CS89x0 is not set +# CONFIG_DM9000 is not set +# CONFIG_DNET is not set +CONFIG_NET_VENDOR_DLINK=y +# CONFIG_DE600 is not set +# CONFIG_DE620 is not set +CONFIG_NET_VENDOR_FARADAY=y +# CONFIG_FTMAC100 is not set +# CONFIG_FTGMAC100 is not set +CONFIG_NET_VENDOR_INTEL=y +CONFIG_NET_VENDOR_I825XX=y +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NET_VENDOR_8390=y +# CONFIG_AX88796 is not set +# CONFIG_ETHOC is not set +CONFIG_NET_VENDOR_SEEQ=y +# CONFIG_SEEQ8005 is not set +CONFIG_NET_VENDOR_SMSC=y +# CONFIG_SMC91X is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +CONFIG_NET_VENDOR_STMICRO=y +# CONFIG_STMMAC_ETH is not set +CONFIG_SUNXI_EMAC=m +CONFIG_SUNXI_GMAC=y +CONFIG_GMAC_SCRIPT_SYS=y +CONFIG_GMAC_CLK_SYS=y +CONFIG_GMAC_RING=y +# CONFIG_GMAC_CHAINED is not set CONFIG_PHYLIB=y CONFIG_MICREL_KS8995MA=m CONFIG_PLIP=m @@ -581,6 +621,7 @@ CONFIG_RTL8723AS=m CONFIG_RTXX7X_SW=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_SDIO=m +CONFIG_WIMAX_I2400M_SDIO=m CONFIG_WIMAX_IWMC3200_SDIO=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set From 91a61a8de405b8e0a910a2743ca4169979ab7a0e Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 9 Mar 2015 12:45:33 +0100 Subject: [PATCH 2/4] set default u-boot to u-boot Set the PREFERRED_PROVIDER_u-boot and _virtual/bootloader to u-boot. Preperation for adding mainline u-boot. Signed-off-by: Jens Lucius --- conf/machine/include/sunxi.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc index b0e12c6..1d86894 100644 --- a/conf/machine/include/sunxi.inc +++ b/conf/machine/include/sunxi.inc @@ -8,6 +8,8 @@ XSERVER = "xserver-xorg \ PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux-sunxi ?= "3.4.%" PREFERRED_VERSION_linux-libc-headers = "3.4.61" +PREFERRED_PROVIDER_u-boot = "u-boot" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" KERNEL_IMAGETYPE = "uImage" From 90c7651e6413422de7173aba1050e5c29c2c84f9 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Thu, 2 Apr 2015 14:26:29 +0200 Subject: [PATCH 3/4] lime2: fix u-boot name Fix wrong u-boot name in lime2 config. Signed-off-by: Jens Lucius --- conf/machine/olinuxino-a20lime2.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/olinuxino-a20lime2.conf b/conf/machine/olinuxino-a20lime2.conf index 3f2e58d..d7f36ba 100644 --- a/conf/machine/olinuxino-a20lime2.conf +++ b/conf/machine/olinuxino-a20lime2.conf @@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa7.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "A20-OLinuXino-Lime2_config" +UBOOT_MACHINE = "A20-OLinuXino_Lime2_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" From 091001b76d55b0aeeb6f64c4eb736076677e2e17 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Thu, 2 Apr 2015 14:27:31 +0200 Subject: [PATCH 4/4] lime2: remove double kernel config entry An earlier patch introduced a double kernel config line. Remove it. Signed-off-by: Jens Lucius --- recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig b/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig index 3dd12ea..94bd641 100644 --- a/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig @@ -621,7 +621,6 @@ CONFIG_RTL8723AS=m CONFIG_RTXX7X_SW=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_SDIO=m -CONFIG_WIMAX_I2400M_SDIO=m CONFIG_WIMAX_IWMC3200_SDIO=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set