Message ID | 20191212004755.11091-7-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="J1/rCGC1"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YFYs0xmrz9sR7 for <incoming@patchwork.ozlabs.org>; Thu, 12 Dec 2019 11:49:37 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 94565814FA; Thu, 12 Dec 2019 01:48:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="J1/rCGC1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C53AC8161D; Thu, 12 Dec 2019 01:48:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 73356814D5 for <u-boot@lists.denx.de>; Thu, 12 Dec 2019 01:48:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd43.google.com with SMTP id k24so855583ioc.4 for <u-boot@lists.denx.de>; Wed, 11 Dec 2019 16:48:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ORuOMDyg98pNelsX26pZ4JKFko6P+NlCPh39Sdoa/uE=; b=J1/rCGC1gp4FPAyiYYJjlC+4NhRtakfqjt+iZKDGL0dX+wXgbi5ppkzrE//NtOvDah JGfWk6ITAD96XWP7ojxNUVmR8GKkBlcgSor2paMTGXC5f8X0AX8JvQWGCHUsgYkzoYYz 01reEKsqaUcaUIPNaGqbzeF8KE4R4uZv5yXUU= 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:mime-version:content-transfer-encoding; bh=ORuOMDyg98pNelsX26pZ4JKFko6P+NlCPh39Sdoa/uE=; b=HS7VCO8abRvPmuut6LxnvzwKBKCNCrc2kpmYqI4/ndV3JyBAlq0KWzbuXmQ+omj03+ gy2d+rp8/oynveUai8rsg+xnC58E86clfAOKDOfW2SrfWHe1WuB5kwt33P2ayNEFIGYl BmjwU8XSkJcHLQJyJQtRlWPrdYb+vaJpsVnm0+qeSOmmC32fG/95Cg9Qun9JPYKWF1mO r0Yk1uLn3e8xvJY9I5Ux+MNPk8NpEEkvlP1n8CBJjM5x+/GHudxTFysR1ugYAessHfrG 2QjsNe+RrsnTodBELjrBnqpMrm1jIQ1gQmDWULTsWSIaUwSQIeRIun/tyTqqgqMiDKa6 QRwQ== X-Gm-Message-State: APjAAAVs4L9WNXSsdyBF7////MpuDRLd9EfiRTSxjAYDOeZb7VyDC2ff 4wPNNJvogJpcw++OgspaNAtmLGIzbKg= X-Google-Smtp-Source: APXvYqy8PmWX5Ir/Ru71RFvlVn8KX3ATdADZUW+rY3DthbD4BNn09Fc/mXi5aQMxV/qC0GDCTC2p8w== X-Received: by 2002:a05:6638:72c:: with SMTP id j12mr6006942jad.136.1576111704079; Wed, 11 Dec 2019 16:48:24 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id a11sm880194ioc.86.2019.12.11.16.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 16:48:23 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Subject: [PATCH 12/35] common: Move CONFIG_SYS_DEF_EEPROM_ADDR out of common.h Date: Wed, 11 Dec 2019 17:47:31 -0700 Message-Id: <20191212004755.11091-7-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.525.g8f36a354ae-goog In-Reply-To: <20191212004755.11091-2-sjg@chromium.org> References: <20191212004755.11091-2-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Cc: Joe Hershberger <joe.hershberger@ni.com>, Tom Rini <trini@konsulko.com>, Boris Brezillon <boris.brezillon@bootlin.com> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
common: Further reduce size of common.h even more
|
expand
|
diff --git a/include/common.h b/include/common.h index f3adf06a37..454e88323c 100644 --- a/include/common.h +++ b/include/common.h @@ -88,10 +88,6 @@ const char *symbol_lookup(unsigned long addr, unsigned long *caddr); long get_ram_size (long *, long); phys_size_t get_effective_memsize(void); -#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) -# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR -#endif - #if defined(CONFIG_SYS_DRAM_TEST) int testdram(void); #endif /* CONFIG_SYS_DRAM_TEST */ diff --git a/include/eeprom.h b/include/eeprom.h index 61eb826a73..79118eb83d 100644 --- a/include/eeprom.h +++ b/include/eeprom.h @@ -21,4 +21,8 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt); #define eeprom_write(dev_addr, offset, buffer, cnt) ((void)-ENOSYS) #endif +#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) +# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR +#endif + #endif
This define seems better suited to the eeprom header file, particularly as it is only used in the eeprom.c file. Move it. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/common.h | 4 ---- include/eeprom.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)