From: "Marek Behún" <kabel@kernel.org>
To: Stefan Roese <sr@denx.de>
Cc: u-boot@lists.denx.de, pali@kernel.org,
"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH u-boot-marvell 05/12] arm: mvebu: turris_mox: Cosmetic update for board config header
Date: Sat, 9 Oct 2021 19:33:39 +0200 [thread overview]
Message-ID: <20211009173346.7859-6-kabel@kernel.org> (raw)
In-Reply-To: <20211009173346.7859-1-kabel@kernel.org>
From: Marek Behún <marek.behun@nic.cz>
Reorder the definitions in Turris MOX' board config header, drop the
comment relics from when this file was copied, fix indentation.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
include/configs/turris_mox.h | 61 +++++++++++++-----------------------
1 file changed, 22 insertions(+), 39 deletions(-)
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 070abe38db..3cfad7cca9 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -8,13 +8,11 @@
#ifndef _CONFIG_TURRIS_MOX_H
#define _CONFIG_TURRIS_MOX_H
-#define CONFIG_SYS_BOOTM_LEN (64 << 20)
-
-/* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE 0x00000000
-
-/* auto boot */
-
+#define CONFIG_SYS_BOOTM_LEN (64 << 20)
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
+#define CONFIG_SYS_CBSIZE 1024
+#define CONFIG_SYS_MAXARGS 32
#define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
9600, 19200, 38400, 57600, 115200, \
230400, 460800, 500000, 576000, \
@@ -23,25 +21,10 @@
4000000, 4500000, 5000000, 5500000, \
6000000 }
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-
-/*
- * Other required minimal configurations
- */
-#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
-
-/* End of 16M scrubbed by training in bootrom */
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
-
-/* Environment in SPI NOR flash */
-
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_ARP_TIMEOUT 200
-#define CONFIG_NET_RETRY_COUNT 50
+#define CONFIG_ARP_TIMEOUT 200
+#define CONFIG_NET_RETRY_COUNT 50
-#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 6
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
@@ -51,22 +34,22 @@
#include <config_distro_bootcmd.h>
-#define TURRIS_MOX_BOOTCMD_RESCUE \
- "setenv bootargs \"console=ttyMV0,115200 " \
- "earlycon=ar3700_uart,0xd0012000\" && " \
- "sf probe && " \
- "sf read 0x5000000 0x190000 && " \
- "lzmadec 0x5000000 0x5800000 && " \
+#define TURRIS_MOX_BOOTCMD_RESCUE \
+ "setenv bootargs \"console=ttyMV0,115200 " \
+ "earlycon=ar3700_uart,0xd0012000\" && " \
+ "sf probe && " \
+ "sf read 0x5000000 0x190000 && " \
+ "lzmadec 0x5000000 0x5800000 && " \
"bootm 0x5800000"
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "scriptaddr=0x4d00000\0" \
- "pxefile_addr_r=0x4e00000\0" \
- "fdt_addr_r=0x4f00000\0" \
- "kernel_addr_r=0x5000000\0" \
- "ramdisk_addr_r=0x8000000\0" \
- "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "scriptaddr=0x4d00000\0" \
+ "pxefile_addr_r=0x4e00000\0" \
+ "fdt_addr_r=0x4f00000\0" \
+ "kernel_addr_r=0x5000000\0" \
+ "ramdisk_addr_r=0x8000000\0" \
+ "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+ "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \
BOOTENV
#endif /* _CONFIG_TURRIS_MOX_H */
--
2.32.0
next prev parent reply other threads:[~2021-10-09 17:35 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
2021-10-09 17:33 ` [PATCH u-boot-marvell 01/12] arm: mvebu: turris_mox: Drop SF_DEFAULT_MODE from defconfig Marek Behún
2021-10-21 5:30 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig Marek Behún
2021-10-21 5:31 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 03/12] arm: mvebu: a3720: Create Kconfig option for I2C_MV Marek Behún
2021-10-21 5:31 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 04/12] arm: kirkwood, mvebu: Remove CONFIG_SYS_RESET_ADDRESS option Marek Behún
2021-10-21 5:31 ` Stefan Roese
2021-10-09 17:33 ` Marek Behún [this message]
2021-10-21 5:32 ` [PATCH u-boot-marvell 05/12] arm: mvebu: turris_mox: Cosmetic update for board config header Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 06/12] arm: mvebu: turris_mox: Use show_board_info() Marek Behún
2021-10-21 5:32 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button Marek Behún
2021-10-21 5:32 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 08/12] arm: mvebu: turris_mox: Better check for valid ethernet addresses in env Marek Behún
2021-10-21 5:33 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 09/12] arm: mvebu: turris_omnia: Overwrite ethaddr only if invalid Marek Behún
2021-10-21 5:33 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 10/12] arm: mvebu: turris_omnia: Use show_board_info() Marek Behún
2021-10-21 5:34 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 11/12] arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig Marek Behún
2021-10-21 5:34 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 12/12] arm: mvebu: turris_omnia: Move CONFIG_SPL_DRIVERS_MISC " Marek Behún
2021-10-21 5:34 ` Stefan Roese
2021-10-21 7:47 ` [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Stefan Roese
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=20211009173346.7859-6-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=marek.behun@nic.cz \
--cc=pali@kernel.org \
--cc=sr@denx.de \
--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