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 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 09EC8C433F5 for ; Sat, 28 May 2022 23:13:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A92BD8436F; Sun, 29 May 2022 01:13:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OcHY0ofu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B5DE283F24; Sun, 29 May 2022 01:13:30 +0200 (CEST) Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) (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 0B6DC83FC8 for ; Sun, 29 May 2022 01:13:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pf1-x42d.google.com with SMTP id y1so7427553pfr.6 for ; Sat, 28 May 2022 16:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7bUezSgbhZ/AW0WXfTGowwgSVEnSsF56yILSHrWkwAc=; b=OcHY0ofug6ZdG3sljOnZumTJj3s/T5povLsbbeu7WW8BupQ2XSql1UL5+qQMyAaFCG bsRCj2C6ZfndlpnMliKqFpiDIdqDfldbriwWiKU4kCOfhIJdD5q3lzcpn8n6qlU6Hn14 UzxhXfHxO2aN2A2q2j9x2TJbyED8b5agsDTsq8gZKgAe0mGzvoHqdIG8i/wASywjTMJc sGVWCUilFVlZM2Z0e8mwTanDt4CysiQkhNmIHfOIA4yAwnwJt4r7bp3M9ngvNYlO8ciW 5KhVG3BSpKnl715JXvO+/z3lO1OT27gJCprKZHdYu/p4ona80uqyF/n/uNNydZJdYiY7 d94A== 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:mime-version :content-transfer-encoding; bh=7bUezSgbhZ/AW0WXfTGowwgSVEnSsF56yILSHrWkwAc=; b=2anmQODDJPSJUcvI2o3ygQHFYZQL9uwl5t8KYTugh+gF8+4fWZtR+J8Jrnwer9t4R+ DijgOJr/+1cYcP7/dPESsXUXpOv70Qmn3QntIvJPl4NUFFXNs5nLQPrcnaDyRgwlxzMZ ZEY5DSdjAkAplIDeNynSqaVg6nOuk/tK9RFmBxgHKFgEnGlhDsMOEjBGcO0rY3IoAi+1 m/MCNMk/cQEvbAoFFb4p5BCNBvmG9HgavG2h0u7ciFTH7WQUEEzZRJKxz2fF1tRPKXwg JhkKQN+obcLtwXMv0p6BxFiQZRemoB9KDx1buQ3LzS1DBRmnM51V7RUVu9ePVHJ/17ZV fLRQ== X-Gm-Message-State: AOAM531Zp/ZjigXuuK/ij82vwxsdCSjtINPm4Po5l959YT3G60A3ZLM8 UyfZnl2+y+pzWyAEIgjScVUczUM0lLQ= X-Google-Smtp-Source: ABdhPJwSoxZ/TC6ZTYlzPdpPKAKbgr7hiZD3gLPeRyS+FzMq8Izs9Jg/6l2e0LR3mWzcWwdCQLyVWQ== X-Received: by 2002:a63:ec17:0:b0:3fa:74c5:32ef with SMTP id j23-20020a63ec17000000b003fa74c532efmr24764967pgh.505.1653779606065; Sat, 28 May 2022 16:13:26 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:a9ab:7a5c:69ce:1e38]) by smtp.gmail.com with ESMTPSA id b9-20020a17090a488900b001df68146a20sm595308pjh.56.2022.05.28.16.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 May 2022 16:13:25 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Cc: Chris Packham , Stefan Roese , Tom Rini Subject: [PATCH 1/3] arm: mvebu: Use MVEBU_SPL_BOOT_DEVICE instead of SPL_BOOT_DEVICE Date: Sun, 29 May 2022 11:13:16 +1200 Message-Id: <20220528231318.359510-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.36.1 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 Update the way KWB_CFG_SEC_BOOT_DEV is determined to use CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC} instead of CONFIG_SPL_BOOT_DEVICE. Signed-off-by: Chris Packham --- arch/arm/mach-mvebu/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 8bd2246325ca..61eeb9c8c186 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -65,10 +65,12 @@ KWB_REPLACE += CSK_INDEX KWB_CFG_CSK_INDEX = $(CONFIG_SECURED_MODE_CSK_INDEX) KWB_REPLACE += SEC_BOOT_DEV -KWB_CFG_SEC_BOOT_DEV=$(patsubst "%",%, \ - $(if $(findstring BOOT_SPI_NOR_FLASH,$(CONFIG_SPL_BOOT_DEVICE)),0x34) \ - $(if $(findstring BOOT_SDIO_MMC_CARD,$(CONFIG_SPL_BOOT_DEVICE)),0x31) \ - ) +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI),) + KWB_CFG_SEC_BOOT_DEV=0x34 +endif +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) + KWB_CFG_SEC_BOOT_DEV=0x31 +endif KWB_REPLACE += SEC_FUSE_DUMP KWB_CFG_SEC_FUSE_DUMP = a38x -- 2.36.1