From: wdenk <wdenk>
Date: Fri, 9 Feb 2001 16:46:08 +0000 (+0000)
Subject: Fix comment in status_led.h
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3f902e91aa3e94e1f1649caafad26920f66a0cc8;p=users%2Frw%2Fppcboot.git

Fix comment in status_led.h
Fix options for native compiler in tools/Makefile
---

diff --git a/common/cmd_reginfo.c b/common/cmd_reginfo.c
index 9286201..74a8dc3 100644
--- a/common/cmd_reginfo.c
+++ b/common/cmd_reginfo.c
@@ -26,7 +26,7 @@
 #include <cmd_boot.h>
 #include <mpc8xx.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_REGINFO)
+#if defined(CONFIG_8xx) && (CONFIG_COMMANDS & CFG_CMD_REGINFO)
 
 void do_reginfo(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 {
@@ -85,4 +85,4 @@ void do_reginfo(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 
 }
 
-#endif	/* CFG_CMD_REGINFO */
+#endif	/* CONFIG_8xx && CFG_CMD_REGINFO */
diff --git a/include/cmd_reginfo.h b/include/cmd_reginfo.h
index 9231866..248c59b 100644
--- a/include/cmd_reginfo.h
+++ b/include/cmd_reginfo.h
@@ -24,7 +24,7 @@
 #ifndef	_CMD_REGINFO_H_
 #define	_CMD_REGINFO_H_
 
-#if (CONFIG_COMMANDS & CFG_CMD_REGINFO)
+#if defined(CONFIG_8xx) && (CONFIG_COMMANDS & CFG_CMD_REGINFO)
 
 #define	CMD_TBL_REGINFO	MK_CMD_TBL_ENTRY(					\
 	"reginfo",	3,	2,	1,	do_reginfo,			\
@@ -35,6 +35,6 @@ void do_reginfo (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]);
 
 #else
 #define CMD_TBL_REGINFO
-#endif	/* CFG_CMD_REGINFO */
+#endif	/* CONFIG_8xx && CFG_CMD_REGINFO */
 
 #endif	/* _CMD_REGINFO_H_ */
diff --git a/include/status_led.h b/include/status_led.h
index 1df32ff..b84fa93 100644
--- a/include/status_led.h
+++ b/include/status_led.h
@@ -94,8 +94,8 @@ void status_led_set  (int led, int state);
 # define STATUS_LED_BIT1	0x00000020	/* LED 1 is on PB.26	*/
 # define STATUS_LED_PERIOD1	(1 * CFG_HZ)
 # define STATUS_LED_STATE1	STATUS_LED_OFF
-# define STATUS_LED_BIT2	0x00000008	/* LED 2 is on PB.28	*/
 /* IDE LED usable for other purposes, too */
+# define STATUS_LED_BIT2	0x00000008	/* LED 2 is on PB.28	*/
 # define STATUS_LED_PERIOD2	(1 * CFG_HZ)
 # define STATUS_LED_STATE2	STATUS_LED_OFF
 
diff --git a/tools/Makefile b/tools/Makefile
index 663a454..d4018c1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -32,9 +32,9 @@ TOOLSUBDIRS = gdb
 #
 # Use native tools and options
 #
-CPPFLAGS   = -Wall -pedantic -I../include -I..
+CPPFLAGS   = -Wall -pedantic -I../include -I.. -DTEXT_BASE=$(TEXT_BASE)
 CFLAGS     = $(CPPFLAGS) -O
-AFLAGS	   = -D__ASSEMBLY__  $(CPPFLAGS)
+AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
 CC	   = $(HOSTCC)
 MAKEDEPEND = makedepend