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 'arc-fixes-for-2019.04-rc1' of git://git.denx.de/u-boot-arc
[platform/kernel/u-boot.git]
/
include
/
configs
/
nsa310s.h
diff --git
a/include/configs/nsa310s.h
b/include/configs/nsa310s.h
index
366ee55
..
1ca9a01
100644
(file)
--- a/
include/configs/nsa310s.h
+++ b/
include/configs/nsa310s.h
@@
-1,10
+1,9
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015
* Gerald Kerma <dreagle@doukki.net>
* Tony Dinh <mibodhi@gmail.com>
* Luka Perkov <luka.perkov@sartura.hr>
/*
* Copyright (C) 2015
* Gerald Kerma <dreagle@doukki.net>
* Tony Dinh <mibodhi@gmail.com>
* Luka Perkov <luka.perkov@sartura.hr>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_NSA310S_H
*/
#ifndef _CONFIG_NSA310S_H
@@
-21,12
+20,8
@@
/* compression configuration */
#define CONFIG_BZIP2
/* compression configuration */
#define CONFIG_BZIP2
-#define CONFIG_LZMA
/* commands configuration */
/* commands configuration */
-#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */
-#define CONFIG_SYS_MVFS
-#define CONFIG_CMD_IDE
/*
* 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
@@
-36,10
+31,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 0xe0000
#endif
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0xe0000
@@
-55,17
+47,10
@@
"fdt addr 0x700000; fdt resize; fdt chosen; " \
"bootz 0x800000 - 0x700000"
"fdt addr 0x700000; fdt resize; fdt chosen; " \
"bootz 0x800000 - 0x700000"
-#define CONFIG_MTDPARTS \
- "mtdparts=orion_nand:" \
- "0xe0000@0x0(uboot)," \
- "0x20000@0xe0000(uboot_env)," \
- "0x100000@0x100000(second_stage_uboot)," \
- "-@0x200000(root)\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/zImage\0" \
"fdt=/boot/nsa310s.dtb\0" \
"bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
"kernel=/boot/zImage\0" \
"fdt=/boot/nsa310s.dtb\0" \
"bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
@@
-73,20
+58,18
@@
/* Ethernet driver configuration */
#ifdef CONFIG_CMD_NET
#define CONFIG_NETCONSOLE
/* Ethernet driver configuration */
#ifdef CONFIG_CMD_NET
#define CONFIG_NETCONSOLE
-#define CONFIG_NET_MULTI
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 1
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 1
-#define CONFIG_PHY_GIGE
#define CONFIG_RESET_PHY_R
#endif /* CONFIG_CMD_NET */
/* SATA driver configuration */
#define CONFIG_RESET_PHY_R
#endif /* CONFIG_CMD_NET */
/* SATA driver configuration */
-#ifdef CONFIG_
CMD_
IDE
+#ifdef CONFIG_IDE
#define __io
#define CONFIG_IDE_PREINIT
#define CONFIG_MVSATA_IDE_USE_PORT0
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
#define __io
#define CONFIG_IDE_PREINIT
#define CONFIG_MVSATA_IDE_USE_PORT0
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
-#endif /* CONFIG_
CMD_
IDE */
+#endif /* CONFIG_IDE */
/* RTC driver configuration */
#ifdef CONFIG_CMD_DATE
/* RTC driver configuration */
#ifdef CONFIG_CMD_DATE