From d6918816fb88ab648016284d80e88cc0db2a33ae Mon Sep 17 00:00:00 2001 From: Mario Six Date: Mon, 21 Jan 2019 09:17:45 +0100 Subject: [PATCH] hrcon: Migrate to CONFIG_TARGET_HRCON Use the proper CONFIG_TARGET_HRCON Kconfig option to replace the CONFIG_HRCON ad-hoc config option. Signed-off-by: Mario Six --- board/gdsys/common/Makefile | 2 +- board/gdsys/mpc8308/Makefile | 2 +- include/configs/hrcon.h | 1 - include/gdsys_fpga.h | 2 +- scripts/config_whitelist.txt | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile index af9058a5d7..67d2b310b3 100644 --- a/board/gdsys/common/Makefile +++ b/board/gdsys/common/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_IO64) += miiphybb.o obj-$(CONFIG_IOCON) += osd.o mclink.o dp501.o phy.o ch7301.o obj-$(CONFIG_DLVISION_10G) += osd.o dp501.o obj-$(CONFIG_CONTROLCENTERD) += dp501.o -obj-$(CONFIG_HRCON) += osd.o mclink.o dp501.o phy.o ioep-fpga.o fanctrl.o +obj-$(CONFIG_TARGET_HRCON) += osd.o mclink.o dp501.o phy.o ioep-fpga.o fanctrl.o obj-$(CONFIG_STRIDER) += mclink.o dp501.o phy.o ioep-fpga.o adv7611.o ch7301.o obj-$(CONFIG_STRIDER) += fanctrl.o obj-$(CONFIG_STRIDER_CON) += osd.o diff --git a/board/gdsys/mpc8308/Makefile b/board/gdsys/mpc8308/Makefile index 60d2232573..f29376fc9e 100644 --- a/board/gdsys/mpc8308/Makefile +++ b/board/gdsys/mpc8308/Makefile @@ -4,5 +4,5 @@ # Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc obj-y := mpc8308.o sdram.o -obj-$(CONFIG_HRCON) += hrcon.o +obj-$(CONFIG_TARGET_HRCON) += hrcon.o obj-$(CONFIG_STRIDER) += strider.o diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 23ed4e54c7..cd5e883b7a 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -13,7 +13,6 @@ */ #define CONFIG_E300 1 /* E300 family */ #define CONFIG_MPC83xx 1 /* MPC83xx family */ -#define CONFIG_HRCON 1 /* HRCON board specific */ #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index db4424d3f8..e9fb4b88b5 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -161,7 +161,7 @@ struct ihs_fpga { }; #endif -#if defined(CONFIG_HRCON) || defined(CONFIG_STRIDER_CON_DP) +#if defined(CONFIG_TARGET_HRCON) || defined(CONFIG_STRIDER_CON_DP) struct ihs_fpga { u16 reflection_low; /* 0x0000 */ u16 versions; /* 0x0002 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4c3842bdc3..35197779ea 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -881,7 +881,6 @@ CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP -CONFIG_HRCON CONFIG_HRCON_DH CONFIG_HRCON_FANS CONFIG_HSMMC2_8BIT -- 2.25.1