From mboxrd@z Thu Jan 1 00:00:00 1970 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,URIBL_BLOCKED,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 08B34C432BE for ; Mon, 30 Aug 2021 13:17:21 +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 31BAB600AA for ; Mon, 30 Aug 2021 13:17:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 31BAB600AA 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 AA4B683371; Mon, 30 Aug 2021 15:17:14 +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 F06E78337C; Mon, 30 Aug 2021 15:16:55 +0200 (CEST) Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (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 452368337A for ; Mon, 30 Aug 2021 15:16:47 +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-qv1-f52.google.com with SMTP id z2so8187517qvl.10 for ; Mon, 30 Aug 2021 06:16:47 -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:subject:date:message-id:in-reply-to :references; bh=7kAtfrZoIvMtaM+oBUT1BPSazB02SHjAUgtqeAV7m9M=; b=XY/L0J7unREYJ6mTbHpHL7i7VIe/cPHF1e0dn3nBjIGG7DnjfeJPuIoaNLmqkBxN4z SLJh2AACS/Ar3WJk7jDxGTSCtXhiryBPwHwe48nTL/YLYF17+np14RK8p59iciDcskzN iSuMZh9vmX3OWAu8U4tC8masuJfqz928/k8tExV79fRw63jB+Ih++Eg7ty2mkvetE1s5 a/cR3ZSNmSeHczAJBm9ztaUenW2pV4ckD8UDVCHVEKfCAgUqAROWQGW3Teoc1BNxB8a8 lNI3zYiT5rsEB+Vx1NI+x3CQ21jY6sqJQ56y1UoQ0DQl6IOiwMKJDUu1324e1wJWDgTs mMzw== X-Gm-Message-State: AOAM5330OrvS8dzVxSsVbZXP+djwGQOSPzmzMmoIZw8gbeu/VvR8jxQj 1k8lo2CMPrpd0g4KiRg4MTrpEyf0se4F X-Google-Smtp-Source: ABdhPJxMytBQAi/rVcfyJ6ZEyc0JHHYy80bmHKd3zrCupcQNP63RF8i7Nh+iws6XcgBufxxcALSo1w== X-Received: by 2002:a0c:bf4d:: with SMTP id b13mr23504636qvj.33.1630329405253; Mon, 30 Aug 2021 06:16:45 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-8d75-4e9a-efec-7167.res6.spectrum.com. [2603:6081:7b01:cbda:8d75:4e9a:efec:7167]) by smtp.gmail.com with ESMTPSA id s18sm11424103qkj.87.2021.08.30.06.16.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Aug 2021 06:16:44 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 4/5] arm: Add Kconfig entry for MACH_TYPE Date: Mon, 30 Aug 2021 09:16:31 -0400 Message-Id: <20210830131632.18780-4-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210830131632.18780-1-trini@konsulko.com> References: <20210830131632.18780-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 As part of migrating support for ATAGs to Kconfig, add an option for setting and passing MACH_TYPE. Signed-off-by: Tom Rini --- arch/arm/Kconfig | 7 +++++++ configs/icnova-a20-swac_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + include/configs/nokia_rx51.h | 2 -- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 32fac7c53f66..5a1c4a891c3f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1920,6 +1920,13 @@ config SERIAL_TAG bool "Pass system serial number via ATAG" depends on SUPPORT_PASSING_ATAGS +config MACH_TYPE + int "Machine ID number" + depends on SUPPORT_PASSING_ATAGS + help + When booting via ATAGs, the machine type must be passed as a number. + For the full list see https://www.arm.linux.org.uk/developer/machines + config ARCH_SUPPORT_TFABOOT bool diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig index dceb74acf30a..eefec777a9f4 100644 --- a/configs/icnova-a20-swac_defconfig +++ b/configs/icnova-a20-swac_defconfig @@ -4,6 +4,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SERIAL_TAG=y +CONFIG_MACH_TYPE=4283 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac" CONFIG_SPL=y CONFIG_MACH_SUN7I=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 1a6158042497..3c73701a61dc 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -5,6 +5,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_REVISION_TAG=y +CONFIG_MACH_TYPE=1955 CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NOKIA_RX51=y diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index e193290de06f..6c7faae45222 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -23,8 +23,6 @@ */ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ -#define CONFIG_MACH_TYPE MACH_TYPE_NOKIA_RX51 - #include /* get chip and board defs */ #include #include -- 2.17.1