projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
nas220.h
diff --git
a/include/configs/nas220.h
b/include/configs/nas220.h
index
90be7bd
..
bdfa42f
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>
*
/*
* 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>
* (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
*/
#ifndef _CONFIG_NAS220_H
@@
-41,9
+40,6
@@
/*
* Commands configuration
*/
/*
* 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
/*
* 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"\
"0x500000@0xc0000(uimage),"\
"0x1a40000@0x5c0000(rootfs)\0" \
"mtdids=nand0=orion_nand\0"\
- "bootdelay=-1\0"\
"autostart=no\0"\
"autoload=no\0"
"autostart=no\0"\
"autoload=no\0"
@@
-98,8
+93,6
@@
*/
#define CONFIG_JFFS2_NAND
#define CONFIG_JFFS2_LZO
*/
#define CONFIG_JFFS2_NAND
#define CONFIG_JFFS2_LZO
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* SATA
/*
* SATA
@@
-113,13
+106,6
@@
* EFI partition
*/
* EFI partition
*/
-/*
- * Date Time
- */
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
#define CONFIG_KIRKWOOD_GPIO
#endif /* _CONFIG_NAS220_H */
#define CONFIG_KIRKWOOD_GPIO
#endif /* _CONFIG_NAS220_H */