[U-Boot] [PATCH] mvebu: drop dangling SPI flash comments and #ifdefs
Stefan Roese
sr at denx.de
Wed Mar 27 06:40:34 UTC 2019
On 27.03.19 07:01, Baruch Siach wrote:
> Following commits abe66b1b5dec ("Convert CONFIG_ENV_SPI_* to Kconfig")
> and 14453fbfadc2f ("Convert CONFIG_SF_DEFAULT_* to Kconfig") remove
> dandling comment lines and empty #ifdef sections.
>
> Cc: Patrick Delaunay <patrick.delaunay at st.com>
> Signed-off-by: Baruch Siach <baruch at tkos.co.il>
> ---
> include/configs/clearfog.h | 2 --
> include/configs/db-88f6720.h | 2 --
> include/configs/db-88f6820-amc.h | 2 --
> include/configs/db-88f6820-gp.h | 6 ------
> include/configs/db-mv784mp-gp.h | 2 --
> include/configs/dreamplug.h | 3 ---
> include/configs/ds109.h | 3 ---
> include/configs/ds414.h | 2 --
> include/configs/helios4.h | 2 --
> include/configs/mvebu_armada-8k.h | 4 ----
> include/configs/theadorable.h | 2 --
> include/configs/turris_mox.h | 4 ----
> include/configs/turris_omnia.h | 1 -
> 13 files changed, 35 deletions(-)
>
> diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
> index c51cf284502b..9f8d3cc9e5e8 100644
> --- a/include/configs/clearfog.h
> +++ b/include/configs/clearfog.h
> @@ -21,8 +21,6 @@
> * Commands configuration
> */
>
> -/* SPI NOR flash default params, used by sf commands */
> -
> /*
> * SDIO/MMC Card Configuration
> */
> diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
> index 55968c2749ef..63194d58a29b 100644
> --- a/include/configs/db-88f6720.h
> +++ b/include/configs/db-88f6720.h
> @@ -32,8 +32,6 @@
> #define CONFIG_EHCI_IS_TDI
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
>
> -/* SPI NOR flash default params, used by sf commands */
> -
> /* Environment in SPI NOR flash */
> #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
> #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
> diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
> index f1bdc2d3e74f..2fdc84502921 100644
> --- a/include/configs/db-88f6820-amc.h
> +++ b/include/configs/db-88f6820-amc.h
> @@ -16,8 +16,6 @@
> * Commands configuration
> */
>
> -/* SPI NOR flash default params, used by sf commands */
> -
> /* USB/EHCI configuration */
> #define CONFIG_EHCI_IS_TDI
>
> diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
> index d378052a8f7c..ec2405bbb456 100644
> --- a/include/configs/db-88f6820-gp.h
> +++ b/include/configs/db-88f6820-gp.h
> @@ -23,12 +23,6 @@
> #define CONFIG_SYS_I2C_SLAVE 0x0
> #define CONFIG_SYS_I2C_SPEED 100000
>
> -/*
> - * SPI Flash configuration for the environemnt access
> - */
> -
> -/* SPI NOR flash default params, used by sf commands */
> -
> /*
> * SDIO/MMC Card Configuration
> */
> diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
> index b78dbcb6b946..1f9d24b19b98 100644
> --- a/include/configs/db-mv784mp-gp.h
> +++ b/include/configs/db-mv784mp-gp.h
> @@ -29,8 +29,6 @@
> #define CONFIG_EHCI_IS_TDI
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
>
> -/* SPI NOR flash default params, used by sf commands */
> -
> /* Environment in SPI NOR flash */
> #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
> #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
> diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
> index 28bda14c3d93..f7f9141dd0e1 100644
> --- a/include/configs/dreamplug.h
> +++ b/include/configs/dreamplug.h
> @@ -34,9 +34,6 @@
> #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */
> #endif
>
> -#ifdef CONFIG_CMD_SF
> -#endif
> -
> /*
> * max 4k env size is enough, but in case of nand
> * it has to be rounded to sector size
> diff --git a/include/configs/ds109.h b/include/configs/ds109.h
> index 07367cfef05a..31abb4bc85f1 100644
> --- a/include/configs/ds109.h
> +++ b/include/configs/ds109.h
> @@ -37,9 +37,6 @@
> #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */
> #endif
>
> -#ifdef CONFIG_CMD_SF
> -#endif
> -
> /*
> * max 4k env size is enough, but in case of nand
> * it has to be rounded to sector size
> diff --git a/include/configs/ds414.h b/include/configs/ds414.h
> index 275a2b478805..192c055c5cc4 100644
> --- a/include/configs/ds414.h
> +++ b/include/configs/ds414.h
> @@ -28,8 +28,6 @@
> #define CONFIG_SYS_I2C_SLAVE 0x0
> #define CONFIG_SYS_I2C_SPEED 100000
>
> -/* SPI NOR flash default params, used by sf commands */
> -
> /* Environment in SPI NOR flash */
> #define CONFIG_ENV_OFFSET 0x7E0000 /* RedBoot config partition in DTS */
> #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
> diff --git a/include/configs/helios4.h b/include/configs/helios4.h
> index df4d8bcb3bbf..b2badab15eab 100644
> --- a/include/configs/helios4.h
> +++ b/include/configs/helios4.h
> @@ -23,8 +23,6 @@
> * Commands configuration
> */
>
> -/* SPI NOR flash default params, used by sf commands */
> -
> /*
> * SDIO/MMC Card Configuration
> */
> diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
> index f4972b64dcb1..b28f3b94085a 100644
> --- a/include/configs/mvebu_armada-8k.h
> +++ b/include/configs/mvebu_armada-8k.h
> @@ -49,10 +49,6 @@
> /* End of 16M scrubbed by training in bootrom */
> #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
>
> -/*
> - * SPI Flash configuration
> - */
> -
> #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */
> #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
> #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */
> diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
> index 59b2546f0b4c..cd92835112dd 100644
> --- a/include/configs/theadorable.h
> +++ b/include/configs/theadorable.h
> @@ -39,8 +39,6 @@
> #define CONFIG_EHCI_IS_TDI
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
>
> -/* SPI NOR flash default params, used by sf commands */
> -
> /* Environment in SPI NOR flash */
> #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
> #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
> index 5d5394e3e53b..0de40eddcb5b 100644
> --- a/include/configs/turris_mox.h
> +++ b/include/configs/turris_mox.h
> @@ -63,10 +63,6 @@
> #define CONFIG_I2C_MV
> #define CONFIG_SYS_I2C_SLAVE 0x0
>
> -/*
> - * SPI Flash configuration
> - */
> -
> /* Environment in SPI NOR flash */
> #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */
> #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
> diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
> index 038f6398eb6c..021ebae21ff7 100644
> --- a/include/configs/turris_omnia.h
> +++ b/include/configs/turris_omnia.h
> @@ -34,7 +34,6 @@
> # define CONFIG_WATCHDOG
> #endif
>
> -/* SPI NOR flash default params, used by sf commands */
> #define CONFIG_SPI_FLASH_SPANSION
Could you please move CONFIG_SPI_FLASH_SPANSION to the defconfig
file instead? Best as a separate patch.
One further comment: Please use "arm: mvebu: ..." in the subject
next time.
Other that this:
Reviewed-by: Stefan Roese <sr at denx.de>
Thanks,
Stefan
More information about the U-Boot
mailing list