From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] arm: socfpga: clean up common config options
Date: Thu, 14 Apr 2016 00:05:17 +0200 [thread overview]
Message-ID: <570EC29D.4050101@denx.de> (raw)
In-Reply-To: <1460561696-8100-1-git-send-email-dinguyen@opensource.altera.com>
On 04/13/2016 05:34 PM, dinguyen at opensource.altera.com wrote:
> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>
> Move common config options like these to socfpga_common.h:
>
> CONFIG_SYS_NO_FLASH
> CONFIG_DOS_PARTITION
> CONFIG_FAT_WRITE
> CONFIG_HW_WATCHDOG
>
> CONFIG_CMD_ASKENV
> CONFIG_CMD_BOOTZ
> CONFIG_CMD_CACHE
> CONFIG_CMD_DHCP
> CONFIG_CMD_EXT4
> CONFIG_CMD_EXT4_WRITE
> CONFIG_CMD_FAT
> CONFIG_CMD_FS_GENERIC
> CONFIG_CMD_GREPENV
> CONFIG_CMD_MEMTEST
> CONFIG_CMD_MII
> CONFIG_CMD_MMC
> CONFIG_CMD_PING
> CONFIG_CMD_SF
> CONFIG_CMD_SPI
> CONFIG_CMD_TIME
>
> to avoid defining them in individual SoCFPGA config files.
>
> Also to avoid a build error, move CONFIG_CMD_GPIO that was in
> socfpga_sr1500.h to socfpga_sr1500_defconfig.
>
> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
> ---
> configs/socfpga_sr1500_defconfig | 1 +
> include/configs/socfpga_arria5_socdk.h | 22 ----------------------
> include/configs/socfpga_common.h | 22 ++++++++++++++++++++++
> include/configs/socfpga_cyclone5_socdk.h | 18 ------------------
> include/configs/socfpga_de0_nano_soc.h | 18 ------------------
> include/configs/socfpga_mcvevk.h | 18 ------------------
> include/configs/socfpga_sockit.h | 18 ------------------
> include/configs/socfpga_socrates.h | 22 ----------------------
> include/configs/socfpga_sr1500.h | 25 -------------------------
> 9 files changed, 23 insertions(+), 141 deletions(-)
>
> diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
> index ec57746..2b3cc53 100644
> --- a/configs/socfpga_sr1500_defconfig
> +++ b/configs/socfpga_sr1500_defconfig
> @@ -12,6 +12,7 @@ CONFIG_FIT=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> CONFIG_SPL_DM_SEQ_ALIAS=y
> +CONFIG_CMD_GPIO
> CONFIG_DWAPB_GPIO=y
> CONFIG_DM_MMC=y
> CONFIG_SPI_FLASH=y
> diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
> index 153f9f8..9c282b8 100644
> --- a/include/configs/socfpga_arria5_socdk.h
> +++ b/include/configs/socfpga_arria5_socdk.h
> @@ -8,28 +8,6 @@
>
> #include <asm/arch/base_addr_ac5.h>
>
> -/* U-Boot Commands */
> -#define CONFIG_SYS_NO_FLASH
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_FAT_WRITE
> -#define CONFIG_HW_WATCHDOG
> -
> -#define CONFIG_CMD_ASKENV
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_CACHE
> -#define CONFIG_CMD_DFU
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FS_GENERIC
> -#define CONFIG_CMD_GREPENV
> -#define CONFIG_CMD_MII
> -#define CONFIG_CMD_MMC
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_USB
> -#define CONFIG_CMD_USB_MASS_STORAGE
With this patch, AV SoCDK will drop UMS support since socfpga_common.h
does not define it.
> /* Memory configurations */
> #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */
>
> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> index 3e50892..5a0d53b 100644
> --- a/include/configs/socfpga_common.h
> +++ b/include/configs/socfpga_common.h
> @@ -6,6 +6,28 @@
> #ifndef __CONFIG_SOCFPGA_COMMON_H__
> #define __CONFIG_SOCFPGA_COMMON_H__
>
> +/* U-Boot Commands */
> +#define CONFIG_SYS_NO_FLASH
> +#define CONFIG_DOS_PARTITION
> +#define CONFIG_FAT_WRITE
> +#define CONFIG_HW_WATCHDOG
> +
> +#define CONFIG_CMD_ASKENV
> +#define CONFIG_CMD_BOOTZ
> +#define CONFIG_CMD_CACHE
> +#define CONFIG_CMD_DHCP
> +#define CONFIG_CMD_EXT4
> +#define CONFIG_CMD_EXT4_WRITE
> +#define CONFIG_CMD_FAT
> +#define CONFIG_CMD_FS_GENERIC
> +#define CONFIG_CMD_GREPENV
> +#define CONFIG_CMD_MEMTEST
> +#define CONFIG_CMD_MII
> +#define CONFIG_CMD_MMC
> +#define CONFIG_CMD_PING
> +#define CONFIG_CMD_SF
> +#define CONFIG_CMD_SPI
> +#define CONFIG_CMD_TIME
>
> /* Virtual target or real hardware */
> #undef CONFIG_SOCFPGA_VIRTUAL_TARGET
> diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
> index d7c339e..b8a13f3 100644
> --- a/include/configs/socfpga_cyclone5_socdk.h
> +++ b/include/configs/socfpga_cyclone5_socdk.h
> @@ -8,25 +8,7 @@
>
> #include <asm/arch/base_addr_ac5.h>
>
> -/* U-Boot Commands */
> -#define CONFIG_SYS_NO_FLASH
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_FAT_WRITE
> -#define CONFIG_HW_WATCHDOG
> -
> -#define CONFIG_CMD_ASKENV
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_CACHE
> #define CONFIG_CMD_DFU
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FS_GENERIC
> -#define CONFIG_CMD_GREPENV
> -#define CONFIG_CMD_MII
> -#define CONFIG_CMD_MMC
> -#define CONFIG_CMD_PING
> #define CONFIG_CMD_USB
> #define CONFIG_CMD_USB_MASS_STORAGE
>
> diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
> index 314b9bf..fddcf22 100644
> --- a/include/configs/socfpga_de0_nano_soc.h
> +++ b/include/configs/socfpga_de0_nano_soc.h
> @@ -8,25 +8,7 @@
>
> #include <asm/arch/base_addr_ac5.h>
>
> -/* U-Boot Commands */
> -#define CONFIG_SYS_NO_FLASH
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_FAT_WRITE
> -#define CONFIG_HW_WATCHDOG
> -
> -#define CONFIG_CMD_ASKENV
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_CACHE
> #define CONFIG_CMD_DFU
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FS_GENERIC
> -#define CONFIG_CMD_GREPENV
> -#define CONFIG_CMD_MII
> -#define CONFIG_CMD_MMC
> -#define CONFIG_CMD_PING
> #define CONFIG_CMD_USB
> #define CONFIG_CMD_USB_MASS_STORAGE
>
> diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
> index f260a64..d4c93ca 100644
> --- a/include/configs/socfpga_mcvevk.h
> +++ b/include/configs/socfpga_mcvevk.h
> @@ -8,25 +8,7 @@
>
> #include <asm/arch/base_addr_ac5.h>
>
> -/* U-Boot Commands */
> -#define CONFIG_SYS_NO_FLASH
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_FAT_WRITE
> -#define CONFIG_HW_WATCHDOG
> -
> -#define CONFIG_CMD_ASKENV
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_CACHE
> #define CONFIG_CMD_DFU
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FS_GENERIC
> -#define CONFIG_CMD_GREPENV
> -#define CONFIG_CMD_MII
> -#define CONFIG_CMD_MMC
> -#define CONFIG_CMD_PING
> #define CONFIG_CMD_USB
> #define CONFIG_CMD_USB_MASS_STORAGE
>
> diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
> index 07cfcbf..07a0146 100644
> --- a/include/configs/socfpga_sockit.h
> +++ b/include/configs/socfpga_sockit.h
> @@ -8,25 +8,7 @@
>
> #include <asm/arch/base_addr_ac5.h>
>
> -/* U-Boot Commands */
> -#define CONFIG_SYS_NO_FLASH
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_FAT_WRITE
> -#define CONFIG_HW_WATCHDOG
> -
> -#define CONFIG_CMD_ASKENV
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_CACHE
> #define CONFIG_CMD_DFU
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FS_GENERIC
> -#define CONFIG_CMD_GREPENV
> -#define CONFIG_CMD_MII
> -#define CONFIG_CMD_MMC
> -#define CONFIG_CMD_PING
> #define CONFIG_CMD_USB
> #define CONFIG_CMD_USB_MASS_STORAGE
>
> diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
> index 02ea0c5..0e7ad76 100644
> --- a/include/configs/socfpga_socrates.h
> +++ b/include/configs/socfpga_socrates.h
> @@ -8,28 +8,6 @@
>
> #include <asm/arch/base_addr_ac5.h>
>
> -/* U-Boot Commands */
> -#define CONFIG_SYS_NO_FLASH
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_FAT_WRITE
> -#define CONFIG_HW_WATCHDOG
> -
> -#define CONFIG_CMD_ASKENV
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_CACHE
> -#define CONFIG_CMD_DFU
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FS_GENERIC
> -#define CONFIG_CMD_GREPENV
> -#define CONFIG_CMD_MII
> -#define CONFIG_CMD_MMC
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_USB
> -#define CONFIG_CMD_USB_MASS_STORAGE
DTTO here.
> /* Memory configurations */
> #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCrates */
>
> diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
> index e43b5cf..9c2bca4 100644
> --- a/include/configs/socfpga_sr1500.h
> +++ b/include/configs/socfpga_sr1500.h
> @@ -10,31 +10,6 @@
>
> #define CONFIG_BOARD_EARLY_INIT_F
>
> -#define CONFIG_SYS_NO_FLASH
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_FAT_WRITE
> -
> -#define CONFIG_HW_WATCHDOG
> -
> -/* U-Boot Commands */
> -#define CONFIG_CMD_ASKENV
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_CACHE
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_FS_GENERIC
> -#define CONFIG_CMD_GPIO
> -#define CONFIG_CMD_GREPENV
> -#define CONFIG_CMD_MEMTEST
> -#define CONFIG_CMD_MII
> -#define CONFIG_CMD_MMC
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_SF
> -#define CONFIG_CMD_SPI
> -#define CONFIG_CMD_TIME
> -
> /* Memory configurations */
> #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */
>
>
--
Best regards,
Marek Vasut
prev parent reply other threads:[~2016-04-13 22:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 15:34 [U-Boot] [PATCH] arm: socfpga: clean up common config options dinguyen at opensource.altera.com
2016-04-13 17:31 ` Stefan Roese
2016-04-13 22:03 ` Marek Vasut
2016-04-14 20:31 ` Dinh Nguyen
2016-04-13 22:05 ` Marek Vasut [this message]
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=570EC29D.4050101@denx.de \
--to=marex@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.