From: Andrew Davis <afd@ti.com>
To: Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>,
Christian Gmeiner <christian.gmeiner@gmail.com>,
<u-boot@lists.denx.de>
Cc: Andrew Davis <afd@ti.com>
Subject: [PATCH v3 04/12] configs: j721x_evm: Remove unneeded check for SYS_K3_SPL_ATF
Date: Thu, 6 Apr 2023 09:09:55 -0500 [thread overview]
Message-ID: <20230406141003.17511-5-afd@ti.com> (raw)
In-Reply-To: <20230406141003.17511-1-afd@ti.com>
The TARGET_x_R5_EVM check is already enough to limit these defines to
only the correct builds. Remove the extra outer check.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
---
board/ti/j721e/j721e.env | 2 --
board/ti/j721s2/j721s2.env | 2 --
2 files changed, 4 deletions(-)
diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
index 446395adfa5..f442d155842 100644
--- a/board/ti/j721e/j721e.env
+++ b/board/ti/j721e/j721e.env
@@ -21,7 +21,6 @@ args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000
${mtdparts}
run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
-#if CONFIG_SYS_K3_SPL_ATF
#if CONFIG_TARGET_J721E_R5_EVM
addr_mcur5f0_0load=0x89000000
name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
@@ -29,7 +28,6 @@ name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
addr_mcur5f0_0load=0x89000000
name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw
#endif
-#endif
boot=mmc
mmcdev=1
diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
index 2152f8849f9..f4467770e40 100644
--- a/board/ti/j721s2/j721s2.env
+++ b/board/ti/j721s2/j721s2.env
@@ -25,12 +25,10 @@ boot=mmc
mmcdev=1
bootpart=1:2
bootdir=/boot
-#if CONFIG_SYS_K3_SPL_ATF
#if CONFIG_TARGET_J721S2_R5_EVM
addr_mcur5f0_0load=0x89000000
name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
#endif
-#endif
rd_spec=-
init_mmc=run args_all args_mmc
get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
--
2.39.2
next prev parent reply other threads:[~2023-04-06 14:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-06 14:09 [PATCH v3 00/12] Remove K3 misc sys_proto.h header Andrew Davis
2023-04-06 14:09 ` [PATCH v3 01/12] arm: mach-k3: Move MSMC fixup to SoC level Andrew Davis
2023-04-06 14:09 ` [PATCH v3 02/12] arm: mach-k3: Move J721e SoC detection out of common section Andrew Davis
2023-04-06 15:59 ` Christian Gmeiner
2023-04-06 16:29 ` Andrew Davis
2023-04-06 14:09 ` [PATCH v3 03/12] soc: soc_ti_k3: Use hardware.h to remove definition duplication Andrew Davis
2023-04-06 14:09 ` Andrew Davis [this message]
2023-04-06 14:09 ` [PATCH v3 05/12] configs: j721s2_evm.h: Remove refrences to J7200 EVM Andrew Davis
2023-04-06 14:09 ` [PATCH v3 06/12] arm: mach-k3: Make release_resources_for_core_shutdown() common Andrew Davis
2023-04-06 14:09 ` [PATCH v3 07/12] arm: mach-k3: Move sysfw-loader.h out of mach includes Andrew Davis
2023-04-06 14:09 ` [PATCH v3 08/12] arm: mach-k3: Add weak do_board_detect() to common file Andrew Davis
2023-04-06 16:01 ` Christian Gmeiner
2023-04-06 14:10 ` [PATCH v3 09/12] arm: mach-k3: Remove unused fdt_disable_node() Andrew Davis
2023-04-06 14:10 ` [PATCH v3 10/12] arm: mach-k3: Move sdelay() and wait_on_value() declaration Andrew Davis
2023-04-06 14:10 ` [PATCH v3 11/12] arm: mach-k3: Move J721s2 SPL init functions to mach-k3 Andrew Davis
2023-04-06 14:10 ` [PATCH v3 12/12] arm: mach-k3: Remove empty sys_proto.h include Andrew Davis
2023-04-06 16:02 ` Christian Gmeiner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230406141003.17511-5-afd@ti.com \
--to=afd@ti.com \
--cc=christian.gmeiner@gmail.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox