Merge tag 'v2021.10-rc4' into next

[platform/kernel/u-boot.git] / include / configs / bcm7445.h

diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h
index f34cf2d..989482e 100644 (file)
--- a/include/configs/bcm7445.h
+++ b/include/configs/bcm7445.h
@@ -10,16 +10,13 @@
 #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
 
-#define CONFIG_SYS_MALLOC_LEN          ((10 * 1024) << 10) /* 10 MiB */
-
 #include "bcmstb.h"
 
-#define BCMSTB_SDHCI_BASE      0xf03e0200
 #define BCMSTB_TIMER_LOW       0xf0412008
 #define BCMSTB_TIMER_HIGH      0xf041200c
 #define BCMSTB_TIMER_FREQUENCY 0xf0412020
@@ -28,11 +25,10 @@
 #define BCMSTB_HIF_SPI_INTR2   0xf03e1a00
 #define BCMSTB_CS_REG          0xf03e0920
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH     1
-#define CONFIG_DM_SPI                  1
+/*
+ * Environment configuration for SPI flash.
+ */
+
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
-#define CONFIG_CMD_SF
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF_TEST
 
 #endif /* __CONFIG_H */