From a4af40000d46f30cdf1ffe48d8015d6129ce1ec3 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 31 Aug 2013 01:11:29 +0200 Subject: [PATCH] Updated config: Added EMAC network and removed some Android stuff --- Makefile | 2 +- ...0822 => config-3.4.43-cubieboard2_20130827 | 54 ++----------------- 2 files changed, 5 insertions(+), 51 deletions(-) rename config-3.4.43-cubieboard2_20130822 => config-3.4.43-cubieboard2_20130827 (98%) diff --git a/Makefile b/Makefile index b3c3e7c..904f92f 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ PWD = $(shell pwd) WORK = $(PWD)/work CROSSTOOLS = $(PWD)/../../toolchain-hardfp/crosstools -KERNEL_VERSION = 3.4.43-cubieboard2_20130822 +KERNEL_VERSION = 3.4.43-cubieboard2_20130827 .PHONY: all clean image modules map config diff --git a/config-3.4.43-cubieboard2_20130822 b/config-3.4.43-cubieboard2_20130827 similarity index 98% rename from config-3.4.43-cubieboard2_20130822 rename to config-3.4.43-cubieboard2_20130827 index 87ea8e6..d8ae08b 100644 --- a/config-3.4.43-cubieboard2_20130822 +++ b/config-3.4.43-cubieboard2_20130827 @@ -583,7 +583,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=y # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_MROUTE is not set -CONFIG_ANDROID_PARANOID_NETWORK=y +# CONFIG_ANDROID_PARANOID_NETWORK is not set CONFIG_NET_ACTIVITY_STATS=y # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set @@ -889,7 +889,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # # CONFIG_SENSORS_LIS3LV02D is not set # CONFIG_AD525X_DPOT is not set -# CONFIG_SUN4I_VIBRATOR is not set # CONFIG_SUN4I_GPIO_UGLY is not set # CONFIG_SUNXI_DBGREG is not set # CONFIG_ATMEL_PWM is not set @@ -1044,14 +1043,13 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_SUNXI_EMAC is not set +CONFIG_SUNXI_EMAC=y CONFIG_PHYLIB=y # @@ -2397,51 +2395,7 @@ CONFIG_RTC_DRV_SUN4I=y # # Microsoft Hyper-V guest support # -CONFIG_STAGING=y -# CONFIG_USBIP_CORE is not set -# CONFIG_W35UND is not set -# CONFIG_PRISM2_USB is not set -# CONFIG_ECHO is not set -# CONFIG_ASUS_OLED is not set -# CONFIG_RTLLIB is not set -# CONFIG_R8712U is not set -# CONFIG_RTS5139 is not set -# CONFIG_TRANZPORT is not set -# CONFIG_LINE6_USB is not set -# CONFIG_USB_SERIAL_QUATECH2 is not set -# CONFIG_USB_SERIAL_QUATECH_USB2 is not set -# CONFIG_VT6656 is not set -# CONFIG_IIO is not set -# CONFIG_FB_SM7XX is not set -# CONFIG_USB_ENESTORAGE is not set -# CONFIG_BCM_WIMAX is not set -# CONFIG_FT1000 is not set - -# -# Speakup console speech -# -# CONFIG_SPEAKUP is not set -# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set -# CONFIG_STAGING_MEDIA is not set - -# -# Android -# -CONFIG_ANDROID=y -# CONFIG_ANDROID_BINDER_IPC is not set -# CONFIG_ASHMEM is not set -# CONFIG_ANDROID_LOGGER is not set -# CONFIG_ANDROID_RAM_CONSOLE is not set -# CONFIG_PERSISTENT_TRACER is not set -CONFIG_ANDROID_TIMED_OUTPUT=y -# CONFIG_ANDROID_TIMED_GPIO is not set -# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set -CONFIG_ANDROID_SWITCH=y -CONFIG_ANDROID_SWITCH_GPIO=y -# CONFIG_ANDROID_INTF_ALARM_DEV is not set -# CONFIG_PHONE is not set -# CONFIG_USB_WPAN_HCD is not set +# CONFIG_STAGING is not set CONFIG_CLKDEV_LOOKUP=y # -- 2.26.2