bootcount: Migrate CONFIG_SYS_BOOTCOUNT_ADDR

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

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 636c98c386588c09af3e06db05e52c5ee2e87d09..fe9aaaec1db9c5452b11f350276307823c9c9cf5 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -156,27 +156,6 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/*
- * Command line configuration.
- */
-
-#if defined(FLASH)
-# if !defined(RAMENV)
-#  define CONFIG_CMD_SAVES
-# endif
-
-#else
-#if defined(SPIFLASH)
-
-# if !defined(RAMENV)
-#  define CONFIG_CMD_SAVES
-# endif
-#endif
-#endif
 
 #if defined(CONFIG_CMD_JFFS2)
 # define CONFIG_MTD_PARTITIONS
@@ -190,26 +169,17 @@
 /* MTD partitions */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT         "nor0=flash-0"
 
 /* default mtd partition table */
-#define MTDPARTS_DEFAULT       "mtdparts=flash-0:256k(u-boot),"\
-                               "256k(env),3m(kernel),1m(romfs),"\
-                               "1m(cramfs),-(jffs2)"
 #endif
 
 /* size of console buffer */
 #define        CONFIG_SYS_CBSIZE       512
- /* print buffer size */
-#define        CONFIG_SYS_PBSIZE \
-               (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 /* max number of command args */
 #define        CONFIG_SYS_MAXARGS      15
-#define        CONFIG_SYS_LONGHELP
 /* default load address */
 #define        CONFIG_SYS_LOAD_ADDR    0
 
-#define        CONFIG_BOOTARGS         "root=romfs"
 #define        CONFIG_HOSTNAME         XILINX_BOARD_NAME
 #define        CONFIG_BOOTCOMMAND      "base 0;tftp 11000000 image.img;bootm"
 
@@ -230,31 +200,17 @@
                                        "setenv stdin serial\0"
 #endif
 
-#define CONFIG_CMDLINE_EDITING
-
 /* Enable flat device tree support */
 #define CONFIG_LMB             1
 
 #if defined(CONFIG_XILINX_AXIEMAC)
 # define CONFIG_MII            1
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN       1
-# define CONFIG_PHY_ATHEROS    1
-# define CONFIG_PHY_BROADCOM   1
-# define CONFIG_PHY_DAVICOM    1
-# define CONFIG_PHY_LXT                1
-# define CONFIG_PHY_MARVELL    1
-# define CONFIG_PHY_NATSEMI    1
-# define CONFIG_PHY_REALTEK    1
-# define CONFIG_PHY_VITESSE    1
 #else
 # undef CONFIG_MII
 #endif
 
 /* SPL part */
-#define CONFIG_CMD_SPL
-#define CONFIG_SPL_FRAMEWORK
-
-#define CONFIG_SPL_LDSCRIPT    "arch/microblaze/cpu/u-boot-spl.lds"
 
 #ifdef CONFIG_SYS_FLASH_BASE
 # define CONFIG_SYS_UBOOT_BASE         CONFIG_SYS_FLASH_BASE