Merge branch '2023-02-10-assorted-updates-and-additions'

- DM_SERIAL conversion for bcm7xxx, button input driver, qcom updates,
  environment and network related cleanup, ftmac100 update, add a
  IS_ENABLED conversion that was just missed.

3 files changed, 0 insertions, 17 deletions

diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h
index 43edc91b101..dbe545c1759 100644
--- a/include/configs/bcm7260.h
+++ b/include/configs/bcm7260.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CFG_SYS_NS16550_COM1	0xf040c000
-
 #define CFG_SYS_INIT_RAM_ADDR	0x10200000
 
 #include "bcmstb.h"
diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h
index 114337294e0..b59048d175b 100644
--- a/include/configs/bcm7445.h
+++ b/include/configs/bcm7445.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CFG_SYS_NS16550_COM1	0xf040ab00
-
 #define CFG_SYS_INIT_RAM_ADDR	0x80200000
 
 #include "bcmstb.h"
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index d1de3561af6..c9280927b3c 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -93,19 +93,6 @@ extern phys_addr_t prior_stage_fdt_address;
  */
 
 /*
- * NS16550 configuration.
- */
-#define V_NS16550_CLK			81000000
-
-#define CFG_SYS_NS16550_CLK		V_NS16550_CLK
-
-/*
- * Serial console configuration.
- */
-#define CFG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600, \
-					 115200}
-
-/*
  * Informational display configuration.
  */