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 tag 'mips-pull-2019-05-24' of git://git.denx.de/u-boot-mips
[platform/kernel/u-boot.git]
/
include
/
configs
/
iconnect.h
diff --git
a/include/configs/iconnect.h
b/include/configs/iconnect.h
index
72c64c6
..
87113d7
100644
(file)
--- a/
include/configs/iconnect.h
+++ b/
include/configs/iconnect.h
@@
-1,9
+1,8
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2012
* Wojciech Dubowik <wojciech.dubowik@neratec.com>
* Luka Perkov <luka@openwrt.org>
/*
* (C) Copyright 2009-2012
* Wojciech Dubowik <wojciech.dubowik@neratec.com>
* Luka Perkov <luka@openwrt.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_ICONNECT_H
*/
#ifndef _CONFIG_ICONNECT_H
@@
-29,8
+28,6
@@
/*
* Commands configuration
*/
/*
* Commands configuration
*/
-#define CONFIG_SYS_MVFS
-#define CONFIG_CMD_NAND
/*
* 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
@@
-42,10
+39,7
@@
* Environment variables configuration
*/
#ifdef CONFIG_CMD_NAND
* Environment variables configuration
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
-#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0x80000
#endif
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0x80000
@@
-60,16
+54,10
@@
"ubifsload 0x800000 ${kernel}; " \
"bootm 0x800000"
"ubifsload 0x800000 ${kernel}; " \
"bootm 0x800000"
-#define CONFIG_MTDPARTS \
- "mtdparts=orion_nand:" \
- "0x80000@0x0(uboot)," \
- "0x20000@0x80000(uboot_env)," \
- "-@0xa0000(rootfs)\0"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \
- "mtdparts="CONFIG_MTDPARTS
\
+ "mtdparts="CONFIG_MTDPARTS
_DEFAULT
\
"kernel=/boot/uImage\0" \
"bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
"kernel=/boot/uImage\0" \
"bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
@@
-85,7
+73,5
@@
/*
* File system
*/
/*
* File system
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif /* _CONFIG_ICONNECT_H */
#endif /* _CONFIG_ICONNECT_H */