=================================================================== RCS file: /cvs/funnyos/arch/sam7s64/config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- funnyos/arch/sam7s64/config.c 2007/11/08 22:21:46 1.1 +++ funnyos/arch/sam7s64/config.c 2007/11/09 16:10:07 1.2 @@ -1,5 +1,5 @@ /* - * $Id: config.c,v 1.1 2007/11/08 22:21:46 init Exp $ + * $Id: config.c,v 1.2 2007/11/09 16:10:07 init Exp $ */ #include #include @@ -11,18 +11,13 @@ /* device drivers */ extern struct driver root_dr; extern struct driver cpu_dr; -extern struct driver obio_dr; -extern struct driver tacons_dr; -extern struct driver fcons_dr; -extern struct driver tartc_dr; -extern struct driver tairqc_dr; extern void(*putchar)(char); -void tacons_early_putc(char ch); +void sauart_early_putc(char ch); /* amount of physical memory, in Bytes */ -uint32_t physmem = 33554432; +uint32_t physmem = 16384; /* * Where to attach each device. @@ -30,11 +25,6 @@ struct attachinfo config_attachinfo[] = { /* child, parent, pminor, loc, intrno, flags */ { "cpu" , "root", 0, 0, 0, 0 }, - { "obio", "root", 0, 0, 0, 0 }, - { "tacons", "obio", 0, 0x10000000, 0, 0 }, - { "tartc", "obio", 0, 0x15000000, 4, 0 }, - { "tairqc", "obio", 0, 0x16000000, 0, 0 }, - { "fcons", "tacons", 0, 0, 0, 0 }, { NULL, NULL, 0, 0, 0, 0 } }; @@ -45,12 +35,7 @@ struct driverinfo config_driverinfo[] = { /* name, driverp, ninstances (should be -1) */ { "root", &root_dr, -1 }, - { "obio", &obio_dr, -1 }, { "cpu" , &cpu_dr, -1 }, - { "tacons", &tacons_dr, -1 }, - { "tartc", &tartc_dr, -1 }, - { "fcons", &fcons_dr, -1 }, - { "tairqc", &tairqc_dr, -1 }, { NULL, NULL, 0 } }; @@ -66,7 +51,6 @@ * Configure putchar, so we can printf messages to the console without fcons. */ /* putchar = tauart_early_putc; */ - putchar = tacons_early_putc; }