Merge branch 'next'

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

diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h
index f0eba6b..fbfab28 100644 (file)
--- a/include/configs/bcm_northstar2.h
+++ b/include/configs/bcm_northstar2.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Configuration for Broadcom NS2.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __BCM_NORTHSTAR2_H
@@ -15,7 +14,6 @@
 #define V2M_BASE                               0x80000000
 #define PHYS_SDRAM_1                           V2M_BASE
 
-#define CONFIG_NR_DRAM_BANKS                   2
 #define PHYS_SDRAM_1_SIZE                      (4UL * SZ_1G)
 #define PHYS_SDRAM_2_SIZE                      (4UL * SZ_1G)
 #define CONFIG_SYS_SDRAM_BASE                  PHYS_SDRAM_1
@@ -33,9 +31,6 @@
 #define CONFIG_SYS_NS16550_COM2                        0x66110000
 #define CONFIG_SYS_NS16550_COM3                        0x66120000
 #define CONFIG_SYS_NS16550_COM4                        0x66130000
-#define CONFIG_BAUDRATE                                115200
-
-#define CONFIG_ENV_SIZE                                SZ_8K
 
 /* console configuration */
 #define CONFIG_SYS_CBSIZE                      SZ_1K