From: wdenk <wdenk>
Date: Fri, 4 Jan 2002 00:59:39 +0000 (+0000)
Subject: Add LWMON default environment
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cb69186a7cc10033fd21d8b92f4c9663abc54f7c;p=users%2Frw%2Fppcboot.git

Add LWMON default environment
Make PPCBoot build under cygwin (NT).
---

diff --git a/include/config_lwmon.h b/include/config_lwmon.h
index 40379b6..936930b 100644
--- a/include/config_lwmon.h
+++ b/include/config_lwmon.h
@@ -59,16 +59,44 @@
 #define	CONFIG_PREBOOT		"setenv bootdelay 15"
 
 #undef	CONFIG_BOOTARGS
+
+/*
+ * HACK: insert some more variable definitions ;-)
+ */
 #define CONFIG_BOOTCOMMAND							\
-	"bootp;"								\
-	"setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "	\
-	"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"	\
-	"bootm"
+	"run flash_self"							\
+	"\0"									\
+	"kernel_addr=40040000\0"						\
+	"ramdisk_addr=40100000\0"						\
+	"magic_keys=#789\0"							\
+	"key_magic7=24\0key_cmd7=echo ## Taste '7' aktiv ##;echo\0"		\
+	"key_magic8=25\0key_cmd8=echo=## Taste '8' aktiv ##;echo\0"		\
+	"key_magic9=26\0key_cmd9=setenv addfb setenv bootargs \\$(bootargs) "	\
+			"console=tty0 console=ttyS1,$(baudrate)\0"		\
+	"key_magic#=28\0key_cmd#=setenv addfb setenv bootargs \\$(bootargs) "	\
+			"console=tty0\0"					\
+	"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\0" \
+	"ramargs=setenv bootargs root=/dev/ram rw\0"				\
+	"addfb=setenv bootargs $(bootargs) console=ttyS1,$(baudrate)\0"		\
+	"addip=setenv bootargs $(bootargs) "					\
+		"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off " \
+		"panic=1\0"							\
+	"add_wdt=setenv bootargs $(bootargs) $(wdt_args)\0"			\
+	"flash_nfs=run nfsargs;run addip;run add_wdt;run addfb;"		\
+		"bootm $(kernel_addr)\0"					\
+	"flash_self=run ramargs;run addip;run add_wdt;run addfb;"		\
+		"bootm $(kernel_addr) $(ramdisk_addr)\0"			\
+	"net_nfs=tftp 100000 /tftpboot/pImage.lwmon;run nfsargs;run addip;"	\
+		"run add_wdt;run addfb;bootm\0"					\
+	"rootpath=/opt/hardhat/devkit/ppc/8xx/target\0"				\
+	"load=tftp 100000 /tftpboot/ppcboot.bin\0"				\
+	"update=protect off 1:0;era 1:0;cp.b 100000 40000000 $(filesize)\0"	\
+	"wdt_args=wdt_8xx=off"
 
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
 #undef	CFG_LOADS_BAUD_CHANGE		/* don't allow baudrate change	*/
 
-#if 1
+#if 0
 #define	CONFIG_WATCHDOG		1	/* watchdog enabled		*/
 #endif
 
diff --git a/tools/Makefile b/tools/Makefile
index 37335be..17d43b5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -43,7 +43,7 @@ HOSTARCH := $(shell uname -m | \
 	    -e s/Power\ Macintosh/ppc/ \
 	    -e s/macppc/ppc/)
 
-HOSTOS := $(shell uname -s | tr A-Z a-z)
+HOSTOS := $(shell uname -s | sed -e 's/\([Cc][Yy][Gg][Ww][Ii][Nn]\).*/cygwin/')
 
 TOOLSUBDIRS =
 
@@ -89,7 +89,7 @@ endif
 #
 # Cygwin needs .exe files :-(
 #
-ifeq ($(HOSTOS),cygwin)		## ?????
+ifeq ($(HOSTOS),cygwin)
 SFX = .exe
 else
 SFX =
diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile
index 333d721..33e4097 100644
--- a/tools/gdb/Makefile
+++ b/tools/gdb/Makefile
@@ -35,10 +35,15 @@ CFLAGS     = $(HOST_CFLAGS) -O $(CPPFLAGS)
 CC	   = $(HOSTCC)
 MAKEDEPEND = makedepend
 
-ifeq ($(OSTYPE),cygwin)
+HOSTOS := $(shell uname -s | sed -e 's/\([Cc][Yy][Gg][Ww][Ii][Nn]\).*/cygwin/')
+
+ifeq ($(HOSTOS),cygwin)
+
 all:
 .depend:
-else
+
+else	# ! CYGWIN
+
 all:	$(BINS)
 
 gdbsend:	gdbsend.o error.o remote.o serial.o
@@ -66,4 +71,3 @@ distclean:	clean
 #########################################################################
 
 endif	# cygwin
-