mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Finish CONFIG_VID et al conversion to Kconfig
This converts the following to Kconfig: CONFIG_VID CONFIG_VOL_MONITOR_INA220 CONFIG_VOL_MONITOR_IR36021_READ CONFIG_VOL_MONITOR_IR36021_SET CONFIG_VOL_MONITOR_LTC3882_READ CONFIG_VOL_MONITOR_LTC3882_SET To finish this migration, we first need to introduce CONFIG_SPL_VID as some platforms only use this code in full U-Boot while others use it in SPL as well. To make the Kconfig logic clearer, guard all of the sub-options with a if VID || SPL_VID check. Finally, add Kconfig options for the remaining related options that did not previously have one. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -360,12 +360,6 @@ unsigned long get_board_sys_clk(void);
|
||||
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "t208xqds_vdd_mv"
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_VID
|
||||
#endif
|
||||
#define CONFIG_VOL_MONITOR_IR36021_SET
|
||||
#define CONFIG_VOL_MONITOR_IR36021_READ
|
||||
/* The lowest and highest voltage allowed for T208xQDS */
|
||||
#define VDD_MV_MIN 819
|
||||
#define VDD_MV_MAX 1212
|
||||
|
||||
@@ -312,12 +312,6 @@ unsigned long get_board_sys_clk(void);
|
||||
|
||||
#define I2C_MUX_CH_VOL_MONITOR 0xa
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "t208xrdb_vdd_mv"
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_VID
|
||||
#endif
|
||||
#define CONFIG_VOL_MONITOR_IR36021_SET
|
||||
#define CONFIG_VOL_MONITOR_IR36021_READ
|
||||
/* The lowest and highest voltage allowed for T208xRDB */
|
||||
#define VDD_MV_MIN 819
|
||||
#define VDD_MV_MAX 1212
|
||||
|
||||
@@ -408,12 +408,6 @@ unsigned long get_board_sys_clk(void);
|
||||
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "t4240rdb_vdd_mv"
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_VID
|
||||
#endif
|
||||
#define CONFIG_VOL_MONITOR_IR36021_SET
|
||||
#define CONFIG_VOL_MONITOR_IR36021_READ
|
||||
/* The lowest and highest voltage allowed for T4240RDB */
|
||||
#define VDD_MV_MIN 819
|
||||
#define VDD_MV_MAX 1212
|
||||
|
||||
@@ -330,12 +330,6 @@ unsigned long get_board_sys_clk(void);
|
||||
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "ls1043aqds_vdd_mv"
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_VID
|
||||
#endif
|
||||
#define CONFIG_VOL_MONITOR_IR36021_SET
|
||||
#define CONFIG_VOL_MONITOR_INA220
|
||||
/* The lowest and highest voltage allowed for LS1043AQDS */
|
||||
#define VDD_MV_MIN 819
|
||||
#define VDD_MV_MAX 1212
|
||||
|
||||
@@ -338,12 +338,6 @@ unsigned long get_board_sys_clk(void);
|
||||
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "ls1046aqds_vdd_mv"
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_VID
|
||||
#endif
|
||||
#define CONFIG_VOL_MONITOR_IR36021_SET
|
||||
#define CONFIG_VOL_MONITOR_INA220
|
||||
/* The lowest and highest voltage allowed for LS1046AQDS */
|
||||
#define VDD_MV_MIN 819
|
||||
#define VDD_MV_MAX 1212
|
||||
|
||||
@@ -298,16 +298,10 @@ unsigned long get_board_sys_clk(void);
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
#define I2C_SVDD_MONITOR_ADDR 0x4F
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "ls1088aqds_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
|
||||
/* The lowest and highest voltage allowed for LS1088AQDS */
|
||||
#define VDD_MV_MIN 819
|
||||
#define VDD_MV_MAX 1212
|
||||
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
#define PWM_CHANNEL0 0x0
|
||||
|
||||
/*
|
||||
|
||||
@@ -197,16 +197,10 @@
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
#define I2C_SVDD_MONITOR_ADDR 0x4F
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "ls1088ardb_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
|
||||
/* The lowest and highest voltage allowed for LS1088ARDB */
|
||||
#define VDD_MV_MIN 819
|
||||
#define VDD_MV_MAX 1212
|
||||
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
#define PWM_CHANNEL0 0x0
|
||||
|
||||
/*
|
||||
|
||||
@@ -17,13 +17,7 @@
|
||||
|
||||
#define I2C_MUX_CH_VOL_MONITOR 0xa
|
||||
#define I2C_VOL_MONITOR_ADDR 0x38
|
||||
#define CONFIG_VOL_MONITOR_IR36021_READ
|
||||
#define CONFIG_VOL_MONITOR_IR36021_SET
|
||||
|
||||
#define CONFIG_VID_FLS_ENV "ls2080ardb_vdd_mv"
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_VID
|
||||
#endif
|
||||
/* step the IR regulator in 5mV increments */
|
||||
#define IR_VDD_STEP_DOWN 5
|
||||
#define IR_VDD_STEP_UP 5
|
||||
|
||||
@@ -8,12 +8,6 @@
|
||||
|
||||
#include "lx2160a_common.h"
|
||||
|
||||
/* VID */
|
||||
#define CONFIG_VID_FLS_ENV "lx2160aqds_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
/* RTC */
|
||||
#define CONFIG_SYS_RTC_BUS_NUM 0
|
||||
|
||||
|
||||
@@ -8,12 +8,6 @@
|
||||
|
||||
#include "lx2160a_common.h"
|
||||
|
||||
/* VID */
|
||||
#define CONFIG_VID_FLS_ENV "lx2160ardb_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
/* RTC */
|
||||
#define CONFIG_SYS_RTC_BUS_NUM 4
|
||||
|
||||
|
||||
@@ -12,12 +12,6 @@
|
||||
#undef CONFIG_USB_MAX_CONTROLLER_COUNT
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
||||
|
||||
/* Voltage monitor on channel 2*/
|
||||
#define CONFIG_VID_FLS_ENV "lx2162aqds_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
/* RTC */
|
||||
#define CONFIG_SYS_RTC_BUS_NUM 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user