From patchwork Thu Dec 17 14:09:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1417697 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=T5kz71Ch; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CxYlj0GYSz9sWD for ; Fri, 18 Dec 2020 01:09:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D9B9182BDC; Thu, 17 Dec 2020 15:09:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="T5kz71Ch"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A7A8B82BD8; Thu, 17 Dec 2020 15:09:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 336F682BD5 for ; Thu, 17 Dec 2020 15:09:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x62f.google.com with SMTP id d17so38066809ejy.9 for ; Thu, 17 Dec 2020 06:09:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=06YgrusHQSgyzSNLeZBrfEENaxjvzwW3SDjU5WgH9HU=; b=T5kz71ChTb2R2x6OSZg7MyQbg2U1uVbpAvRY+fT3jyXUx6Rst7vUV5yiD9GlgSWHyg 2ESwrN5YaslfHMzgr9U9GbXgVOsIzgsNGnDVjhimKn1Qd3xRRecKD656jBo4exeMnVjv RL1CMyMn0CaoqCbR7EOcQZbYoc7nPNnMm0ygMGhFj4jjYiCQcnBhiKE8KHntc+MkY/ej 3fFBdxFeZrEJa3+Z9mJBCKjOC6yOT/D8Jzhe7hRGM9HxeXVk0S06FHQPuMSwJ0nMCD+s gJ0opoA/s2XXE3a9lBNtxejn71GJX+44frRCBZLdw8JPnIOH0BaFW9LMQMT3TKpl/RHk 1ZZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=06YgrusHQSgyzSNLeZBrfEENaxjvzwW3SDjU5WgH9HU=; b=uJHZpurJjKSLpFOem0n/pFWECbfAIE9V+efOPJRBHOORIryGPHM7bu6VvWPDo/TCb4 UCy9Muw8pWF3Qupb+0aljawWhZuUF6Q5zrkuZMi55wPsS7IOlaWUUcvYzeuvqfOxbhRr A5OPIrJ7DJdpAciRw0z5HidBA03UPNOJuuGaSADIxzB4Z4zQD3TlZ+G29z8NRrp9R9dg 66zxEi1MaJKe96jnIcChZQFLnD+aF6wGlqI3RPv/rmvr69fqeD0eUkqNsN1glMelu4gy P/YMsiBrqgyYAlDaP+DzbAoCN8tYJ7PJLz+Pg8oRDczz/rMyZiHqjy+Ivm7Pr1ccii5t I/Pg== X-Gm-Message-State: AOAM532q5yVJVqUse+ETorYuOKTwEPKFScRtcTO8dJt/t1M98nWFR2/f +BpBqrU9xcMecYjGSiNQSco9qGe3qURdloJh X-Google-Smtp-Source: ABdhPJxwMkPpdrHLxBOSaAcjREXBfyILd13ITq+JbNTutv7vjGDP8H/lEDg398i2iepba5ewIWXPxA== X-Received: by 2002:a17:906:e247:: with SMTP id gq7mr36639320ejb.27.1608214159627; Thu, 17 Dec 2020 06:09:19 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id g10sm23439664edu.97.2020.12.17.06.09.18 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Dec 2020 06:09:18 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: T Karthik Reddy , Michal Simek Subject: [PATCH 2/2] microblaze: Add nor device to distro boot Date: Thu, 17 Dec 2020 15:09:10 +0100 Message-Id: <8ac2677c9fbacacf457ddcc958eec2121ba29756.1608214147.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <52000119f29265013c668d48fe458772f76cff59.1608214147.git.michal.simek@xilinx.com> References: <52000119f29265013c668d48fe458772f76cff59.1608214147.git.michal.simek@xilinx.com> MIME-Version: 1.0 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.102.3 at phobos.denx.de X-Virus-Status: Clean From: T Karthik Reddy Add parallel nor device to distroboot for microblaze. Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index bc0bf0497378..59b20cf116a8 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -81,6 +81,20 @@ # define BOOT_TARGET_DEVICES_QSPI(func) #endif +#if defined(CONFIG_MTD_NOR_FLASH) +# define BOOT_TARGET_DEVICES_NOR(func) func(NOR, nor, na) +#else +# define BOOT_TARGET_DEVICES_NOR(func) +#endif + +#define BOOTENV_DEV_NOR(devtypeu, devtypel, instance) \ + "bootcmd_nor=cp.b ${script_offset_nor} ${scriptaddr} ${script_size_f} && " \ + "echo NOR: Trying to boot script at ${scriptaddr} && " \ + "source ${scriptaddr}; echo NOR: SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_NOR(devtypeu, devtypel, instance) \ + "nor " + #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \ "bootcmd_qspi=sf probe 0 0 0 && " \ "sf read ${scriptaddr} ${script_offset_f} ${script_size_f} && " \ @@ -101,7 +115,8 @@ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_JTAG(func) \ - BOOT_TARGET_DEVICES_QSPI(func) \ + BOOT_TARGET_DEVICES_QSPI(func) \ + BOOT_TARGET_DEVICES_NOR(func) \ BOOT_TARGET_DEVICES_DHCP(func) \ BOOT_TARGET_DEVICES_PXE(func)