From patchwork Mon Jun 4 09:45:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 924903 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mO9CROqA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40zqn40SCRz9rvt for ; Mon, 4 Jun 2018 19:45:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3FEF6C21EFB; Mon, 4 Jun 2018 09:45:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1E08AC21E89; Mon, 4 Jun 2018 09:45:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 96FCCC21E89; Mon, 4 Jun 2018 09:45:34 +0000 (UTC) Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by lists.denx.de (Postfix) with ESMTPS id 04005C21E7D for ; Mon, 4 Jun 2018 09:45:34 +0000 (UTC) Received: by mail-pf0-f181.google.com with SMTP id a63-v6so2236851pfl.1 for ; Mon, 04 Jun 2018 02:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=OH4mfXr65aMjhWVBAHr12DAb/FFjufH2ni/yXXGw3Qc=; b=mO9CROqARcOkdV3vSkw33MalWVbSEeFTJ9y7hYkKawz5PePd4HFlGtP3fp717ZI+45 XEjeXaANPsJZvkYt+fZbdhd0bFxn2pi9/CFgJSC56tpMViEJYWVJXR1Kpxhxgt1PvnfM sfxdvTouos1xlSyyIHezTqXgRgXEPprOSZXkTBoYzCUSI9mAbJuCXcU+z+W7FV0YJbkG ZP5fQp4JqkQZPgKXV6jQfqANJyI4tUTbr9pyqJYF30N6U7RLejDq+Dc0U/vl8RyaLAEl llWPV6BKhzlRS0jCz7httz8keIez44J6IxiO0eifFXBOHFpi3K9dyv///LvUzwBwsbov JgPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OH4mfXr65aMjhWVBAHr12DAb/FFjufH2ni/yXXGw3Qc=; b=TI3m1kRSDhEknvVJ8ttG8XPrbCxGfToxTrVOKJt63DKyGjDsi7ASfYgICUZc0pJJ9Z 2bYVBT6278VH7xM0g6WV22qrO8F5xewAPAh8kHvl+7AJPgKKNq2lk8QpBPpknAX+A0ty C5gDs6cBRTzv0Bs9IJJZ+MDULcoCS2bSSjR6ideO/DYrWaG4Wb76VRo1Ed3q2myCxFSL 4JvJ5j+lCTYR5tl3TQWGmGvwLAyn2EqjxEJF59/UDt4IVltsqxtzAHbyLB9g4stC+wp8 xlvnU4Ra0/hJt/QNQWvinGRIhTpX4bslA8o31LCG16/BinLroViUWPjg5W+eEoopj2ND WKWw== X-Gm-Message-State: APt69E0dHxqmvZqq2w/Xdy1m8Jakf01U0WWbMa3cnXDhIz3q/7XwOQKA qzQjAJFm2KIFPPzwvgsy0P5AXaMc X-Google-Smtp-Source: ADUXVKJXoibps5zk5JC0J7hkH950elbtVU8Dk5na4nJpQGDWb+qHHtTltbReIqHLjJ5xac38M657CA== X-Received: by 2002:a62:1f09:: with SMTP id f9-v6mr685238pff.50.1528105532309; Mon, 04 Jun 2018 02:45:32 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id p20-v6sm8207710pff.90.2018.06.04.02.45.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 02:45:31 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Mon, 4 Jun 2018 21:45:21 +1200 Message-Id: <20180604094523.23876-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 Cc: Oleksandr Zhadan and Michael Durrant , Reinhard Arlt , Chris Packham Subject: [U-Boot] [PATCH 1/3] configs: Remove empty #ifdef/#ifndef blocks X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Remove empty #ifdef/#ifndef..#endif blocks where the configuration they guarded has been completely removed. Signed-off-by: Chris Packham --- include/configs/UCP1020.h | 2 -- include/configs/vme8349.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index fad1eabba336..f5c647870fc0 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -68,8 +68,6 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_ETHPRIME "eTSEC1" -#ifndef CONFIG_SPI_FLASH -#endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_SYS_L2_SIZE (256 << 10) diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 0d8ae0b099b6..2456475f27ca 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -257,9 +257,6 @@ #undef PCI_ONE_PCI1 #endif -#ifndef VME_CADDY2 -#endif - #undef CONFIG_EEPRO100 #undef CONFIG_TULIP From patchwork Mon Jun 4 09:45:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 924905 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sbRlBN3K"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40zqp46J8Kz9ryk for ; Mon, 4 Jun 2018 19:46:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8C2B7C21F2A; Mon, 4 Jun 2018 09:45:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B78E6C21F3A; Mon, 4 Jun 2018 09:45:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BFDB9C21F3F; Mon, 4 Jun 2018 09:45:40 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id 30650C21F06 for ; Mon, 4 Jun 2018 09:45:37 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a12-v6so2130953pfi.3 for ; Mon, 04 Jun 2018 02:45:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VTKPHWx4Rs+3L7w6YmbEGeLCBF1uGuMIB2qXDQpZ/IE=; b=sbRlBN3KIfKujNdzmGNw814xjVoZjP5O9zkiR7f0ae5z24Zrz+2lqUAZZK3GufVjPX avQ1w99/OOs3hEFmjaqBGsWxX49HDE/g/+UCzrYzY9m/ST9OxCvHFZ2ebg90OYypNpNv 8fMAU/v7PAhHjIJQn9XY1CORHdTYM00qA4JhRRy2uriQvyLeUnIXc8XC2KJsQTvilNWx oEaUnUiWX/wr9zdX6BEUs835HO6o79grblSj/QMxh7UEETqa12v0MRGObteK7R17GLsN +pX9zkiNFrEc93nFB+idIDZskl9qlXqcL0+Ul8ZiB54JC11DRijTFYHMDPCXPOSTn6st 3a3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VTKPHWx4Rs+3L7w6YmbEGeLCBF1uGuMIB2qXDQpZ/IE=; b=N6ih3VWLQ1qAU0B3iTzRZlXUm+GHkOgK/9yQO0a4rASQlIjssdZOPKZUfjsvhcncvA 96m4n/gy6a6vqGWynBbHCUFy+lt4R3IDJc47uBSHkZPAO5T9MvZIKCE/wB3Cf0prHNM1 XREnQekQM3V4aTyU99/YelX2qsM4tSFEe6FdnILONMvJmCOD0g8433rzCxv52dRbXKJy B+Px0iZ3bxPhWVfvjW0xwO2ZpzEDz7omTIlddKLBTHKDlbE/E3pmYNYdV0nMl7MfTvbZ SVGnqvy3PPTCrBzJA1mcGtOJwchiiKi7MUEzA6Y/aX35N7CaznrNpdH3QpCaa/2peeiq lG2w== X-Gm-Message-State: APt69E30qwVubSMZOvneQc6S1XVqGwMoPWgilFI77FuYXWa5t5VQeUCs SmLbIha+hWR/EqbNQbMyLvGzCrJpf1M= X-Google-Smtp-Source: ADUXVKJrQiwcqS0NJRRgtqhW7rlyVxjTYNBwyzh59p+X6m0CaIP65btMi9IT2J62AdUCqYLI0bTnHg== X-Received: by 2002:a62:4556:: with SMTP id s83-v6mr527614pfa.73.1528105535673; Mon, 04 Jun 2018 02:45:35 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id p20-v6sm8207710pff.90.2018.06.04.02.45.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 02:45:35 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Mon, 4 Jun 2018 21:45:22 +1200 Message-Id: <20180604094523.23876-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604094523.23876-1-judge.packham@gmail.com> References: <20180604094523.23876-1-judge.packham@gmail.com> Cc: Huan Wang , Chris Packham , Angelo Dureghello Subject: [U-Boot] [PATCH 2/3] m68k: Remove empty #ifdef/#ifndef block X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Whatever code this was guarding has been removed so remove the guards too. Signed-off-by: Chris Packham --- arch/m68k/include/asm/processor.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index 3fafa6ff1a8d..4af69190b737 100644 --- a/arch/m68k/include/asm/processor.h +++ b/arch/m68k/include/asm/processor.h @@ -11,8 +11,4 @@ n: /* Macros for setting and retrieving special purpose registers */ #define setvbr(v) asm volatile("movec %0,%%VBR" : : "r" (v)) -#ifndef __ASSEMBLY__ - -#endif /* ifndef ASSEMBLY*/ - #endif /* __ASM_M68K_PROCESSOR_H */ From patchwork Mon Jun 4 09:45:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 924904 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VDlfKJBK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40zqnn6rqJz9ryk for ; Mon, 4 Jun 2018 19:46:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9980DC21EC9; Mon, 4 Jun 2018 09:46:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7D4FBC21F41; Mon, 4 Jun 2018 09:45:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CC911C21EC9; Mon, 4 Jun 2018 09:45:44 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id 40A41C21F2B for ; Mon, 4 Jun 2018 09:45:41 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id v24-v6so19375698plo.3 for ; Mon, 04 Jun 2018 02:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/ELPqSjw/1E3DJtLpfBAuR6FFgDLG0qN11gqlPZ92Mw=; b=VDlfKJBKnSQASiJtOa0NeOCoDU+3xrad3J26C+fm0/CcnwvqgenoDwnNsbNM97hnJE M4albfFSdmpXnXqYQ8xv9PabMwChRpBxhVIwi62qDMTcIPdkA76/1hXrLQjG0hjj4dWb WrGw5fSei4olAxelK9Xqu5OrHvP5DS8ERDxydSL41QWoIXVib6atETERIdU6JnLxT8rV lhXGyPyXPb7pMFCI/9j/YMorCMXVBNxIXb2BLqwOZErl2Zc7/l27O3SML5w0+Pog81Gl FRiCi5J4g6M7s7c2ilrBeu6A28GV7EMGelpS0w6sIQzO3CrCnIVCTrxhw5dVf1puzfos 8u0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/ELPqSjw/1E3DJtLpfBAuR6FFgDLG0qN11gqlPZ92Mw=; b=qbc+OKecWp3jVyZLefqIrjQy9rE6mB5ZxgzY3d4teTxlw6VI3HsQS9aCnlAXMqYGb0 dAHcZKMnFC6ppiweQRMnToLZKctAVvgS20QUEyHx1VF+xa4DqUb4xvuOGQFzGWUaNvMk TTTO0PO5GiDuHvKfDfsQ8wfnBfigFlZCACZLTuVzGZdFNGWcWqKUWOQDF8loasG+iz8C q6IUZtQsvPzh0sj/POETG7+Ff912U+/IT05dVirBBKqbOZtpQ6g9dBq+B88Q9p1zVgdg XDz8Liu5bWIkWzWZyvOkNCDRQdwHfpBjEYp3cXRcnZIOzdsbr774DvRbbsjHxwTVzIzG YF4g== X-Gm-Message-State: ALKqPwcHm3RJch1DcVEPdBwU1MeYUfvKJgcjNEljYAPWpR++m3vgDuab o39utXazJxgHodWyGOFA+myuADjcziY= X-Google-Smtp-Source: ADUXVKKQQB6PyCHGoc6dMMwghh2AHHP+DKet0YMGLGn+K33dPetjn/Xb3qxg+Hs2nlEULmoKwhajfw== X-Received: by 2002:a17:902:14cb:: with SMTP id y11-v6mr20680871plg.229.1528105539742; Mon, 04 Jun 2018 02:45:39 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id p20-v6sm8207710pff.90.2018.06.04.02.45.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 02:45:39 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Mon, 4 Jun 2018 21:45:23 +1200 Message-Id: <20180604094523.23876-3-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604094523.23876-1-judge.packham@gmail.com> References: <20180604094523.23876-1-judge.packham@gmail.com> Cc: Tom Rini , Maxime Ripard , Chris Packham , Maxime Ripard , Jagan Teki Subject: [U-Boot] [PATCH 3/3] ARM: sunxi: remove empty #ifdef/endif block X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Whatever code this was guarding has been removed so remove the guards too. Signed-off-by: Chris Packham --- arch/arm/mach-sunxi/board.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 7ac8360c0117..58fef05bd737 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -207,9 +207,6 @@ void s_init(void) eth_init_board(); } -#ifdef CONFIG_SPL_BUILD -#endif - /* The sunxi internal brom will try to loader external bootloader * from mmc0, nand flash, mmc2. */