Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 089263f96f749783810f7dfc051d1c788cdea5c4..bdfa42fd30c29d929ab8e59e9aff286c50a7a535 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2014 Evgeni Dobrev <evgeni@studio-punkt.com>
  *
@@ -5,8 +6,6 @@
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_NAS220_H
@@ -41,9 +40,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -73,7 +69,6 @@
        "0x500000@0xc0000(uimage),"\
        "0x1a40000@0x5c0000(rootfs)\0" \
        "mtdids=nand0=orion_nand\0"\
-       "bootdelay=-1\0"\
        "autostart=no\0"\
        "autoload=no\0"
 
@@ -91,7 +86,6 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI_KIRKWOOD       /* on Kirkwood platform */
 #define CONFIG_EHCI_IS_TDI
-#define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
 /*
@@ -99,8 +93,6 @@
  */
 #define CONFIG_JFFS2_NAND
 #define CONFIG_JFFS2_LZO
-#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
 
 /*
  * SATA
@@ -114,13 +106,6 @@
  * EFI partition
  */
 
-/*
- *  Date Time
- */
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
 #define CONFIG_KIRKWOOD_GPIO
 
 #endif /* _CONFIG_NAS220_H */