commit b453960d4fdb87b3970d96119b90df2ed024fc4a
author Jon Loeliger <jdl@jdl.com> Mon Jun 11 19:02:05 2007 -0500
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 00:23:10 2007 +0200
tree bb4a98072997b0c45516e8543b603835334c506d
parent 65c450b47a62659d522cfa8f4fa1e4e5c60dccd0

common/ non-cmd: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.

All transformations are of the form:
Before:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

Signed-off-by: Jon Loeliger <jdl@freescale.com>

common/lcd.c

diff --git a/common/lcd.c b/common/lcd.c
index eaed2ab..3b6391b 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -571,7 +571,7 @@
 #endif /* CONFIG_LCD_LOGO */
 
 /*----------------------------------------------------------------------*/
-#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
+#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 /*
  * Display the BMP file located at address bmp_image.
  * Only uncompressed.