Merge tag 'xilinx-for-v2018.03' of git://git.denx.de/u-boot-microblaze

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

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index c54de65..9d27358 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -18,7 +18,6 @@
 #define CONFIG_E300            1       /* E300 Family */
 #define CONFIG_MPC834x         1       /* MPC834x specific */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
-#define CONFIG_TQM834X         1       /* TQM834X board specific */
 
 #define        CONFIG_SYS_TEXT_BASE    0x80000000
 
@@ -213,11 +212,6 @@
 
 #endif /* CONFIG_TSEC_ENET */
 
-/*
- * General PCI
- * Addresses are mapped 1-1.
- */
-
 #if defined(CONFIG_PCI)
 
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
@@ -251,7 +245,6 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_ADDR                \
                        (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K (one sector) for env */
@@ -271,13 +264,6 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /*
- * Command line configuration.
- */
-#if defined(CONFIG_PCI)
-    #define CONFIG_CMD_PCI
-#endif
-
-/*
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory */
@@ -286,18 +272,6 @@
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history */
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support */
 
-#if defined(CONFIG_CMD_KGDB)
-       #define CONFIG_SYS_CBSIZE       1024    /* Console I/O Buffer Size */
-#else
-       #define CONFIG_SYS_CBSIZE       256     /* Console I/O Buffer Size */
-#endif
-
-                               /* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS     16      /* max number of command args */
-                               /* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
-
 #undef CONFIG_WATCHDOG         /* watchdog disabled */
 
 /*
@@ -463,14 +437,10 @@
                                /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                400000
 
-#undef  CONFIG_BOOTARGS                /* the boot command will set bootargs */
-
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
-#undef CONFIG_BOOTARGS
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "hostname=tqm834x\0"                                            \
@@ -520,11 +490,6 @@
 /* mtdparts command line support */
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT         "nor0=TQM834x-0"
 
 /* default mtd partition table */
-#define MTDPARTS_DEFAULT       "mtdparts=TQM834x-0:256k(u-boot),256k(env)," \
-                                               "1m(kernel),2m(initrd)," \
-                                               "-(user);" \
-
 #endif /* __CONFIG_H */