[U-Boot] [PATCH 0/2] arm: socfpga: Kconfig cleanups - U-Boot - denx.biz

newer
[U-Boot] [PATCH v2 0/7] sunxi:...

[U-Boot] [PATCH 0/2] arm: socfpga: Kconfig cleanups

older
[U-Boot] [PATCH 00/11] arm: sunxi:...

Simon Goldschmidt

13 Feb 2018 13 Feb '18

6:34 a.m.

This patchset moves CONFIG_HW_WATCHDOG from board config files to Kconfig and changes Kconfig items that are not strictly required from 'select' to 'imply'. Defconfigs are not affected.

Lukasz Majewski (1): Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA

Simon Goldschmidt (1): arm: socfpga: use imply instead of select where applicable

arch/arm/Kconfig | 7 ++++--- include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- 13 files changed, 4 insertions(+), 27 deletions(-)

-- 2.14.1

Reply

Show replies by date

Simon Goldschmidt

13 Feb 13 Feb

6:34 a.m.

New subject: [U-Boot] [PATCH 1/2] Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA

From: Lukasz Majewski lukma@denx.de

All Socfpga boards from ./include/configs/socfpga_* define CONFIG_HW_WATCHDOG. To ease CONFIG_HW_WATCHDOG conversion to Kconfig select it in config ARCH_SOCFPGA (arch/arm/Kconfig) section.

Signed-off-by: Lukasz Majewski lukma@denx.de Signed-off-by: Simon Goldschmidt sgoldschmidt@de.pepperl-fuchs.com ---

arch/arm/Kconfig | 1 + include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- 13 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 225f57e847..b4c79d6499 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -702,6 +702,7 @@ config ARCH_SOCFPGA select DM_SPI_FLASH select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK + select HW_WATCHDOG select ARCH_EARLY_INIT_R select ARCH_MISC_INIT select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 83718dd2c9..82bb48b277 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -9,8 +9,6 @@

#include <asm/arch/base_addr_a10.h>

-#define CONFIG_HW_WATCHDOG - /* Booting Linux */ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 6b6d54b97b..cd5aac65e9 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */

diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 018a0c3bb4..9c5bd648e3 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */

diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 275ed7ffeb..e5db00e366 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */

diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index bb50fcf1ff..656af1104d 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */

diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 05975c9bde..f57b950425 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */

diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index 46f5f135dd..dc318e50dc 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -9,8 +9,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x10000000

diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index 404f064e94..f13463b8b0 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on MCV */

diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index b4f31c42c5..0bbc7e0105 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */

diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index ebb9ac588d..b66108d0cc 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* 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 39bf612291..871f587d45 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */

diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 0c76a77525..1197b40b58 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -8,8 +8,6 @@

#include <asm/arch/base_addr_ac5.h>

-#define CONFIG_HW_WATCHDOG - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on VINING_FPGA */

-- 2.14.1

Reply

Simon Goldschmidt

6:34 a.m.

New subject: [U-Boot] [PATCH 2/2] arm: socfpga: use imply instead of select where applicable

Kconfig should only 'select' features that are required for an arch. Standard features that can be disabled without breaking board support should use 'imply' instead, to allow users to disable it.

These options are changed for mach-socfpga: - DM_SPI & DM_SPI_FLASH: only required with QSPI support enabled - SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION: the boot rom supports a partitionless mode also, where SPL is located at address 0 - HW_WATCHDOG: while all mainline board defconfigs use it, U-Boot should still work without it.

Signed-off-by: Simon Goldschmidt sgoldschmidt@de.pepperl-fuchs.com ---

arch/arm/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b4c79d6499..5edd67c471 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -699,17 +699,17 @@ config ARCH_SOCFPGA select OF_CONTROL select SPL_OF_CONTROL select DM - select DM_SPI_FLASH - select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK - select HW_WATCHDOG select ARCH_EARLY_INIT_R select ARCH_MISC_INIT - select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION select SYS_THUMB_BUILD imply CMD_MTDPARTS imply CRC32_VERIFY + imply DM_SPI + imply DM_SPI_FLASH imply FAT_WRITE + imply HW_WATCHDOG + imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION

config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs"

-- 2.14.1

Reply

Lukasz Majewski

9:38 a.m.

New subject: [U-Boot] [PATCH 2/2] arm: socfpga: use imply instead of select where applicable

On Tue, 13 Feb 2018 06:34:14 +0100 Simon Goldschmidt sgoldschmidt@de.pepperl-fuchs.com wrote:

Kconfig should only 'select' features that are required for an arch. Standard features that can be disabled without breaking board support should use 'imply' instead, to allow users to disable it.

These options are changed for mach-socfpga:

DM_SPI & DM_SPI_FLASH: only required with QSPI support enabled

SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION: the boot rom supports a partitionless mode also, where SPL is located at address 0

HW_WATCHDOG: while all mainline board defconfigs use it, U-Boot should still work without it.

Signed-off-by: Simon Goldschmidt sgoldschmidt@de.pepperl-fuchs.com

arch/arm/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b4c79d6499..5edd67c471 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -699,17 +699,17 @@ config ARCH_SOCFPGA select OF_CONTROL select SPL_OF_CONTROL select DM

select DM_SPI_FLASH

select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK

select HW_WATCHDOG select ARCH_EARLY_INIT_R select ARCH_MISC_INIT

select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION select SYS_THUMB_BUILD imply CMD_MTDPARTS imply CRC32_VERIFY

imply DM_SPI

imply DM_SPI_FLASH imply FAT_WRITE

imply HW_WATCHDOG

imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION

config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs"

Reviewed-by: Lukasz Majewski lukma@denx.de

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de

Reply

Lukasz Majewski

9:39 a.m.

Hi Simon,

This patchset moves CONFIG_HW_WATCHDOG from board config files to Kconfig and changes Kconfig items that are not strictly required from 'select' to 'imply'. Defconfigs are not affected.

Lukasz Majewski (1): Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA

Simon Goldschmidt (1): arm: socfpga: use imply instead of select where applicable

arch/arm/Kconfig | 7 ++++--- include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- 13 files changed, 4 insertions(+), 27 deletions(-)

Thank you for preparing those patches.

I will rebase v3 of WDT move to Kconfig on top of them :-).

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de

Reply

2641

Age (days ago)

2641

Last active (days ago)

Download

4 comments

2 participants

tags (0)

participants (2)

Lukasz Majewski
Simon Goldschmidt