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

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

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 410d20b..999bdd1 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2010 Samsung Electronics
  * Minkyu Kang <mk7.kang@samsung.com>
  *
  * Configuation settings for the SAMSUNG Universal (EXYNOS4210) board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_UNIVERSAL_H
@@ -18,14 +17,12 @@
 #define CONFIG_SYS_L2CACHE_OFF         1
 
 /* Universal has 2 banks of DRAM */
-#define CONFIG_NR_DRAM_BANKS           2
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
 #define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
 
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
 /* select serial console configuration */
-#define CONFIG_SERIAL2
 
 /* Console configuration */
 
@@ -44,9 +41,6 @@
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x5000000)
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x4800000)
 
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 
 #define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT
@@ -148,8 +142,6 @@ int universal_spi_read(void);
 /* Common misc for Samsung */
 #define CONFIG_MISC_COMMON
 
-#define CONFIG_MISC_INIT_R
-
 /* Download menu - Samsung common */
 #define CONFIG_LCD_MENU