diff -u -r hermit-1.3/src/target/common/version.c hermit-1.3.new/src/target/common/version.c --- hermit-1.3/src/target/common/version.c Fri Mar 30 07:34:31 2001 +++ hermit-1.3.new/src/target/common/version.c Wed Jan 30 17:16:43 2002 @@ -6,7 +6,10 @@ #include #include -#define MAKE_VERSION(ver) ver##" @"__TIME__##", "##__DATE__; +/* TESTASECCA THOMAS ETIC #define MAKE_VERSION(ver) ver##" @"__TIME__##", "##__DATE__; */ +#define MAKE_VERSION(ver) ver; + + const char hermit_version[] __attribute__ ((section(".hermit.version"))) = MAKE_VERSION("1.3"); diff -u -r hermit-1.3/src/target/common/print.c hermit-1.3.new/src/target/common/print.c --- hermit-1.3/src/target/common/print.c Thu Mar 15 05:10:49 2001 +++ hermit-1.3.new/src/target/common/print.c Wed Jan 30 17:13:40 2002 @@ -106,7 +106,8 @@ count += xprint(va_arg(ap, word_t), 1); break; case 'c': - ++count, hputchar(va_arg(ap, char)); + /* TESTASECCA THOMAS ETIC ++count, hputchar(va_arg(ap, char)); */ + ++count, hputchar(va_arg(ap, int)); break; case 'd': count += dprint(va_arg(ap, int)); diff -u -r hermit-1.3/src/host/common/options.c hermit-1.3.new/src/host/common/options.c --- hermit-1.3/src/host/common/options.c Tue Feb 13 08:44:31 2001 +++ hermit-1.3.new/src/host/common/options.c Mon Feb 18 12:41:58 2002 @@ -59,7 +59,7 @@ { "output-file", 1, 0, 'o' }, { "memory-map", 1, 0, 0 }, { "netif", 1, 0, 'N' }, - { "port", 1, 0, 'P' }, + { "port", 1, 0, 'p' }, { "region", 1, 0, 'r' }, { "remote-mac", 1, 0, 0 }, { "verbose", 0, 0, 'v' }, diff -u -r hermit-1.3/src/target/cs89712/linux.c hermit-1.3.new/src/target/cs89712/linux.c --- hermit-1.3/src/target/cs89712/linux.c Wed May 29 09:28:57 2002 +++ hermit-1.3.new/src/target/cs89712/linux.c Wed May 29 09:52:36 2002 @@ -16,16 +16,13 @@ #define MINORBITS 8 #define MKDEV(ma,mi) (((ma) << MINORBITS) | (mi)) -#define RAMDISK_MAJOR 1 /* major for "RAM disk" */ -#define RAMDISK0_MINOR 0 /* b 1 0 == /dev/ram0 */ - -#define ROM_FLASH_MAJOR 31 /* major for "ROM/flash memory card" */ -#define FLASH0_MINOR 16 /* b 31 16 == /dev/flash0 */ -#define FLASH1_MINOR 17 /* b 31 17 == /dev/flash1 */ +#define MTD_MAJOR 31 +#define MTD_MINOR 4 /* i boot on /dev/mtd4 */ #define COMMAND_LINE_SIZE 1024 -static int linux_cmdfunc(int argc, char *argv[]) +// static int linux_cmdfunc(int argc, char *argv[]) +int linux_cmdfunc(int argc, char *argv[]) { struct tag *tag = (struct tag *) LINUX_PARAM_ADDRESS; @@ -37,7 +34,7 @@ tag->hdr.size = tag_size(tag_core); tag->u.core.flags = 0; tag->u.core.pagesize = 0x1000; - tag->u.core.rootdev = MKDEV(RAMDISK_MAJOR, RAMDISK0_MINOR); + tag->u.core.rootdev = MKDEV(MTD_MAJOR, MTD_MINOR); /* 16 MB of SDRAM at 0xc0000000 */ tag = tag_next(tag); @@ -46,12 +43,6 @@ tag->u.mem.size = DRAM1_SIZE >> 12; tag->u.mem.start = DRAM1_START; - /* an initial ramdisk image in flash at 0x00700000 */ - tag = tag_next(tag); - tag->hdr.tag = ATAG_INITRD; - tag->hdr.size = tag_size(tag_initrd); - tag->u.initrd.start = INITRD_LOAD_ADDRESS; - tag->u.initrd.size = INITRD_SIZE; /* the command line arguments */ if (argc > 1) { @@ -82,10 +73,10 @@ /* branch to kernel image */ __asm__ volatile ( - " mov r4, #0xC0000000\n" /* start of DRAM */ - " add r4, r4, #0x00028000\n" /* kernel offset */ + " mov r4, #0x00000000\n" /* start of flash */ + " add r4, r4, #0x00020000\n" /* kernel offset in flash*/ " mov r0, #0\n" /* kernel sanity check */ - " mov r1, #123\n" /* CDB89712 arch. number */ + " mov r1, #107\n" /* CDB89712 arch. number */ " mov r2, #0\n" " mov r3, #0\n" " mov pc, r4" /* go there! */ @@ -126,12 +117,14 @@ static int boot_cmdfunc(int argc, char *argv[]) { + if (argc < 1) return -H_EUSAGE; IO_LEDFLSH = 0x4c; - gunzip_object (" kernel", 0x100000, LINUX_LOAD_ADDRESS); - gunzip_object ("ramdisk", 0x200000, INITRD_LOAD_ADDRESS); + /*gunzip_object (" kernel", 0x100000, LINUX_LOAD_ADDRESS); */ + /*gunzip_object ("ramdisk", 0x200000, INITRD_LOAD_ADDRESS);*/ + IO_LEDFLSH = 0; linux_cmdfunc (argc, argv);