arm: bcm7445: Change serial console index

Change the configured serial console index to reflect that it is the
first physical UART, reorder some defconfig lines and move some
environment configuration from bcmstb.h to bcm7445.h.

Signed-off-by: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index 59c745f41b5215b72b56d0023446be45bef3963d..cb1522604db3f9c877a7b34f29f400274236582b 100644 (file)
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -12,10 +12,10 @@ CONFIG_OF_PRIOR_STAGE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH=y
-CONFIG_CONS_INDEX=3
+CONFIG_CONS_INDEX=1
+CONFIG_EFI_LOADER=n
 CONFIG_SPI=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_SPI=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_BCMSTB_SPI=y
-# CONFIG_EFI_LOADER is not set

diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h
index f34cf2d03bcb3c94312cb7802152fa9e6a263805..8c675f773310c37a85c29589c4b0ff859afc7def 100644 (file)
--- a/include/configs/bcm7445.h
+++ b/include/configs/bcm7445.h
@@ -10,7 +10,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_NS16550_COM3        0xf040ab00
+#define CONFIG_SYS_NS16550_COM1        0xf040ab00
 
 #define CONFIG_SYS_TEXT_BASE           0x80100000
 #define CONFIG_SYS_INIT_RAM_ADDR       0x80200000
@@ -28,7 +28,12 @@
 #define BCMSTB_HIF_SPI_INTR2   0xf03e1a00
 #define BCMSTB_CS_REG          0xf03e0920
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH     1
+/*
+ * Environment configuration for SPI flash.
+ */
+#define CONFIG_ENV_OFFSET      0x1e0000
+#define CONFIG_ENV_SECT_SIZE   CONFIG_ENV_SIZE
+
 #define CONFIG_DM_SPI                  1
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_CMD_SF

diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index e755383e725ed4b12d7f3dfb5dee4eb2c3bcb7e0..cc289244ff207f24970254f826322a2ae88a49ad 100644 (file)
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -114,7 +114,6 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * Serial console configuration.
  */
-
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600, \
                                         115200}
@@ -151,10 +150,7 @@ extern phys_addr_t prior_stage_fdt_address;
  * Environment configuration.
  */
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-
-#define CONFIG_ENV_OFFSET              0x1e0000
 #define CONFIG_ENV_SIZE                        (64 << 10) /* 64 KiB */
-#define CONFIG_ENV_SECT_SIZE           CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_ENV_OVERWRITE