Kconfig: sysedp: update sysedp management in Kconfig

 - Remove EDP_FRAMEWORK configuration
 - Include drivers/edp/Kconfig from drivers/Kconfig

Change-Id: I925d933830fd85ae58320bf979d82a7df9a87f53
Signed-off-by: Timo Alho <talho@nvidia.com>
Reviewed-on: http://git-master/r/380410
Reviewed-by: Steve Rogers <srogers@nvidia.com>
Reviewed-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 57816870951909c37998b6d2a22a04506a9aaedd..61c6f0f6cd150d0b285ae3173e6e3b9c8604f44a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2306,8 +2306,6 @@ source "drivers/cpuidle/Kconfig"
 
 source "drivers/cpuquiet/Kconfig"
 
-source "drivers/edp/Kconfig"
-
 endmenu
 
 menu "Floating point emulation"

diff --git a/drivers/Kconfig b/drivers/Kconfig
index cb91a6daed1406f0ef426d1f4f0db88d1a4a8d3b..1b9b2e6c5a0758a6ca1be8db01f1d06363847ae1 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -176,4 +176,6 @@ source "drivers/ipack/Kconfig"
 
 source "drivers/reset/Kconfig"
 
+source "drivers/edp/Kconfig"
+
 endmenu

diff --git a/drivers/edp/Kconfig b/drivers/edp/Kconfig
index 15368879eaa079e5cf44f62520cf13dc51051729..289118e8e23d69f8050cb24ddc9a092afacab6f5 100644 (file)
--- a/drivers/edp/Kconfig
+++ b/drivers/edp/Kconfig
@@ -1,12 +1,3 @@
-menu "EDP Framework"
-
-config EDP_FRAMEWORK
-       bool "EDP framework"
-       default n
-       help
-         EDP-framework implements peak current management
-endmenu
-
 menu "SYSEDP Framework"
 
 config SYSEDP_FRAMEWORK
@@ -14,5 +5,4 @@ config SYSEDP_FRAMEWORK
        default n
        help
          SYSEDP-framework implements system peak current management
-       depends on !EDP_FRAMEWORK
 endmenu