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 0B305C38142 for ; Sun, 22 Jan 2023 18:03:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 60E888539D; Sun, 22 Jan 2023 19:03:10 +0100 (CET) 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="EuP7W3FY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 00B0D85695; Sun, 22 Jan 2023 19:03:09 +0100 (CET) Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) (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 58C9384FD1 for ; Sun, 22 Jan 2023 19:03:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ovpanait@gmail.com Received: by mail-wr1-x431.google.com with SMTP id d14so5219096wrr.9 for ; Sun, 22 Jan 2023 10:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=06Wa1LC0tMZqPFaO77A37+Sy2cjt07Is/FOU0zJOpCA=; b=EuP7W3FY2vVRcg1ozvB+JbSOcOLAZfZNH3Kx12yOw/3UdI8rMD1ZNjzV+S5D6cxgy/ hcCEdx++RLIyKqs120U5yQNnTKpW2xPysjAgP+iTdgcLltZa5vJSKdeb3P/jOJ4aBcsL EE2/OrT6+6/7ykCWzL0I2rbkcfmVr9/P6pEmPnq4uGNqefmrXQ9+HePXAt9ElyHiqCnA mlwmHzTNyawXm7tUCwrxDtBWfc4ZZSCDKW1AqDf6BrceHoJXxjAkkbCkT5/kvdAwvXiZ yrp5YnHQoA9OVLMWRF4PRL2cjoJdObvQp7fO2Cx1cF0ZMY04u6PvoA0oFd1yAKsBmCoF jbrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=06Wa1LC0tMZqPFaO77A37+Sy2cjt07Is/FOU0zJOpCA=; b=GyQOfOq4V3EE5XK2GvB2cUEkLMLYDL5hMzIYkCqnjHrEfnA1IKd9NajetFWUlHuJpu BHbwH5zLQ476L7pSUujQevBXC7+VHbkbrUZQr0+Sel/bTGviSU8yp223bQee3WRcaEcb 6nVTZNATsYoWepOVuaKKGJapB7/1Gu3kaJvAIS6vVZmeaf//BWaT9VtH7YyQcAEefYXD 9y6yx7w/+FjEpNoqMLHv4P8MowQx84/U4XwbduXHn4gqAtm2ZMKb08xjIxpe5X+hwahB pSZX+S00W2yIWrA98HjzWzMHSHQxpseXnYG+IyimBkZtIr4zcl9/kLDN3qJQEV/TBiK9 avoQ== X-Gm-Message-State: AFqh2kqCxUK8tljcRQks6Gs1pl+4g9fzkh6dLckWaGDb6w0C4JngTFZG J2fQd9e47LuHaq2EVgeTcRMpdYm1KAxJwrq5 X-Google-Smtp-Source: AMrXdXvA3Aav0uJzWMt39bxMAwJ/+TuXQijGvMd6NVjOX2+QhdMr7U4I8W4Mj6l2Q5I4nAmOXqlnLw== X-Received: by 2002:adf:c614:0:b0:248:ab8a:5144 with SMTP id n20-20020adfc614000000b00248ab8a5144mr12838397wrg.63.1674410585949; Sun, 22 Jan 2023 10:03:05 -0800 (PST) Received: from wsdell.wrs.com ([2a02:2f0e:c00b:fb00:9870:f57e:669d:db40]) by smtp.gmail.com with ESMTPSA id r11-20020adff70b000000b002bdf290efdasm18048018wrp.58.2023.01.22.10.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 10:03:05 -0800 (PST) From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Alper Nebi Yasak , Andrew Davis , Michal Simek , Michal Simek , Simon Glass , Stefan Roese Subject: [PATCH] microblaze: spl: drop boot_linux and disable falcon mode by default Date: Sun, 22 Jan 2023 20:02:54 +0200 Message-Id: <20230122180255.1246963-1-ovpanait@gmail.com> X-Mailer: git-send-email 2.25.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.6 at phobos.denx.de X-Virus-Status: Clean Make spl_start_uboot() available only if CONFIG_SPL_OS_BOOT is enabled and drop boot_linux, as the variable is not assigned anywhere. Also, disable CONFIG_SPL_OS_BOOT in defconfig so that a microblaze-generic_defconfig build will still boot into u-boot proper, as it does currently. Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/spl.c | 11 ++--------- common/spl/Kconfig | 2 ++ configs/microblaze-generic_defconfig | 3 --- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index cea6d56f16..eaa095ba99 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -14,8 +14,6 @@ #include #include -bool boot_linux; - void board_boot_order(u32 *spl_boot_list) { spl_boot_list[0] = BOOT_DEVICE_NOR; @@ -41,17 +39,12 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) image_entry(NULL, 0, (ulong)spl_image->arg); } -#endif /* CONFIG_SPL_OS_BOOT */ int spl_start_uboot(void) { -#ifdef CONFIG_SPL_OS_BOOT - if (boot_linux) - return 0; -#endif - - return 1; + return 0; } +#endif /* CONFIG_SPL_OS_BOOT */ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 3c2af453ab..de6d8c3a18 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1081,6 +1081,7 @@ config SYS_SPL_ARGS_ADDR hex "Address in memory to load 'args' file for Falcon Mode to" depends on SPL_OS_BOOT default 0x88000000 if ARCH_OMAP2PLUS + default 0x2a000000 if MICROBLAZE help Address in memory where the 'args' file, typically a device tree will be loaded in to memory. @@ -1092,6 +1093,7 @@ config SYS_NAND_SPL_KERNEL_OFFS config SYS_OS_BASE hex "addr, where OS is found" depends on SPL_OS_BOOT && SPL_NOR_SUPPORT + default 0x2c060000 if MICROBLAZE help Specify the address, where the OS image is found, which gets booted. diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index be34941805..438540fbe4 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -33,9 +33,6 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_STACK=0x100000 CONFIG_SPL_NOR_SUPPORT=y -CONFIG_SPL_OS_BOOT=y -CONFIG_SYS_SPL_ARGS_ADDR=0x2a000000 -CONFIG_SYS_OS_BASE=0x2c060000 CONFIG_SYS_MAXARGS=15 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=544 -- 2.25.1