Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72623C432BE for ; Tue, 17 Aug 2021 22:01:11 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6E5C60FD7 for ; Tue, 17 Aug 2021 22:01:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C6E5C60FD7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9FC382BEC; Wed, 18 Aug 2021 00:00:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id D217182D18; Wed, 18 Aug 2021 00:00:49 +0200 (CEST) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (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 D28AB82C03 for ; Wed, 18 Aug 2021 00:00:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f173.google.com with SMTP id d2so18516801qto.6 for ; Tue, 17 Aug 2021 15:00:36 -0700 (PDT) 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=4GOWJLJrKXwazFSV4FZyc5jndPlOTBGpzr8a9wEYIC0=; b=NRskTQrb8K7NOB1d2x/Hi0bO35nxWcuL+2778zDgoA/tPpBauFT51xzKhUAtvYoq9F Gv+0BKaB4R6XxRAzzKO0mgvywsFhABwhsbIJHQsd3URSVAskLX6snldARbMKssFrAa19 +FClRxR+vB20hISnt35TUGT+zO3Xx6F1e7ICE5rWsSd7TAX0WFkLweHf+Cv8kZd5AiSg Q1vlnm66NwcsU9LB5QxJvJvd0oWu0/6OYoj+XU07DvLr/JOFpzmOBdXGe6+XPSa31qQG f7bW2P2O2wfgVjWf/Rlh7WBUCtr5xnvS5wJnA5uYf8eOORk2iUl4/NpsXyjvYQ7NdOqE 2Q9Q== X-Gm-Message-State: AOAM532Tq0lLkyYIULjHmADo7OaQPXBa0L8V7+pZGuzupcsWr8L8gJ8Z PJ7YZd51GUFJPzvtmbs+/qSKk11oTA/b X-Google-Smtp-Source: ABdhPJxWadA6NM7DuYUSN6EMssGqTfmkXgmbJdYEH43dMybUcc7W7rkEwvnoZtheT8PzsdKTobBlHA== X-Received: by 2002:ac8:108a:: with SMTP id a10mr5233698qtj.14.1629237635409; Tue, 17 Aug 2021 15:00:35 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-f93a-0b29-d1e6-92fc.res6.spectrum.com. [2603:6081:7b01:cbda:f93a:b29:d1e6:92fc]) by smtp.gmail.com with ESMTPSA id 75sm2270996qko.100.2021.08.17.15.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 15:00:34 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Heiko Schocher Subject: [PATCH 03/13] arm: shc: Change CONFIG_SYS_I2C_EEPROM_ADDR to EEPROM_ADDR Date: Tue, 17 Aug 2021 17:59:38 -0400 Message-Id: <20210817220009.22721-4-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210817220009.22721-1-trini@konsulko.com> References: <20210817220009.22721-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean The shc platforms do not make use of the rest of the EEPROM infrastructure. Rather than make more elaborate Kconfig logic, remove this setting from the CONFIG namespace. Cc: Heiko Schocher Signed-off-by: Tom Rini --- board/bosch/shc/board.c | 5 +++-- include/configs/am335x_shc.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index 13fd25e40710..a7a9775fdf4e 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -51,16 +51,17 @@ static int shc_eeprom_valid; /* * Read header information from EEPROM into global structure. */ +#define EEPROM_ADDR 0x50 static int read_eeprom(void) { /* Check if baseboard eeprom is available */ - if (i2c_probe(CONFIG_SYS_I2C_EEPROM_ADDR)) { + if (i2c_probe(EEPROM_ADDR)) { puts("Could not probe the EEPROM; something fundamentally wrong on the I2C bus.\n"); return -ENODEV; } /* read the eeprom using i2c */ - if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, 2, (uchar *)&header, + if (i2c_read(EEPROM_ADDR, 0, 2, (uchar *)&header, sizeof(header))) { puts("Could not read the EEPROM; something fundamentally wrong on the I2C bus.\n"); return -EIO; diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 387d50d51199..5b0eba9afa42 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -225,7 +225,6 @@ #define CONFIG_NET_RETRY_COUNT 10 /* I2C configuration */ -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 1 -- 2.17.1