diff mbox series

[u-boot-marvell,05/12] arm: mvebu: turris_mox: Cosmetic update for board config header

Message ID 20211009173346.7859-6-kabel@kernel.org
State Accepted
Commit ba89abd028cb4e0c248c1a11ca2c8b34a407bff9
Delegated to: Stefan Roese
Headers show
Series Small Turris MOX and Omnia changes | expand

Commit Message

Marek Behún Oct. 9, 2021, 5:33 p.m. UTC 
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(-)

Comments

Stefan Roese Oct. 21, 2021, 5:32 a.m. UTC | #1 
On 09.10.21 19:33, Marek Behún wrote:
> 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>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   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 */
> 


Viele Grüße,
Stefan
diff mbox series

Patch

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 */