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
/
am335x_sl50.h
diff --git
a/include/configs/am335x_sl50.h
b/include/configs/am335x_sl50.h
index
62af3fa
..
381c75e
100644
(file)
--- a/
include/configs/am335x_sl50.h
+++ b/
include/configs/am335x_sl50.h
@@
-1,9
+1,8
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* am335x_sl50.h
*
* Copyright (C) 2015 Toby Churchill Ltd - http://www.toby-churchill.com/
/*
* am335x_sl50.h
*
* Copyright (C) 2015 Toby Churchill Ltd - http://www.toby-churchill.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_AM335X_EVM_H
*/
#ifndef __CONFIG_AM335X_EVM_H
@@
-26,12
+25,8
@@
/* Always 128 KiB env size */
#define CONFIG_ENV_SIZE (128 << 10)
/* Always 128 KiB env size */
#define CONFIG_ENV_SIZE (128 << 10)
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-
#ifndef CONFIG_SPL_BUILD
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
-
#define MEM_LAYOUT_ENV_SETTINGS \
"scriptaddr=0x80000000\0" \
"pxefile_addr_r=0x80100000\0" \
#define MEM_LAYOUT_ENV_SETTINGS \
"scriptaddr=0x80000000\0" \
"pxefile_addr_r=0x80100000\0" \
@@
-74,15
+69,9
@@
/* SPL */
/* Bootcount using the RTC block */
/* SPL */
/* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTCOUNT_AM33XX
#define CONFIG_SYS_BOOTCOUNT_BE
#define CONFIG_SYS_BOOTCOUNT_BE
-#ifndef CONFIG_SPL_USBETH_SUPPORT
-#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
-#endif
-
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
/* Remove other SPL modes. */
/* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST
/* Remove other SPL modes. */
/* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST