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
/
chiliboard.h
diff --git
a/include/configs/chiliboard.h
b/include/configs/chiliboard.h
index
234cd6a
..
db990fc
100644
(file)
--- a/
include/configs/chiliboard.h
+++ b/
include/configs/chiliboard.h
@@
-1,7
+1,6
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Grinn - http://grinn-global.com/
/*
* Copyright (C) 2017 Grinn - http://grinn-global.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CHILIBOARD_H
*/
#ifndef __CONFIG_CHILIBOARD_H
@@
-9,8
+8,6
@@
#include <configs/ti_am335x_common.h>
#include <configs/ti_am335x_common.h>
-#define CONFIG_CONS_INDEX 1
-
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
#endif
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
#endif
@@
-123,7
+120,6
@@
/* SPL */
/* Bootcount using the RTC block */
/* SPL */
/* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
#define CONFIG_SYS_BOOTCOUNT_BE
/* NAND: device related configs */
#define CONFIG_SYS_BOOTCOUNT_BE
/* NAND: device related configs */
@@
-152,7
+148,6
@@
/* USB configuration */
#define CONFIG_ARCH_MISC_INIT
/* USB configuration */
#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST