Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

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

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 007670740ebf7257cb2eb22e49cbb65757a828ec..4bf8b1051e58a613fb895f600304ce9326340bfd 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -1,6 +1,6 @@
 /*
- * (C) Copyright 2009
- * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
+ * Copyright (C) 2009, STMicroelectronics - All Rights Reserved
+ * Author(s): Vipin Kumar, <vipin.kumar@st.com> for STMicroelectronics.
  *
  * Copyright (C) 2012, 2015 Stefan Roese <sr@denx.de>
  *
@@ -22,7 +22,6 @@
 /* Timer, HZ specific defines */
 #define CONFIG_SYS_HZ_CLOCK                    8300000
 
-#define        CONFIG_SYS_TEXT_BASE                    0x00800040
 #define CONFIG_SYS_FLASH_BASE                  0xf8000000
 /* Reserve 8KiB for SPL */
 #define CONFIG_SPL_PAD_TO                      8192    /* decimal for 'dd' */
@@ -38,7 +37,6 @@
 #define CONFIG_SYS_SERIAL1                     0xD0080000
 #define CONFIG_PL01x_PORTS                     { (void *)CONFIG_SYS_SERIAL0, \
                                                (void *)CONFIG_SYS_SERIAL1 }
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK                     (48 * 1000 * 1000)
 #define CONFIG_CONS_INDEX                      0
 #define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, \
@@ -64,7 +62,6 @@
 #define CONFIG_SYS_FSMC_NAND_8BIT
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_ECC_BCH
-#define CONFIG_BCH
 
 /* UBI/UBI config options */
 #define CONFIG_MTD_DEVICE
@@ -74,9 +71,6 @@
 #define CONFIG_MII
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_ADDR                0       /* PHY address */
-#define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */
-#define CONFIG_PHY_MICREL
-#define CONFIG_PHY_MICREL_KSZ9031
 
 #define CONFIG_SPEAR_GPIO
 
@@ -91,8 +85,6 @@
 #define CONFIG_SYS_I2C_RTC_ADDR        0x68
 
 /* FPGA config options */
-#define CONFIG_FPGA
-#define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
 #define CONFIG_FPGA_COUNT      1
 
@@ -100,16 +92,6 @@
 #define CONFIG_USB_EHCI_SPEAR
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
-/*
- * Command support defines
- */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_SAVES
-
-/* Filesystem support (for USB key) */
-#define CONFIG_SUPPORT_VFAT
-
-
 /*
  * U-Boot Environment placing definitions.
  */
@@ -132,18 +114,9 @@
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (8 << 20)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE                      256
-#define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE + \
-                                                sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS                     16
-#define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000
 
 /* Use last 2 lwords in internal SRAM for bootcounter */
-#define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_SYS_BOOTCOUNT_ADDR              (CONFIG_SRAM_BASE + \
                                                 CONFIG_SRAM_SIZE)
 
@@ -151,9 +124,6 @@
 #define CONFIG_UBI_PART                                ubi0
 #define CONFIG_UBIFS_VOLUME                    rootfs
 
-#define MTDIDS_DEFAULT         "nand0=nand"
-#define MTDPARTS_DEFAULT       "mtdparts=nand:64M(ubi0),64M(ubi1)"
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "u-boot_addr=1000000\0"                                         \
        "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0"          \
@@ -209,8 +179,8 @@
        "net_nfs=run load_dtb load_kernel; "                            \
                "run nfsargs addip addcon addmtd addmisc;"              \
                "bootm ${kernel_addr} - ${dtb_addr}\0"                  \
-       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                                    \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                                \
        "nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip"         \
                " addcon addmisc addmtd;"                               \
                "bootm ${kernel_addr} - ${dtb_addr}\0"                  \
@@ -246,9 +216,6 @@
 #define CONFIG_SPL_TEXT_BASE           0xd2800b00
 #define CONFIG_SPL_MAX_SIZE            (CONFIG_SRAM_SIZE - 0xb00)
 #define        CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/spear"
-#define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds"
-
-#define CONFIG_SPL_FRAMEWORK
 
 /*
  * Please select/define only one of the following