Convert CONFIG_MISC_INIT_R to Kconfig

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

diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index b54097c..5517ed7 100644 (file)
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -1,21 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef __CONFIG_SAMTEC_VINING_FPGA_H__
 #define __CONFIG_SAMTEC_VINING_FPGA_H__
 
 #include <asm/arch/base_addr_ac5.h>
 
-#define CONFIG_HW_WATCHDOG
-
 /* Memory configurations */
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on VINING_FPGA */
 
 /* Booting Linux */
 #define CONFIG_BOOTFILE                "openwrt-socfpga-socfpga_cyclone5_vining_fpga-fit-uImage.itb"
-#define CONFIG_BOOTARGS                "console=ttyS0," __stringify(CONFIG_BAUDRATE)
 #define CONFIG_BOOTCOMMAND     "run selboot"
 #define CONFIG_LOADADDR                0x01000000
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
@@ -44,7 +40,7 @@
 #endif
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME                        socfpga_vining_fpga
+#define CONFIG_HOSTNAME                        "socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
@@ -168,15 +164,6 @@
                "else echo \"Unsupported boot mode: \"${bootmode} ; "   \
                "fi\0"                                                  \
 
-#define MTDPARTS_DEFAULT                       \
-       "mtdparts=ff705000.spi.0:"              \
-               "1m(u-boot),"                   \
-               "64k(env1),"                    \
-               "64k(env2),"                    \
-               "256k(samtec1),"                \
-               "256k(samtec2),"                \
-               "-(rcvrfs);"    /* Recovery */  \
-
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
@@ -184,8 +171,6 @@
 #define CONFIG_ENV_OFFSET_REDUND       \
        (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
 
-#define CONFIG_MISC_INIT_R
-
 /* Support changing the prompt string */
 #define CONFIG_CMDLINE_PS_SUPPORT