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

[people/ms/u-boot.git] / include / configs / smdk5420.h

diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index b96eea88908cca851cd69a236a3f6115f9b0dd8d..9cf886c0664f7a5f92a587a096bf72129d749681 100644 (file)
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -1,54 +1,41 @@
 /*
  * Copyright (C) 2013 Samsung Electronics
  *
- * Configuration settings for the SAMSUNG EXYNOS5420 board.
+ * Configuration settings for the SAMSUNG SMDK5420 board.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef __CONFIG_5420_H
-#define __CONFIG_5420_H
+#ifndef __CONFIG_SMDK5420_H
+#define __CONFIG_SMDK5420_H
 
-#include <configs/exynos5-dt.h>
+#include <configs/exynos5420-common.h>
+#include <configs/exynos5-dt-common.h>
+#include <configs/exynos5-common.h>
 
-#define CONFIG_EXYNOS5420              /* which is in a Exynos5 Family */
-#define CONFIG_SMDK5420                        /* which is in a SMDK5420 */
-
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE     exynos5420-smdk5420
-
-#define CONFIG_VAR_SIZE_SPL
+#undef CONFIG_KEYBOARD
 
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_TEXT_BASE           0x23E00000
+#define CONFIG_BOARD_COMMON
 
-#define CONFIG_BOARD_REV_GPIO_COUNT    2
+#define CONFIG_SMDK5420                        /* which is in a SMDK5420 */
 
-/* MACH_TYPE_SMDK5420 macro will be removed once added to mach-types */
-#define MACH_TYPE_SMDK5420             8002 /* Temporary number */
-#define CONFIG_MACH_TYPE               MACH_TYPE_SMDK5420
+#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CONFIG_SYS_TEXT_BASE   0x23E00000
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_IRAM_TOP - 0x800)
 
 /* select serial console configuration */
-#define CONFIG_SERIAL3                 /* use SERIAL 3 */
+#define CONFIG_SERIAL3         /* use SERIAL 3 */
+#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
 
-#ifdef CONFIG_VAR_SIZE_SPL
-#define CONFIG_SPL_TEXT_BASE           0x02024410
-#else
-#define CONFIG_SPL_TEXT_BASE   0x02024400
-#endif
+#define CONFIG_IDENT_STRING    " for SMDK5420"
+#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
 
-#define CONFIG_BOOTCOMMAND     "mmc read 20007000 451 2000; bootm 20007000"
-
-#define CONFIG_SYS_PROMPT              "SMDK5420 # "
-#define CONFIG_IDENT_STRING            " for SMDK5420"
-
-#define CONFIG_IRAM_TOP                0x02074000
-/*
- * Put the initial stack pointer 1KB below this to allow room for the
- * SPL marker. This value is arbitrary, but gd_t is placed starting here.
- */
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_IRAM_TOP - 0x800)
+/* USB */
+#define CONFIG_USB_XHCI
+#define CONFIG_USB_XHCI_EXYNOS
 
-#define CONFIG_MAX_I2C_NUM     11
+/* DRAM Memory Banks */
+#define CONFIG_NR_DRAM_BANKS   7
+#define SDRAM_BANK_SIZE                (512UL << 20UL) /* 512 MB */
 
-#endif /* __CONFIG_5420_H */
+#endif /* __CONFIG_SMDK5420_H */