From 869588decdf41b693c8977067f90f742b771d0ad Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 17 Oct 2016 20:13:02 -0600 Subject: Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig This converts the following to Kconfig: CONFIG_SYS_STDIO_DEREGISTER This option should never be enabled in SPL, so use CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option. Signed-off-by: Simon Glass [trini: Re-sync] Signed-off-by: Tom Rini --- include/configs/MIP405.h | 1 - include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 1 - include/configs/PIP405.h | 1 - include/configs/VCMA9.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/cyrus.h | 1 - include/configs/gr_ep2s60.h | 1 - include/configs/novena.h | 1 - include/configs/rpi.h | 1 - include/configs/sandbox.h | 2 -- include/configs/sunxi-common.h | 1 - include/configs/tbs2910.h | 1 - include/configs/tegra-common.h | 4 ---- include/configs/x86-common.h | 2 -- 15 files changed, 20 deletions(-) (limited to 'include/configs') diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 92b82ed..73ddbac 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -345,7 +345,6 @@ #define CONFIG_USB_UHCI /* Enable needed helper functions */ -#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ #endif /************************************************************ * Debug support diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 4021be7..e3c9e5b 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -283,7 +283,6 @@ ************************************************************/ #define CONFIG_PCI_OHCI 1 #define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_SYS_USB_EVENT_POLL 1 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 94a9399..e0b856f 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -361,7 +361,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); ************************************************************/ #define CONFIG_PCI_OHCI 1 #define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_SYS_USB_EVENT_POLL 1 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index f02967b..f923f7c 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -305,7 +305,6 @@ #define CONFIG_USB_UHCI /* Enable needed helper functions */ -#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ /************************************************************ * Debug support diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 75c6d50..bb26261 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -103,7 +103,6 @@ #define CONFIG_DOS_PARTITION /* Enable needed helper functions */ -#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ /* RTC */ #define CONFIG_RTC_S3C24X0 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 0b3f034..0ac3ec7 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -210,7 +210,6 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ -#define CONFIG_SYS_STDIO_DEREGISTER /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index cb85c6b..8ce23e6 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -446,7 +446,6 @@ #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_EHCI_IS_TDI -#define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_SYS_USB_EVENT_POLL /* _VIA_CONTROL_EP */ #endif diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 36a91c6..ad0c126 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -58,7 +58,6 @@ #if USE_GRUSB #define CONFIG_USB_UHCI /* Enable needed helper functions */ -#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ #endif /* diff --git a/include/configs/novena.h b/include/configs/novena.h index ee4267a..ecc7e7e 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -142,7 +142,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 25a90cc..45c8234 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -101,7 +101,6 @@ #define CONFIG_TFTP_TSIZE #define CONFIG_MISC_INIT_R #define CONFIG_SYS_USB_EVENT_POLL -#define CONFIG_SYS_STDIO_DEREGISTER #endif /* Console UART */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index b6533c3..31ab765 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -25,8 +25,6 @@ #define CONFIG_SYS_TIMER_RATE 1000000 #endif -#define CONFIG_SYS_STDIO_DEREGISTER - /* * Number of bits in a C 'long' on this architecture. Set this to 32 when * building on a 32-bit machine. diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index f98a48b..e0464df 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -347,7 +347,6 @@ extern int soft_i2c_gpio_scl; #ifdef CONFIG_USB_KEYBOARD #define CONFIG_PREBOOT -#define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b541937..61bd489 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -116,7 +116,6 @@ #endif /* CONFIG_CMD_USB_MASS_STORAGE */ #ifdef CONFIG_USB_KEYBOARD #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE -#define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_PREBOOT \ "usb start; " \ "if hdmidet; then " \ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 3590be4..63b711b 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -60,10 +60,6 @@ #define CONFIG_SYS_NO_FLASH -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SYS_STDIO_DEREGISTER -#endif - /* * Increasing the size of the IO buffer as default nfsargs size is more * than 256 and so it is not possible to edit it diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index f2c2b50..3bf42b5 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -61,8 +61,6 @@ 9600, 19200, 38400, 115200} #define CONFIG_SYS_NS16550_PORT_MAPPED -#define CONFIG_SYS_STDIO_DEREGISTER - #define CONFIG_CMDLINE_EDITING #define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE -- cgit v1.1