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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
common
/
devices.c
diff --git
a/common/devices.c
b/common/devices.c
index
7d0ac2e
..
ce3b7a0
100644
(file)
--- a/
common/devices.c
+++ b/
common/devices.c
@@
-40,12
+40,12
@@
static device_t devs;
device_t *stdio_devices[] = { NULL, NULL, NULL };
char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
device_t *stdio_devices[] = { NULL, NULL, NULL };
char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
-#if defined(CONFIG_SPLASH_SCREEN) && !defined(C
FG
_DEVICE_NULLDEV)
-#define C
FG_DEVICE_NULLDEV
1
+#if defined(CONFIG_SPLASH_SCREEN) && !defined(C
ONFIG_SYS
_DEVICE_NULLDEV)
+#define C
ONFIG_SYS_DEVICE_NULLDEV
1
#endif
#endif
-#ifdef C
FG
_DEVICE_NULLDEV
+#ifdef C
ONFIG_SYS
_DEVICE_NULLDEV
void nulldev_putc(const char c)
{
/* nulldev is empty! */
void nulldev_putc(const char c)
{
/* nulldev is empty! */
@@
-90,7
+90,7
@@
static void drv_system_init (void)
device_register (&dev);
device_register (&dev);
-#ifdef C
FG
_DEVICE_NULLDEV
+#ifdef C
ONFIG_SYS
_DEVICE_NULLDEV
memset (&dev, 0, sizeof (dev));
strcpy (dev.name, "nulldev");
memset (&dev, 0, sizeof (dev));
strcpy (dev.name, "nulldev");
@@
-162,7
+162,7
@@
int device_register (device_t * dev)
/* deregister the device "devname".
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
/* deregister the device "devname".
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
-#ifdef C
FG
_DEVICE_DEREGISTER
+#ifdef C
ONFIG_SYS
_DEVICE_DEREGISTER
int device_deregister(char *devname)
{
int l;
int device_deregister(char *devname)
{
int l;
@@
-197,7
+197,7
@@
int device_deregister(char *devname)
}
return 0;
}
}
return 0;
}
-#endif /* C
FG
_DEVICE_DEREGISTER */
+#endif /* C
ONFIG_SYS
_DEVICE_DEREGISTER */
int devices_init (void)
{
int devices_init (void)
{
@@
-216,7
+216,7
@@
int devices_init (void)
INIT_LIST_HEAD(&(devs.list));
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
INIT_LIST_HEAD(&(devs.list));
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
- i2c_init (C
FG_I2C_SPEED, CFG
_I2C_SLAVE);
+ i2c_init (C
ONFIG_SYS_I2C_SPEED, CONFIG_SYS
_I2C_SLAVE);
#endif
#ifdef CONFIG_LCD
drv_lcd_init ();
#endif
#ifdef CONFIG_LCD
drv_lcd_init ();