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 '2020-10-22-misc-changes'
[platform/kernel/u-boot.git]
/
include
/
configs
/
ds414.h
diff --git
a/include/configs/ds414.h
b/include/configs/ds414.h
index
ce520b2
..
a92e788
100644
(file)
--- a/
include/configs/ds414.h
+++ b/
include/configs/ds414.h
@@
-1,7
+1,6
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Stefan Roese <sr@denx.de>
/*
* Copyright (C) 2014 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_SYNOLOGY_DS414_H
*/
#ifndef _CONFIG_SYNOLOGY_DS414_H
@@
-10,7
+9,6
@@
/*
* High Level Configuration Options (easy to change)
*/
/*
* High Level Configuration Options (easy to change)
*/
-#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
/*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
@@
-19,10
+17,6
@@
*/
#define CONFIG_SYS_TCLK 250000000 /* 250MHz */
*/
#define CONFIG_SYS_TCLK 250000000 /* 250MHz */
-/*
- * Commands configuration
- */
-
/* I2C */
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MVTWSI
/* I2C */
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MVTWSI
@@
-30,23
+24,12
@@
#define CONFIG_SYS_I2C_SLAVE 0x0
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 0x0
#define CONFIG_SYS_I2C_SPEED 100000
-/* SPI NOR flash default params, used by sf commands */
-#define CONFIG_SF_DEFAULT_SPEED 1000000
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
-
/* Environment in SPI NOR flash */
/* Environment in SPI NOR flash */
-#define CONFIG_ENV_OFFSET 0x7E0000 /* RedBoot config partition in DTS */
-#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
-#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */
-#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII
#define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII
-#define CONFIG_SYS_ALT_MEMTEST
-
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_PCI_MVEBU
#define CONFIG_PCI_SCAN_SHOW
#endif
#define CONFIG_PCI_SCAN_SHOW
#endif
@@
-66,7
+49,6
@@
#endif
/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
#endif
/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
-#define CONFIG_SYS_MVFS
/*
* 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
@@
-89,7
+71,6
@@
/* SPL */
/* Defines for SPL */
/* SPL */
/* Defines for SPL */
-#define CONFIG_SPL_TEXT_BASE 0x40004030
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030)
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
#define CONFIG_SPL_MAX_SIZE ((128 << 10) - 0x4030)
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + (128 << 10))
@@
-102,9
+83,10
@@
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
+#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI)
/* SPL related SPI defines */
/* SPL related SPI defines */
-#define CONFIG_S
PL_SPI_LOAD
-#
define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000
+#define CONFIG_S
YS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
+#
endif
/* DS414 bus width is 32bits */
#define CONFIG_DDR_32BIT
/* DS414 bus width is 32bits */
#define CONFIG_DDR_32BIT
@@
-112,7
+94,5
@@
/* Default Environment */
#define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd0000 0x700000; bootm"
#define CONFIG_LOADADDR 0x80000
/* Default Environment */
#define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd0000 0x700000; bootm"
#define CONFIG_LOADADDR 0x80000
-#undef CONFIG_PREBOOT /* override preboot for USB and SPI flash init */
-#define CONFIG_PREBOOT "usb start; sf probe"
#endif /* _CONFIG_SYNOLOGY_DS414_H */
#endif /* _CONFIG_SYNOLOGY_DS414_H */