nxp: Rename board/freescale/common/Kconfig to arch/Kconfig.nxp

Now that board/freescale/common/Kconfig is safe to be included once,
globally, rename this to arch/Kconfig.nxp to better reflect that it
contains options that are valid on multiple architectures and SoC
families, and not specific to NXP reference platforms either.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 1ad61ab345a2d9bf0a3ba82bc7681164e062c678..6495e780fec98715774721c93edc7ba9515c2e8f 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -451,7 +451,12 @@ source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
 source "arch/riscv/Kconfig"
 
-source "board/freescale/common/Kconfig"
+if ARM || M68K || PPC
+
+source "arch/Kconfig.nxp"
+
+endif
+
 source "board/keymile/Kconfig"
 
 if MIPS || MICROBLAZE

diff --git a/arch/Kconfig.nxp b/arch/Kconfig.nxp
new file mode 100644 (file)
index 0000000..85acdde
--- /dev/null
+++ b/arch/Kconfig.nxp
@@ -0,0 +1,118 @@
+config CHAIN_OF_TRUST
+       depends on !FIT_SIGNATURE && NXP_ESBC
+       imply CMD_BLOB
+       imply CMD_HASH if ARM
+       select FSL_CAAM
+       select ARCH_MISC_INIT
+       select SPL_BOARD_INIT if (ARM && SPL)
+       select SPL_HASH if (ARM && SPL)
+       select SHA_HW_ACCEL
+       select SHA_PROG_HW_ACCEL
+       select ENV_IS_NOWHERE
+       select CMD_EXT4 if ARM
+       select CMD_EXT4_WRITE if ARM
+       bool
+       default y
+
+config CMD_ESBC_VALIDATE
+       bool "Enable the 'esbc_validate' and 'esbc_halt' commands"
+       depends on CHAIN_OF_TRUST
+       default y
+       help
+         This option enables two commands used for secure booting:
+
+           esbc_validate - validate signature using RSA verification
+           esbc_halt - put the core in spin loop (Secure Boot Only)
+
+config DEEP_SLEEP
+       bool "Enable SoC deep sleep feature"
+       depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
+       default y
+       help
+         Indicates this SoC supports deep sleep feature. If deep sleep is
+         supported, core will start to execute uboot when wakes up.
+
+config FSL_USE_PCA9547_MUX
+       bool "Enable PCA9547 I2C Mux on Freescale boards"
+       depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
+       help
+        This option enables the PCA9547 I2C mux on Freescale boards.
+
+config VID
+       bool "Enable Freescale VID"
+       depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (I2C || DM_I2C)
+       help
+        This option enables setting core voltage based on individual
+        values saved in SoC fuses.
+
+config SPL_VID
+       bool "Enable Freescale VID in SPL"
+       depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (SPL_I2C || DM_SPL_I2C)
+       help
+        This option enables setting core voltage based on individual
+        values saved in SoC fuses, in SPL.
+
+if VID || SPL_VID
+
+config VID_FLS_ENV
+       string "Environment variable for overriding VDD"
+       help
+         This option allows for specifying the environment variable
+         to check to override VDD information.
+
+config VOL_MONITOR_INA220
+       bool "Enable the INA220 voltage monitor read"
+       help
+         This option enables INA220 voltage monitor read
+         functionality. It is used by the common VID driver.
+
+config VOL_MONITOR_IR36021_READ
+       bool "Enable the IR36021 voltage monitor read"
+       help
+        This option enables IR36021 voltage monitor read
+        functionality. It is used by the common VID driver.
+
+config VOL_MONITOR_IR36021_SET
+       bool "Enable the IR36021 voltage monitor set"
+       help
+        This option enables IR36021 voltage monitor set
+        functionality. It is used by the common VID driver.
+
+config VOL_MONITOR_LTC3882_READ
+       bool "Enable the LTC3882 voltage monitor read"
+       help
+        This option enables LTC3882 voltage monitor read
+        functionality. It is used by the common VID driver.
+
+config VOL_MONITOR_LTC3882_SET
+       bool "Enable the LTC3882 voltage monitor set"
+       help
+        This option enables LTC3882 voltage monitor set
+        functionality. It is used by the common VID driver.
+
+config VOL_MONITOR_ISL68233_READ
+       bool "Enable the ISL68233 voltage monitor read"
+       help
+        This option enables ISL68233 voltage monitor read
+        functionality. It is used by the common VID driver.
+
+config VOL_MONITOR_ISL68233_SET
+       bool "Enable the ISL68233 voltage monitor set"
+       help
+        This option enables ISL68233 voltage monitor set
+        functionality. It is used by the common VID driver.
+
+endif
+
+config FSL_QIXIS
+       bool "Enable QIXIS support"
+       depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
+
+config QIXIS_I2C_ACCESS
+       bool "Access to QIXIS is over i2c"
+       depends on FSL_QIXIS
+       default y
+
+config HAS_FSL_DR_USB
+       def_bool y
+       depends on USB_EHCI_HCD && PPC

diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
deleted file mode 100644 (file)
index 85acdde..0000000
--- a/board/freescale/common/Kconfig
+++ /dev/null
@@ -1,118 +0,0 @@
-config CHAIN_OF_TRUST
-       depends on !FIT_SIGNATURE && NXP_ESBC
-       imply CMD_BLOB
-       imply CMD_HASH if ARM
-       select FSL_CAAM
-       select ARCH_MISC_INIT
-       select SPL_BOARD_INIT if (ARM && SPL)
-       select SPL_HASH if (ARM && SPL)
-       select SHA_HW_ACCEL
-       select SHA_PROG_HW_ACCEL
-       select ENV_IS_NOWHERE
-       select CMD_EXT4 if ARM
-       select CMD_EXT4_WRITE if ARM
-       bool
-       default y
-
-config CMD_ESBC_VALIDATE
-       bool "Enable the 'esbc_validate' and 'esbc_halt' commands"
-       depends on CHAIN_OF_TRUST
-       default y
-       help
-         This option enables two commands used for secure booting:
-
-           esbc_validate - validate signature using RSA verification
-           esbc_halt - put the core in spin loop (Secure Boot Only)
-
-config DEEP_SLEEP
-       bool "Enable SoC deep sleep feature"
-       depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
-       default y
-       help
-         Indicates this SoC supports deep sleep feature. If deep sleep is
-         supported, core will start to execute uboot when wakes up.
-
-config FSL_USE_PCA9547_MUX
-       bool "Enable PCA9547 I2C Mux on Freescale boards"
-       depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
-       help
-        This option enables the PCA9547 I2C mux on Freescale boards.
-
-config VID
-       bool "Enable Freescale VID"
-       depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (I2C || DM_I2C)
-       help
-        This option enables setting core voltage based on individual
-        values saved in SoC fuses.
-
-config SPL_VID
-       bool "Enable Freescale VID in SPL"
-       depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (SPL_I2C || DM_SPL_I2C)
-       help
-        This option enables setting core voltage based on individual
-        values saved in SoC fuses, in SPL.
-
-if VID || SPL_VID
-
-config VID_FLS_ENV
-       string "Environment variable for overriding VDD"
-       help
-         This option allows for specifying the environment variable
-         to check to override VDD information.
-
-config VOL_MONITOR_INA220
-       bool "Enable the INA220 voltage monitor read"
-       help
-         This option enables INA220 voltage monitor read
-         functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_IR36021_READ
-       bool "Enable the IR36021 voltage monitor read"
-       help
-        This option enables IR36021 voltage monitor read
-        functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_IR36021_SET
-       bool "Enable the IR36021 voltage monitor set"
-       help
-        This option enables IR36021 voltage monitor set
-        functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_LTC3882_READ
-       bool "Enable the LTC3882 voltage monitor read"
-       help
-        This option enables LTC3882 voltage monitor read
-        functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_LTC3882_SET
-       bool "Enable the LTC3882 voltage monitor set"
-       help
-        This option enables LTC3882 voltage monitor set
-        functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_ISL68233_READ
-       bool "Enable the ISL68233 voltage monitor read"
-       help
-        This option enables ISL68233 voltage monitor read
-        functionality. It is used by the common VID driver.
-
-config VOL_MONITOR_ISL68233_SET
-       bool "Enable the ISL68233 voltage monitor set"
-       help
-        This option enables ISL68233 voltage monitor set
-        functionality. It is used by the common VID driver.
-
-endif
-
-config FSL_QIXIS
-       bool "Enable QIXIS support"
-       depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
-
-config QIXIS_I2C_ACCESS
-       bool "Access to QIXIS is over i2c"
-       depends on FSL_QIXIS
-       default y
-
-config HAS_FSL_DR_USB
-       def_bool y
-       depends on USB_EHCI_HCD && PPC