arm: bcm7xxx: Convert to DM_SERIAL

Remove ns16550 configuration from header files.  Document
DM_SERIAL-required prior stage device tree configuration.

diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index f8e0327d8f586769abf04c83a3a4f8bca159c4d5..51e0a5ddd716da7ebc7d6a1a08f294901fd6a9d5 100644 (file)
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -40,6 +40,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
-CONFIG_SYS_NS16550_SERIAL=y
-CONFIG_SYS_NS16550_REG_SIZE=-4
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index 81433b02cbcf9cf80aeae07ccebaed5cc931b367..f5f1e8d39707398b7cc3ea6fe9900af49db2446e 100644 (file)
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -44,8 +44,8 @@ CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SYS_NS16550_SERIAL=y
-CONFIG_SYS_NS16550_REG_SIZE=-4
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_BCMSTB_SPI=y

diff --git a/doc/README.bcm7xxx b/doc/README.bcm7xxx
index 9b5eae4741afaba3e6d66e73eedfff9cc4089d8a..6839da5f9742c28755eed46aa90dde74469f7d28 100644 (file)
--- a/doc/README.bcm7xxx
+++ b/doc/README.bcm7xxx
@@ -31,6 +31,12 @@ ${CROSS_COMPILE}strip u-boot
 Run
 ===
 
+To tell U-Boot which serial port to use for its console, set the
+"stdout-path" property in the "/chosen" node of the BOLT-generated
+device tree.  For example:
+
+BOLT> dt add prop chosen stdout-path s serial0:115200n8
+
 Flash the u-boot binary into board storage, then invoke it from BOLT.
 For example:
 

diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h
index 43edc91b101102932181e4e496f7a676aab787f9..dbe545c17594627f7c2d1361b85be86cb4ad117a 100644 (file)
--- 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 114337294e02ce9e2c3f83d10f57e3f9e25233e7..b59048d175bf19e229fd7795fce05afc953da77e 100644 (file)
--- 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 d1de3561af63944fc28a33e7ccbda79a3f073caf..c9280927b3cd9e069590c1cd8e9e75796e9fdc27 100644 (file)
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -92,19 +92,6 @@ extern phys_addr_t prior_stage_fdt_address;
  * Large kernel image bootm configuration.
  */
 
-/*
- * 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.
  */