Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 77C1EC433EF for ; Wed, 23 Mar 2022 21:21:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 182DC83FC7; Wed, 23 Mar 2022 22:21:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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 C853D83FCA; Wed, 23 Mar 2022 22:20:29 +0100 (CET) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 B399183FCC for ; Wed, 23 Mar 2022 22:20:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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-f182.google.com with SMTP id j21so2371165qta.0 for ; Wed, 23 Mar 2022 14:20:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w3QYh1IfzbnF00k/0P9QsyXAzplpSahMC3IPy+bjXyk=; b=tod0fA7bKXCH2c5/pOr5Bkk5f5tEQ7TBLO4xQaRDZYhPMl5nwepQ8lopmx9I4pci2u V0voTucD97jsP6KN+C4HaFDHhrWGGTisNiUSNDX9ag3kaY2lSWi3Ch+U9e0cLIO1UzKY sS2QPX+U3/+Xb9QOoDYpIGFw25VRylbI+BdS8PcvgGafawe0p6QoF91hqdBdhOSAuZC0 Hjhh/a6kkhlN0HjPPqiOy3ueYbJF0CHMY+EcLOYlBfLNIB4bUqzYZZCFO+P7tuFOIrzp PCpTDIl/5bgN7FhjiNVP0n28/e3oSlXyE6A73c4tkVv2oBPXCcmB+67AVDYQ6PWPCH0x ZYdg== X-Gm-Message-State: AOAM530kR3uLFJQsSVUsXEF7HIJg9Zb95/kTEUwTiEK8WxZZl10JE1/Y kXnD6k2QSZ8BmJqMWN4RahPoato6pA== X-Google-Smtp-Source: ABdhPJzrDU1mVom1d++NgrkKu1ooIXyEJylYers7TAiHVItqTTTQgXTGpY6LVSvgYWyVJm8nDDvOvg== X-Received: by 2002:ac8:5bc7:0:b0:2e1:ecde:e1e6 with SMTP id b7-20020ac85bc7000000b002e1ecdee1e6mr1642934qtb.529.1648070421420; Wed, 23 Mar 2022 14:20:21 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id w8-20020ac87e88000000b002e1cdc11203sm868269qtj.18.2022.03.23.14.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 14:20:21 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Holger Brunck , Heiko Schocher Subject: [PATCH 09/22] kmtegr1: Drop CONFIG_KMTEGR1 Date: Wed, 23 Mar 2022 17:19:56 -0400 Message-Id: <20220323212009.1066483-9-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220323212009.1066483-1-trini@konsulko.com> References: <20220323212009.1066483-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean The only usage of CONFIG_KMTEGR1 can be replaced by CONFIG_TARGET_KMTEGR1 so do so and remove this other symbol. Cc: Holger Brunck Cc: Heiko Schocher Signed-off-by: Tom Rini --- board/keymile/common/ivm.c | 2 +- configs/kmtegr1_defconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index ff550f7fe766..67db0c50f47c 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -306,7 +306,7 @@ static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset) return 0; page2 = &buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN * 2]; - if (IS_ENABLED(CONFIG_KMTEGR1)) { + if (IS_ENABLED(CONFIG_TARGET_KMTEGR1)) { /* KMTEGR1 has a special setup. eth0 has no connection to the * outside and gets an locally administred MAC address, eth1 is * the debug interface and gets the official MAC address from diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index d6bcc2f38b4e..e697e6e74761 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -122,7 +122,6 @@ CONFIG_83XX_PCICLK=0x3ef1480 CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="KMTEGR1" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " -- 2.25.1