From 6231e5cf7719ef75fab2325dcba05a1a03701e92 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 15 Mar 2015 16:57:55 -0500
Subject: remove ADDON feature

---
 mk/build.mk                       |  8 --------
 target/config/Config.in.target    |  1 -
 toolchain/kernel-headers/Makefile | 30 ------------------------------
 3 files changed, 39 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index 7bd5eeaff..8ae803fab 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -27,10 +27,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_U_BOOT=n \
 			ADK_PACKAGE_CRYPTINIT=n \
 			ADK_PACKAGE_URLGRABBER=n \
-			ADK_KERNEL_ADDON_YAFFS2=n \
-			ADK_KERNEL_ADDON_GRSEC=n \
-			ADK_KERNEL_ADDON_MPTCP=n \
-			ADK_KERNEL_ADDON_DIETNET=n \
 			ADK_KERNEL_MPTCP=n \
 			ADK_STATIC_TOOLCHAIN=n \
 			ADK_TOOLCHAIN_WITH_SSP=n \
@@ -126,10 +122,6 @@ POSTCONFIG=		-@\
 			cleandir=1;\
 			rebuild=1;\
 		fi; \
-		if [ "$$(grep ^ADK_KERNEL_ADDON .config|md5sum)" != "$$(grep ^ADK_KERNEL_ADDON .config.old|md5sum)" ];then \
-			echo "You should rebuild the kernel with 'make cleankernel'";\
-			rebuild=1;\
-		fi; \
 		if [ "$$(grep ^ADK_TARGET_USE .config|md5sum)" != "$$(grep ^ADK_TARGET_USE .config.old|md5sum)" ];then \
 			cleandir=1;\
 			rebuild=1;\
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index c3aea5d99..cbed8ee5c 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -74,7 +74,6 @@ config ADK_TARGET_ROOTFS_YAFFS
 	select ADK_KERNEL_YAFFS_FS
 	select ADK_KERNEL_YAFFS_YAFFS2
 	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
-	select ADK_KERNEL_ADDON_YAFFS2
 	depends on ADK_TARGET_WITH_NAND
 	help
 	  Root filesystem on NAND flash with YAFFS2.
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 0a935d58a..c7c7eefef 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -36,36 +36,6 @@ ifneq ($(ADK_DISABLE_TARGET_KERNEL_PATCHES),y)
 		$(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_BOARD)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
 	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
 		$(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
-endif
-ifeq ($(ADK_KERNEL_ADDON_FBLOGO),y)
-	$(TRACE) fblogo-kernel-patch
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
-		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-fblogo $(MAKE_TRACE)
-endif
-ifeq ($(ADK_KERNEL_ADDON_YAFFS2),y)
-	$(TRACE) yaffs2-kernel-patch
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
-		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-yaffs2 $(MAKE_TRACE)
-endif
-ifeq ($(ADK_KERNEL_ADDON_GRSEC),y)
-	$(TRACE) grsec-kernel-patch
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
-		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-grsec $(MAKE_TRACE)
-endif
-ifeq ($(ADK_KERNEL_ADDON_MPTCP),y)
-	$(TRACE) mptcp-kernel-patch
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
-		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-mptcp $(MAKE_TRACE)
-endif
-ifeq ($(ADK_KERNEL_ADDON_DIETNET),y)
-	$(TRACE) dietnet-kernel-patch
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
-		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-dietnet $(MAKE_TRACE)
-endif
-ifeq ($(ADK_KERNEL_ADDON_LINUXRT),y)
-	$(TRACE) linux-rt-kernel-patch
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
-		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-linuxrt $(MAKE_TRACE)
 endif
 	touch $@
 
-- 
cgit v1.2.3