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 7F1ACC433EF for ; Tue, 5 Jul 2022 13:04:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D9C8584516; Tue, 5 Jul 2022 15:04:33 +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="nOyF3dXs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2BD4284500; Tue, 5 Jul 2022 15:04:32 +0200 (CEST) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 B2B7984511 for ; Tue, 5 Jul 2022 15:04:29 +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=jbx6244@gmail.com Received: by mail-ej1-x630.google.com with SMTP id lw20so21540350ejb.4 for ; Tue, 05 Jul 2022 06:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to:references :content-language:in-reply-to:content-transfer-encoding; bh=z0u+AZ6Zx4GYIzTUWp3j9SatTTuK6P4n1aC1Bhkgxpk=; b=nOyF3dXs8rFpGA3MBCmsE00AXsy7pi0O9Sf0e1o8W4iZTouMbl5rBjNkPsl3paVTVJ MjJFh/uami2+S97FfbHvwY1byfuRcS8Y5EnvLEIDThYpzdFAw92FwdJvqyspi1qIOasz 8wTt5Zzpgllylx7eOFYeeZ1bvvYTP2LT4Ab6ky6HDJ2ajxeUDJmY8Ry3DjrrmJgxJmHd XgkqrxxD1LrOYX8WJhOgdMSI/vGdLjOmgQTfyn4J+0JLhoomR6cwA7hMvNLmbuYx2B8x 2uHTdXjnCkkuzeSCVS+0afdC/9NZRzcXpapx346OBuhhiCYSuQQ8ZSybDld3AduYj3kj ZOTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:references:content-language:in-reply-to :content-transfer-encoding; bh=z0u+AZ6Zx4GYIzTUWp3j9SatTTuK6P4n1aC1Bhkgxpk=; b=xXHp//PwnMKqJCVCKk/9UcoVRZ2lZ1ZJM5Bs2K1IaF3oyUonEp8HmC0UzQJOB5ucYX 7Okqm5H/tuqzM1K/gK5xMlKcdXlkHE5pK2xZf4zhDaW/cw2hkBUHA1s7qWcdoVjUeSHo gt5heVy9WrhQRkslucgXZoIoMgW2DcdDzH7nT1dZkaVZtcQwRejCSCoJIH6IOI9PF21I sTWOItSw9qCKP+Uh7dhdWYd8ntjMoLzqMYg2jqmpQ0czQ3+3DZFwd1Y8w/YPT9J1BdV2 8SJNr/0BWh9bl/WXHYXITO6iIG+tW8nihpMoTTdbmRiVy2kvZpLMReY/7QXg/OGUMxeK CKAQ== X-Gm-Message-State: AJIora8EzQmmKpURcDQ48lvmFFm0tIkUcFFtmeYChBxw3mXeCLYLjePv Gd+etLX8cTTuSrOtrBvK4BU= X-Google-Smtp-Source: AGRyM1sY2MhUXsib4MnW1qbrDgFgmHpcA02C0W5EqHsdMEROWofS0wqnVKQ1X4OqeanZ5/8NigDiLQ== X-Received: by 2002:a17:907:7202:b0:722:e4d6:2e17 with SMTP id dr2-20020a170907720200b00722e4d62e17mr34061428ejc.434.1657026269214; Tue, 05 Jul 2022 06:04:29 -0700 (PDT) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id b7-20020a17090630c700b0072aebed5937sm535249ejb.221.2022.07.05.06.04.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Jul 2022 06:04:28 -0700 (PDT) Message-ID: Date: Tue, 5 Jul 2022 15:04:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 From: Johan Jonker Subject: [PATCH v1 2/6] rockchip: spl: allow more boot devices To: Kever Yang , Simon Glass , Philipp Tomsich , xypron.glpk@gmx.de, U-Boot-Denx , Yifeng Zhao , jon.lin@rock-chips.com, "open list:ARM/Rockchip SoC support" , miquel.raynal@bootlin.com, michael@amarulasolutions.com, dario.binacchi@amarulasolutions.com References: <20220701094304.1846-1-jbx6244@yandex.com> Content-Language: en-US In-Reply-To: <20220701094304.1846-1-jbx6244@yandex.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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.6 at phobos.denx.de X-Virus-Status: Clean From: Johan Jonker Rockchip SoCs have more boot device options then currently included in the function spl_boot_device(). Make this function generic for SPI and NAND. Signed-off-by: Johan Jonker --- This patch should replace a patch in the serie called: [PATCH v1 02/17] rockchip: spl: allow more boot devices https://lore.kernel.org/u-boot/20220508150825.21711-3-jbx6244@gmail.com/ Changed: replace #elseif by #elif --- arch/arm/mach-rockchip/spl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index ceef9d91..aab3804f 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -53,13 +53,16 @@ u32 spl_boot_device(void) { u32 boot_device = BOOT_DEVICE_MMC1; -#if defined(CONFIG_TARGET_CHROMEBOOK_JERRY) || \ +#if defined(CONFIG_SPI_BOOT) || \ + defined(CONFIG_TARGET_CHROMEBOOK_JERRY) || \ defined(CONFIG_TARGET_CHROMEBIT_MICKEY) || \ defined(CONFIG_TARGET_CHROMEBOOK_MINNIE) || \ defined(CONFIG_TARGET_CHROMEBOOK_SPEEDY) || \ defined(CONFIG_TARGET_CHROMEBOOK_BOB) || \ defined(CONFIG_TARGET_CHROMEBOOK_KEVIN) return BOOT_DEVICE_SPI; +#elif defined(CONFIG_NAND_BOOT) + return BOOT_DEVICE_NAND; #endif if (CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM)) return BOOT_DEVICE_BOOTROM; -- 2.20.1