diff options
| author | Stefan Reinauer <stepan@openbios.org> | 2009-06-30 15:17:49 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-06-30 15:17:49 +0000 |
| commit | 4b27b4244d5be6eefd33595bfa8b26eee3c6d220 (patch) | |
| tree | 81ca5db12b8567b48daaa23a541bfb8a5dc011f8 /src/drivers | |
| parent | 1093febbee9bddfd4a663b66fee7a141c929d71a (diff) | |
This patch unifies the use of config options in v2 to all start with CONFIG_
It's basically done with the following script and some manual fixup:
VARS=`grep ^define src/config/Options.lb | cut -f2 -d\ | grep -v ^CONFIG | grep -v ^COREBOOT |grep -v ^CC`
for VAR in $VARS; do
find . -name .svn -prune -o -type f -exec perl -pi -e "s/(^|[^0-9a-zA-Z_]+)$VAR($|[^0-9a-zA-Z_]+)/\1CONFIG_$VAR\2/g" {} \;
done
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4381 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/generic/debug/debug_dev.c | 2 | ||||
| -rw-r--r-- | src/drivers/i2c/adm1026/adm1026.c | 4 | ||||
| -rw-r--r-- | src/drivers/pci/onboard/onboard.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/generic/debug/debug_dev.c b/src/drivers/generic/debug/debug_dev.c index 94ff870fe..77c30edbf 100644 --- a/src/drivers/generic/debug/debug_dev.c +++ b/src/drivers/generic/debug/debug_dev.c @@ -238,7 +238,7 @@ static void debug_init(device_t dev) switch(dev->path.pnp.device) { case 0: parent = dev->bus->dev; - printk_debug("DEBUG: %s", dev_path(parent)); + printk_debug("CONFIG_DEBUG: %s", dev_path(parent)); if(parent->chip_ops && parent->chip_ops->name) { printk_debug(": %s\n", parent->chip_ops->name); } else { diff --git a/src/drivers/i2c/adm1026/adm1026.c b/src/drivers/i2c/adm1026/adm1026.c index 986910082..5f9e4bd9c 100644 --- a/src/drivers/i2c/adm1026/adm1026.c +++ b/src/drivers/i2c/adm1026/adm1026.c @@ -17,7 +17,7 @@ #define CFG1_THERM_HOT 0x10 #define CFT1_DAC_AFC 0x20 #define CFG1_PWM_AFC 0x40 -#define CFG1_RESET 0x80 +#define CFG1CONFIG_RESET 0x80 #define ADM1026_REG_CONFIG2 0x01 #define ADM1026_REG_CONFIG3 0x07 @@ -40,7 +40,7 @@ static void adm1026_enable_monitoring(device_t dev) int result; result = smbus_read_byte(dev, ADM1026_REG_CONFIG1); - result = (result | CFG1_MONITOR) & ~(CFG1_INT_CLEAR | CFG1_RESET); + result = (result | CFG1_MONITOR) & ~(CFG1_INT_CLEAR | CFG1CONFIG_RESET); result = smbus_write_byte(dev, ADM1026_REG_CONFIG1, result); result = smbus_read_byte(dev, ADM1026_REG_CONFIG1); diff --git a/src/drivers/pci/onboard/onboard.c b/src/drivers/pci/onboard/onboard.c index 17e0a1335..58e6816f2 100644 --- a/src/drivers/pci/onboard/onboard.c +++ b/src/drivers/pci/onboard/onboard.c @@ -23,7 +23,7 @@ * 2. Reduce the size of your normal (or fallback) image, by adding the * following lines to your target Config.lb, after romimage "normal" * # 48K for SCSI FW or ATI ROM - * option ROM_SIZE = 512*1024-48*1024 + * option CONFIG_ROM_SIZE = 512*1024-48*1024 * 3. Create your vgabios.bin, for example using awardeco and put it in the * directory of your target Config.lb. You can also read an option rom from * a running system, but this is unreliable, as some option roms are changed |