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
/
configs
/
lsxl.h
diff --git
a/include/configs/lsxl.h
b/include/configs/lsxl.h
index
8b94412
..
9d4be18
100644
(file)
--- a/
include/configs/lsxl.h
+++ b/
include/configs/lsxl.h
@@
-1,8
+1,7
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2012 Michael Walle
* Michael Walle <michael@walle.cc>
/*
* Copyright (c) 2012 Michael Walle
* Michael Walle <michael@walle.cc>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_LSXL_H
*/
#ifndef _CONFIG_LSXL_H
@@
-30,7
+29,6
@@
#define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
-#define CONFIG_MISC_INIT_R
#define CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_KIRKWOOD_GPIO
#define CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_KIRKWOOD_GPIO
@@
-46,7
+44,6
@@
#include "mv-common.h"
/* loading initramfs images without uimage header */
#include "mv-common.h"
/* loading initramfs images without uimage header */
-#define CONFIG_SUPPORT_RAW_INITRD
/* ST M25P40 */
#undef CONFIG_ENV_SPI_MAX_HZ
/* ST M25P40 */
#undef CONFIG_ENV_SPI_MAX_HZ
@@
-70,8
+67,6
@@
* Default environment variables
*/
#define CONFIG_LOADADDR 0x00800000
* Default environment variables
*/
#define CONFIG_LOADADDR 0x00800000
-#define CONFIG_BOOTCOMMAND "run bootcmd_${bootsource}"
-#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/sda2"
#if defined(CONFIG_LSXHL)
#define CONFIG_FDTFILE "kirkwood-lsxhl.dtb"
#if defined(CONFIG_LSXHL)
#define CONFIG_FDTFILE "kirkwood-lsxhl.dtb"
@@
-143,7
+138,6
@@
#endif /* CONFIG_CMD_NET */
#ifdef CONFIG_IDE
#endif /* CONFIG_CMD_NET */
#ifdef CONFIG_IDE
-#undef CONFIG_IDE_LED
#undef CONFIG_SYS_IDE_MAXBUS
#define CONFIG_SYS_IDE_MAXBUS 1
#undef CONFIG_SYS_IDE_MAXDEVICE
#undef CONFIG_SYS_IDE_MAXBUS
#define CONFIG_SYS_IDE_MAXBUS 1
#undef CONFIG_SYS_IDE_MAXDEVICE