configs: Re-sync HUSH options

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

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index cfb85bf..d4bea63 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -24,7 +24,6 @@
  */
 #define CONFIG_FEROCEON_88FR131                /* #define CPU Core subversion */
 #define CONFIG_KW88F6192               /* SOC Name */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 
 /* power-on led, regulator, sata0, sata1 */
@@ -45,11 +44,9 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_DATE
@@ -57,8 +54,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -66,10 +61,6 @@
  */
 #include "mv-common.h"
 
-/* Remove or override few declarations from mv-common.h */
-#undef CONFIG_SYS_PROMPT       /* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT "nas220> "
-
 /*
  *  Environment variables configurations
  */
@@ -144,12 +135,6 @@
 #define CONFIG_SYS_ATA_IDE1_OFFSET      MV_SATA_PORT1_OFFSET
 #endif
 
-
-/*
- * Device Tree
- */
-#define CONFIG_OF_LIBFDT
-
 /*
  * EFI partition
  */