projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NET: mvgbe: avoid unused variable warning when used without phylib support
[oweals/u-boot.git]
/
common
/
stdio.c
diff --git
a/common/stdio.c
b/common/stdio.c
index 605ff3fde3ea30e1f631043ea5003557360689c0..844f98c1844bf046b597e981cf7f860c521ee767 100644
(file)
--- a/
common/stdio.c
+++ b/
common/stdio.c
@@
-1,24
+1,12
@@
/*
/*
- * (C) Copyright 2000
- * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * See file CREDITS for list of people who contributed to this
- * project.
+ * Copyright (C) 2009 Sergey Kubushyn <ksi@koi8.net>
*
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * Changes for multibus/multiadapter I2C support.
*
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * (C) Copyright 2000
+ * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
*
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <config.h>
*/
#include <config.h>
@@
-30,7
+18,8
@@
#ifdef CONFIG_LOGBUFFER
#include <logbuff.h>
#endif
#ifdef CONFIG_LOGBUFFER
#include <logbuff.h>
#endif
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
+
+#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
#include <i2c.h>
#endif
#include <i2c.h>
#endif
@@
-135,7
+124,6
@@
struct stdio_dev* stdio_clone(struct stdio_dev *dev)
return NULL;
memcpy(_dev, dev, sizeof(struct stdio_dev));
return NULL;
memcpy(_dev, dev, sizeof(struct stdio_dev));
- strncpy(_dev->name, dev->name, 16);
return _dev;
}
return _dev;
}
@@
-208,12
+196,13
@@
int stdio_init (void)
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));
-#ifdef CONFIG_
ARM_DCC_MULTI
-
drv_arm_dcc_init
();
-#e
ndif
-#if defined(CONFIG_HARD_I2C)
|| defined(CONFIG_SOFT_I2C)
+#ifdef CONFIG_
SYS_I2C
+
i2c_init_all
();
+#e
lse
+#if defined(CONFIG_HARD_I2C)
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
+#endif
#ifdef CONFIG_LCD
drv_lcd_init ();
#endif
#ifdef CONFIG_LCD
drv_lcd_init ();
#endif
@@
-237,6
+226,8
@@
int stdio_init (void)
#ifdef CONFIG_JTAG_CONSOLE
drv_jtag_console_init ();
#endif
#ifdef CONFIG_JTAG_CONSOLE
drv_jtag_console_init ();
#endif
-
+#ifdef CONFIG_CBMEM_CONSOLE
+ cbmemc_init();
+#endif
return (0);
}
return (0);
}