Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[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 ec2ce3f..754bf2e 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
@@ -9,19 +8,17 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_HOSTNAME                                northstar2
+#define CONFIG_HOSTNAME                                "northstar2"
 
 /* Physical Memory Map */
 #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
 
 /* define text_base for U-boot image */
-#define CONFIG_SYS_TEXT_BASE                   0x85000000
 #define CONFIG_SYS_INIT_SP_ADDR                        (PHYS_SDRAM_1 + 0x7ff00)
 #define CONFIG_SYS_LOAD_ADDR                   0x90000000
 #define CONFIG_SYS_MALLOC_LEN                  SZ_16M
@@ -34,22 +31,15 @@
 #define CONFIG_SYS_NS16550_COM2                        0x66110000
 #define CONFIG_SYS_NS16550_COM3                        0x66120000
 #define CONFIG_SYS_NS16550_COM4                        0x66130000
-#define CONFIG_CONS_INDEX                      4
 #define CONFIG_BAUDRATE                                115200
 
 #define CONFIG_ENV_SIZE                                SZ_8K
-#define CONFIG_ENV_IS_NOWHERE
 
 /* console configuration */
 #define CONFIG_SYS_CBSIZE                      SZ_1K
-#define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE + \
-                                                sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS                     64
 #define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE
 
 /* version string, parser, etc */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_COMMAND_HISTORY
-#define CONFIG_SYS_LONGHELP
 
 #endif /* __BCM_NORTHSTAR2_H */