summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/jerry/board.h2
-rw-r--r--include/config.h5
-rw-r--r--power/build.mk2
-rw-r--r--power/rk3288.c (renamed from power/rockchip.c)0
4 files changed, 4 insertions, 5 deletions
diff --git a/board/jerry/board.h b/board/jerry/board.h
index c453ba4e32..7f45f1b508 100644
--- a/board/jerry/board.h
+++ b/board/jerry/board.h
@@ -21,7 +21,7 @@
#define CONFIG_CHARGER_BQ24715
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_V2
-#define CONFIG_CHIPSET_ROCKCHIP
+#define CONFIG_CHIPSET_RK3288
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_FORCE_CONSOLE_RESUME
#define CONFIG_HOST_COMMAND_STATUS
diff --git a/include/config.h b/include/config.h
index ab00071461..fe9e084261 100644
--- a/include/config.h
+++ b/include/config.h
@@ -760,9 +760,8 @@
#undef CONFIG_CHIPSET_ECDRIVEN /* Dummy power module */
#undef CONFIG_CHIPSET_GEMINILAKE /* Intel Geminilake (x86) */
#undef CONFIG_CHIPSET_MT817X /* MediaTek MT817x */
+#undef CONFIG_CHIPSET_RK3288 /* Rockchip rk3288 */
#undef CONFIG_CHIPSET_RK3399 /* Rockchip rk3399 */
-/* TODO: Rename below config to CONFIG_CHIPSET_RK32XX */
-#undef CONFIG_CHIPSET_ROCKCHIP /* Rockchip rk32xx */
#undef CONFIG_CHIPSET_SKYLAKE /* Intel Skylake (x86) */
#undef CONFIG_CHIPSET_SDM845 /* Qualcomm SDM845 */
#undef CONFIG_CHIPSET_STONEY /* AMD Stoney (x86)*/
@@ -3661,7 +3660,7 @@
#undef CONFIG_CHIPSET_GEMINILAKE
#undef CONFIG_CHIPSET_MT817X
#undef CONFIG_CHIPSET_RK3399
-#undef CONFIG_CHIPSET_ROCKCHIP
+#undef CONFIG_CHIPSET_RK3288
#undef CONFIG_CHIPSET_SDM845
#undef CONFIG_CHIPSET_SKYLAKE
#undef CONFIG_CHIPSET_STONEY
diff --git a/power/build.mk b/power/build.mk
index 1b7d7e6eec..a5cbddaa06 100644
--- a/power/build.mk
+++ b/power/build.mk
@@ -11,8 +11,8 @@ power-$(CONFIG_CHIPSET_BRASWELL)+=braswell.o
power-$(CONFIG_CHIPSET_CANNONLAKE)+=cannonlake.o intel_x86.o
power-$(CONFIG_CHIPSET_ECDRIVEN)+=ec_driven.o
power-$(CONFIG_CHIPSET_MT817X)+=mt817x.o
+power-$(CONFIG_CHIPSET_RK3288)+=rk3288.o
power-$(CONFIG_CHIPSET_RK3399)+=rk3399.o
-power-$(CONFIG_CHIPSET_ROCKCHIP)+=rockchip.o
power-$(CONFIG_CHIPSET_SDM845)+=sdm845.o
power-$(CONFIG_CHIPSET_SKYLAKE)+=skylake.o intel_x86.o
power-$(CONFIG_CHIPSET_STONEY)+=stoney.o
diff --git a/power/rockchip.c b/power/rk3288.c
index 22ec8eff5b..22ec8eff5b 100644
--- a/power/rockchip.c
+++ b/power/rk3288.c