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
/
MPC8349ITX.h
diff --git
a/include/configs/MPC8349ITX.h
b/include/configs/MPC8349ITX.h
index
e2807a6
..
77174e3
100644
(file)
--- a/
include/configs/MPC8349ITX.h
+++ b/
include/configs/MPC8349ITX.h
@@
-1,7
+1,6
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Freescale Semiconductor, Inc. 2006.
/*
* Copyright (C) Freescale Semiconductor, Inc. 2006.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
*/
/*
@@
-50,14
+49,9
@@
#define CONFIG_MPC834x /* MPC834x family (8343, 8347, 8349) */
#define CONFIG_MPC8349 /* MPC8349 specific */
#define CONFIG_MPC834x /* MPC834x family (8343, 8347, 8349) */
#define CONFIG_MPC8349 /* MPC8349 specific */
-#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE 0xFEF00000
-#endif
-
#define CONFIG_SYS_IMMR 0xE0000000 /* The IMMR is relocated to here */
#define CONFIG_MISC_INIT_F
#define CONFIG_SYS_IMMR 0xE0000000 /* The IMMR is relocated to here */
#define CONFIG_MISC_INIT_F
-#define CONFIG_MISC_INIT_R
/*
* On-board devices
/*
* On-board devices
@@
-72,7
+66,6
@@
#define CONFIG_RTC_DS1337
#define CONFIG_SYS_I2C
#define CONFIG_RTC_DS1337
#define CONFIG_SYS_I2C
-#define CONFIG_TSEC_ENET /* TSEC Ethernet support */
/*
* Device configurations
/*
* Device configurations
@@
-344,7
+337,6
@@
boards, we say we have two, but don't display a message if we find only one. */
/*
* Serial Port
*/
/*
* Serial Port
*/
-#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE 1
#define CONFIG_SYS_NS16550_CLK get_bus_freq(0)
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE 1
#define CONFIG_SYS_NS16550_CLK get_bus_freq(0)
@@
-415,9
+407,6
@@
boards, we say we have two, but don't display a message if we find only one. */
/* TSEC */
#ifdef CONFIG_TSEC_ENET
/* TSEC */
#ifdef CONFIG_TSEC_ENET
-
-#define CONFIG_MII
-
#define CONFIG_TSEC1
#ifdef CONFIG_TSEC1
#define CONFIG_TSEC1
#ifdef CONFIG_TSEC1
@@
-466,9
+455,6
@@
boards, we say we have two, but don't display a message if we find only one. */
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Watchdog */
#undef CONFIG_WATCHDOG /* watchdog disabled */
/* Watchdog */
#undef CONFIG_WATCHDOG /* watchdog disabled */
@@
-476,9
+462,6
@@
boards, we say we have two, but don't display a message if we find only one. */
/*
* Miscellaneous configurable options
*/
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */