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 36a00d3d5686214c671286072a4504eca0d438c3..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,19 +6,15 @@
  * (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
 #define _CONFIG_NAS220_H
 
 /*
- * Machine type definition and ID
+ * Machine type ID
  */
-#define MACH_TYPE_NAS220               MACH_TYPE_RD88F6192_NAS
-#define CONFIG_MACH_TYPE               MACH_TYPE_NAS220
-#define CONFIG_IDENT_STRING            "\nNAS 220"
+#define CONFIG_MACH_TYPE               MACH_TYPE_RD88F6192_NAS
 
 /*
  * High Level Configuration Options (easy to change)
@@ -43,19 +40,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_USB
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_IDE
-#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
@@ -67,10 +51,7 @@
  *  Environment variables configurations
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_SECT_SIZE 0x10000
-#else
-#define CONFIG_ENV_IS_NOWHERE
 #endif
 
 #define CONFIG_ENV_SIZE        0x10000
@@ -88,7 +69,6 @@
        "0x500000@0xc0000(uimage),"\
        "0x1a40000@0x5c0000(rootfs)\0" \
        "mtdids=nand0=orion_nand\0"\
-       "bootdelay=-1\0"\
        "autostart=no\0"\
        "autoload=no\0"
 
@@ -104,30 +84,15 @@
  * USB/EHCI
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI                        /* Enable EHCI USB support */
 #define CONFIG_USB_EHCI_KIRKWOOD       /* on Kirkwood platform */
 #define CONFIG_EHCI_IS_TDI
-#define CONFIG_USB_STORAGE
-#define CONFIG_DOS_PARTITION
-#define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
 /*
  * File system
  */
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_JFFS2
 #define CONFIG_JFFS2_NAND
 #define CONFIG_JFFS2_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 
 /*
  * SATA
@@ -140,14 +105,6 @@
 /*
  * EFI partition
  */
-#define CONFIG_EFI_PARTITION
-
-/*
- *  Date Time
- */
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
 
 #define CONFIG_KIRKWOOD_GPIO