Merge tag 'arc-fixes-for-2019.04-rc1' of git://git.denx.de/u-boot-arc

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

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index a1b5ad6..cfa5b56 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) Freescale Semiconductor, Inc. 2006, 2010.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 /*
  * mpc8313epb board configuration file
@@ -52,8 +51,6 @@
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_FSL_ELBC 1
 
-#define CONFIG_MISC_INIT_R
-
 /*
  * On-board devices
  *
@@ -73,8 +70,6 @@
 
 #define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
 
-#define CONFIG_BOARD_EARLY_INIT_R              /* call board_early_init_r */
-
 #define CONFIG_SYS_IMMR                0xE0000000
 
 #if defined(CONFIG_NAND) && !defined(CONFIG_SPL_BUILD)
@@ -187,13 +182,9 @@
 /*
  * FLASH on the Local Bus
  */
-#define CONFIG_SYS_FLASH_CFI           /* use the Common Flash Interface */
-#define CONFIG_FLASH_CFI_DRIVER                /* use the CFI driver */
 #define CONFIG_SYS_FLASH_BASE          0xFE000000      /* start of FLASH   */
 #define CONFIG_SYS_FLASH_SIZE          8       /* flash size in MB */
-#define CONFIG_SYS_FLASH_PROTECTION    1       /* Use h/w Flash protection. */
 #define CONFIG_SYS_FLASH_EMPTY_INFO            /* display empty sectors */
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE      /* buffer up multiple bytes */
 
 #define CONFIG_SYS_NOR_BR_PRELIM       (CONFIG_SYS_FLASH_BASE \
                                        | BR_PS_16      /* 16 bit port */ \
@@ -245,14 +236,13 @@
                                /* LB refresh timer prescal, 266MHz/32 */
 #define CONFIG_SYS_LBC_MRTPR   0x20000000  /*TODO */
 
-/* drivers/mtd/nand/nand.c */
+/* drivers/mtd/nand/raw/nand.c */
 #if defined(CONFIG_NAND) && defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_NAND_BASE           0xFFF00000
 #else
 #define CONFIG_SYS_NAND_BASE           0xE2800000
 #endif
 
-#define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITION
 
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
@@ -347,7 +337,6 @@
 /*
  * Serial Port
  */
-#define CONFIG_CONS_INDEX      1
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 
@@ -387,7 +376,6 @@
 /*
  * TSEC
  */
-#define CONFIG_TSEC_ENET               /* TSEC ethernet support */
 
 #define CONFIG_GMII                    /* MII PHY management */
 
@@ -608,7 +596,7 @@
 
 #define CONFIG_NETDEV          "eth1"
 
-#define CONFIG_HOSTNAME                mpc8313erdb
+#define CONFIG_HOSTNAME                "mpc8313erdb"
 #define CONFIG_ROOTPATH                "/nfs/root/path"
 #define CONFIG_BOOTFILE                "uImage"
                                /* U-Boot image on TFTP server */