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-net
[platform/kernel/u-boot.git]
/
include
/
autoboot.h
diff --git
a/include/autoboot.h
b/include/autoboot.h
index
3a9059a
..
3ebd6f9
100644
(file)
--- a/
include/autoboot.h
+++ b/
include/autoboot.h
@@
-1,3
+1,4
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@
-5,14
+6,12
@@
* Add to readline cmdline-editing by
* (C) Copyright 2005
* JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
* Add to readline cmdline-editing by
* (C) Copyright 2005
* JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AUTOBOOT_H
#define __AUTOBOOT_H
*/
#ifndef __AUTOBOOT_H
#define __AUTOBOOT_H
-#ifdef CONFIG_
BOOTDELAY
+#ifdef CONFIG_
AUTOBOOT
/**
* bootdelay_process() - process the bootd delay
*
/**
* bootdelay_process() - process the bootd delay
*