From patchwork Sun May 15 13:37:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: adron@yapic.net X-Patchwork-Id: 622374 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r74QD4gJpz9sdQ for ; Sun, 15 May 2016 23:37:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=yapic.net header.i=@yapic.net header.b=higrD+UO; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 83FF6B9221B; Sun, 15 May 2016 15:37:02 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Sun, 15 May 2016 15:37:02 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1FC5DB9221A for ; Sun, 15 May 2016 15:37:01 +0200 (CEST) X-policyd-weight: using cached result; rate: -6.1 Received: from mailserv.yapic.net (mailserv.yapic.net [194.150.175.70]) by arrakis.dune.hu (Postfix) with ESMTP for ; Sun, 15 May 2016 15:36:59 +0200 (CEST) Received: from adron-nout (unknown [195.189.99.194]) by mailserv.yapic.net (Postfix) with ESMTPSA id 40F8233B83B7; Sun, 15 May 2016 16:36:57 +0300 (MSK) X-DKIM: OpenDKIM Filter v2.6.8 mailserv.yapic.net 40F8233B83B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yapic.net; s=mailserv; t=1463319417; bh=sNWa8Yagu+mQGd2xR3nEqaKBeeTWbG7dRuZAfrojFYo=; h=From:To:Cc:Subject:Date:From; b=higrD+UOYBCCqOVipG67eO+S5BvU+EXmMv7xuvwZSAiqlaFPlaeaMK5cDO7YnXiXO aMdcid5bFQ1t+pIkbWThLJ86Nz7FXrS3Uys/qp0I4FPnKO3zqXP6lufdj9xVQjEs7r ajTxlg2DEM+AeZc1dXlVzqeJ7s275RYtIimO+8No= Received: from root by adron-nout with local (Exim 4.82) (envelope-from ) id 1b1wEE-0001Og-Cs; Sun, 15 May 2016 16:37:06 +0300 From: adron@yapic.net To: openwrt-devel@lists.openwrt.org Date: Sun, 15 May 2016 16:37:01 +0300 Message-Id: <1463319421-5226-1-git-send-email-adron@yapic.net> X-Mailer: git-send-email 1.9.1 Subject: [OpenWrt-Devel] [PATCH] ar71xx: tools/kernel2minor. Remove kernel2mikrotikyaffs2 section from Target Images submenu. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Sergeev MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Sergey Sergeev It is no longer necessary because now to get mikrotik's yaffs2 kernel image we using KERNEL := ... | kernel2mikor ... in target/linux/ar71xx/image/Makefile -> Device/rb-... section. Signed-off-by: Sergey Sergeev --- config/Config-images.in | 31 ------------------------------- target/linux/ar71xx/image/Makefile | 14 -------------- 2 files changed, 45 deletions(-) diff --git a/config/Config-images.in b/config/Config-images.in index c7d1898..a60dd50 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -6,37 +6,6 @@ menu "Target Images" - menuconfig TARGET_KERNELFS_MIKROTIK_YAFFS2 - bool "kernel2mikrotikyaffs2" - default y if USES_KERNEL2MIKROTIKYAFFS2 - depends on USES_KERNEL2MIKROTIKYAFFS2 - help - Build a Mikrotik's version of Yaffs2 filesystem which contains only a single kernel file. - This is necessary for boot through RouterBoot boot loader. - - config TARGET_MIKROTIK_YAFFS2_NOR_FLASH_IMG - bool "NOR flash image" - depends on TARGET_KERNELFS_MIKROTIK_YAFFS2 - default "y" - help - Build Mikrotik's Yaffs2 filesystem image for NOR flash boards: - Mikrotik rb941-2nd(hAP lite) - And maby(not tested yet) all new routerboards with this strings in description: - Storage type FLASH - Storage size 16 MB - - config TARGET_MIKROTIK_YAFFS2_NAND_2048B_ECC_FLASH_IMG - bool "NAND flash (2048b with ECC) image" - depends on TARGET_KERNELFS_MIKROTIK_YAFFS2 - default "y" - help - Build Mikrotik's Yaffs2 filesystem image for NAND flash boards: - Mikrotik rb750 and rb751 - And maby(not tested yet) all routerboards with NAND flash parameters like this: - Eraseblock size: 131072 bytes, 128.0 KiB - Minimum input/output unit size: 2048 bytes - OOB size: 64 bytes - menuconfig TARGET_ROOTFS_INITRAMFS bool "ramdisk" default y if USES_INITRAMFS diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 9fae043..20a0f7e 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -1492,17 +1492,6 @@ define MkuImageOKLI endef endif -define kernel2mikrotikyaffs2 -#NOR flash -ifneq ($(CONFIG_TARGET_MIKROTIK_YAFFS2_NOR_FLASH_IMG),) - $(STAGING_DIR_HOST)/bin/kernel2minor -k $(KDIR)/loader-generic.elf -r $(VMLINUX)-lzma.nor-tik-yaffs2 -s 1024 -e -endif -#NAND flash 2048b with ECC -ifneq ($(CONFIG_TARGET_MIKROTIK_YAFFS2_NAND_2048B_ECC_FLASH_IMG),) - $(STAGING_DIR_HOST)/bin/kernel2minor -k $(KDIR)/loader-generic.elf -r $(VMLINUX)-lzma.nand-tik-yaffs2-2048b-ecc -s 2048 -c -e -endif -endef - # $(1): name of the 1st file. # $(2): size limit of the 1st file if it is greater than 262144, or # the erase size of the flash if it is greater than zero and less @@ -1693,9 +1682,6 @@ define Image/BuildKernel $(call MkuImage,gzip,,$(KDIR)/vmlinux.bin.gz,$(UIMAGE)-gzip.bin) $(call MkuImage,lzma,,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin) cp $(KDIR)/loader-generic.elf $(VMLINUX)-lzma.elf -ifneq ($(CONFIG_TARGET_KERNELFS_MIKROTIK_YAFFS2),) - $(call kernel2mikrotikyaffs2) -endif -mkdir -p $(KDIR_TMP) $(call Image/Build/Profile/$(IMAGE_PROFILE),buildkernel) endef