tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take LOG out of the boot image

Browse Source 
Change-Id: Id2629776b53aae46629b04a42c15cbbacac9b949
This commit is contained in:
David van Moolenbroek 2013-09-21 17:35:15 +02:00 committed by Lionel Sambuc
parent 68962a8b92
commit f80eb027ed
14 changed files with 47 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
distrib/sets/lists/minix/md.evbarm
View File

@ -1,18 +1,16 @@
./boot/minix/.temp/mod07_log minix-sys
./boot/minix/.temp/mod08_tty minix-sys
./boot/minix/.temp/mod09_mfs minix-sys
./boot/minix/.temp/mod10_vm minix-sys
./boot/minix/.temp/mod11_pfs minix-sys
./boot/minix/.temp/mod12_init minix-sys
./boot/minix/.temp/mod07_tty minix-sys
./boot/minix/.temp/mod08_mfs minix-sys
./boot/minix/.temp/mod09_vm minix-sys
./boot/minix/.temp/mod10_pfs minix-sys
./boot/minix/.temp/mod11_init minix-sys
./etc/rc.capes minix-sys
./etc/rc.capes/BB-BONE-WTHR-01 minix-sys
./etc/system.conf.d/lan8710a minix-sys
./multiboot/mod07_log minix-sys
./multiboot/mod08_tty minix-sys
./multiboot/mod09_mfs minix-sys
./multiboot/mod10_vm minix-sys
./multiboot/mod11_pfs minix-sys
./multiboot/mod12_init minix-sys
./multiboot/mod07_tty minix-sys
./multiboot/mod08_mfs minix-sys
./multiboot/mod09_vm minix-sys
./multiboot/mod10_pfs minix-sys
./multiboot/mod11_init minix-sys
./sbin/gpio minix-sys
./usr/bin/eepromread minix-sys
./usr/include/arm minix-sys

22
distrib/sets/lists/minix/md.i386
View File

@ -1,10 +1,9 @@
./boot/minix/.temp/mod07_log minix-sys
./boot/minix/.temp/mod08_tty minix-sys
./boot/minix/.temp/mod09_mfs minix-sys
./boot/minix/.temp/mod10_vm minix-sys
./boot/minix/.temp/mod11_pfs minix-sys
./boot/minix/.temp/mod12_init minix-sys
./boot/minix/.temp/mod07_tty minix-sys
./boot/minix/.temp/mod08_mfs minix-sys
./boot/minix/.temp/mod09_vm minix-sys
./boot/minix/.temp/mod10_pfs minix-sys
./boot/minix/.temp/mod11_init minix-sys
./etc/system.conf.d/atl2 minix-sys
./etc/system.conf.d/dec21140A minix-sys
./etc/system.conf.d/e1000 minix-sys
@ -13,12 +12,11 @@
./etc/system.conf.d/rtl8139 minix-sys
./etc/system.conf.d/rtl8169 minix-sys
./etc/system.conf.d/virtio_net minix-sys
./multiboot/mod07_log minix-sys
./multiboot/mod08_tty minix-sys
./multiboot/mod09_mfs minix-sys
./multiboot/mod10_vm minix-sys
./multiboot/mod11_pfs minix-sys
./multiboot/mod12_init minix-sys
./multiboot/mod07_tty minix-sys
./multiboot/mod08_mfs minix-sys
./multiboot/mod09_vm minix-sys
./multiboot/mod10_pfs minix-sys
./multiboot/mod11_init minix-sys
./sbin/ahci minix-sys
./sbin/at_wini minix-sys
./sbin/floppy minix-sys

4
drivers/Makefile
View File

@ -6,11 +6,11 @@
.if ${MKIMAGEONLY} == "yes"
.if ${MACHINE_ARCH} == "i386"
SUBDIR= at_wini floppy log tty pci
SUBDIR= at_wini floppy tty pci
.endif
.if ${MACHINE_ARCH} == "earm"
SUBDIR= log tty
SUBDIR= tty
.endif
.else # ${MKIMAGEONLY} != "yes"

3
etc/rc
View File

@ -171,8 +171,7 @@ start)
edit ds
edit tty
edit memory
edit -p log
edit -c pfs
edit pfs
edit init
fi

24
etc/system.conf
View File

@ -212,24 +212,8 @@ service memory
service log
{
uid 0;
ipc ALL_SYS; # All system ipc targets allowed
system # Extra kernel calls allowed:
UMAP # 14
VIRCOPY # 15
IRQCTL # 19
INT86 # 20
DEVIO # 21
SDEVIO # 22
VDEVIO # 23
;
vm BASIC; # Only basic VM calls allowed
io NONE; # No I/O range allowed
irq NONE; # No IRQ allowed
sigmgr rs; # Signal manager is RS
scheduler sched; # Scheduler is sched
priority 2; # priority queue 2
quantum 50; # default driver quantum
ipc SYSTEM vfs rs vm;
priority 2;
};
service init
@ -513,7 +497,7 @@ service osscore
4/1 # Multimedia / Audio device
;
ipc
SYSTEM pm rs log tty ds vfs vm
SYSTEM pm rs tty ds vfs vm
pci inet lwip amddev
;
uid 0;
@ -537,7 +521,7 @@ service hello
DEVIO # 21
;
ipc
SYSTEM pm rs log tty ds vm vfs
SYSTEM pm rs tty ds vm vfs
pci inet lwip amddev
;
uid 0;

2
etc/usr/rc
View File

@ -195,6 +195,8 @@ start)
up -n ipc
up log -dev /dev/klog
if [ $ARCH = i386 ]
then
up -n printer -dev /dev/lp -period 10HZ

5
include/minix/com.h
View File

@ -74,14 +74,13 @@
#define VFS_PROC_NR ((endpoint_t) 1) /* file system */
#define RS_PROC_NR ((endpoint_t) 2) /* reincarnation server */
#define MEM_PROC_NR ((endpoint_t) 3) /* memory driver (RAM disk, null, etc.) */
#define LOG_PROC_NR ((endpoint_t) 4) /* log device driver */
#define SCHED_PROC_NR ((endpoint_t) 4) /* scheduler */
#define TTY_PROC_NR ((endpoint_t) 5) /* terminal (TTY) driver */
#define DS_PROC_NR ((endpoint_t) 6) /* data store server */
#define MFS_PROC_NR ((endpoint_t) 7) /* minix root filesystem */
#define VM_PROC_NR ((endpoint_t) 8) /* memory server */
#define PFS_PROC_NR ((endpoint_t) 9) /* pipe filesystem */
#define SCHED_PROC_NR ((endpoint_t) 10) /* scheduler */
#define LAST_SPECIAL_PROC_NR 11 /* An untyped version for
#define LAST_SPECIAL_PROC_NR 10 /* An untyped version for
computation in macros.*/
#define INIT_PROC_NR ((endpoint_t) LAST_SPECIAL_PROC_NR) /* init
-- goes multiuser */

4
kernel/arch/earm/pre_init.c
View File

@ -100,9 +100,9 @@ int overlaps(multiboot_module_t *mod, int n, int cmp_mod)
}
/* XXX: hard-coded stuff for modules */
#define MB_MODS_NR 12
#define MB_MODS_NR NR_BOOT_MODULES
#define MB_MODS_BASE 0x82000000
#define MB_PARAM_MOD 0x88000000
#define MB_PARAM_MOD 0x87800000
#define MB_MODS_ALIGN 0x00800000 /* 8 MB */
#define MB_MMAP_START 0x80000000
#define MB_MMAP_SIZE 0x10000000 /* 256 MB */

1
kernel/table.c
View File

@ -57,7 +57,6 @@ struct boot_image image[NR_BOOT_PROCS] = {
{SCHED_PROC_NR, "sched" },
{VFS_PROC_NR, "vfs" },
{MEM_PROC_NR, "memory"},
{LOG_PROC_NR, "log" },
{TTY_PROC_NR, "tty" },
{MFS_PROC_NR, "mfs" },
{VM_PROC_NR, "vm" },

1
releasetools/Makefile
View File

@ -24,7 +24,6 @@ PROGRAMS+= ${PROGROOT}/servers/pm/pm
PROGRAMS+= ${PROGROOT}/servers/sched/sched
PROGRAMS+= ${PROGROOT}/servers/vfs/vfs
PROGRAMS+= ${PROGROOT}/drivers/memory/memory
PROGRAMS+= ${PROGROOT}/drivers/log/log
PROGRAMS+= ${PROGROOT}/drivers/tty/tty
PROGRAMS+= ${PROGROOT}/servers/mfs/mfs
PROGRAMS+= ${PROGROOT}/servers/vm/vm

2
releasetools/arm_sdimage.sh
View File

@ -186,7 +186,7 @@ do
mcopy -bsp -i ${IMG_DIR}/fat.img ${OBJ}/${f}.elf ::${f}.elf
done
for f in tty memory log
for f in tty memory
do
cp ${OBJ}/drivers/${f}/${f} ${OBJ}/${f}.elf
${CROSS_PREFIX}strip -s ${OBJ}/${f}.elf

17
releasetools/gen_uEnv.txt.sh
View File

@ -8,13 +8,12 @@ list="0x80200000 kernel.bin
0x83800000 sched.elf
0x84000000 vfs.elf
0x84800000 memory.elf
0x85000000 log.elf
0x85800000 tty.elf
0x86000000 mfs.elf
0x86800000 vm.elf
0x87000000 pfs.elf
0x87800000 init.elf
0x88000000 cmdline.txt"
0x85000000 tty.elf
0x85800000 mfs.elf
0x86000000 vm.elf
0x86800000 pfs.elf
0x87000000 init.elf
0x87800000 cmdline.txt"
#
# PREFIX for loading file over tftp to allow hosting multiple
@ -63,12 +62,12 @@ echo "# Set the command to be executed"
echo "uenvcmd=run $BOOT"
echo
echo "# With cmdline/bootargs in cmdline.txt"
echo "mmcbootcmd=echo starting from MMC ; mmc part 0; mw.b 0x88000000 0 16384 $(fill_cmd "fatload mmc 0:1" "") ; dcache off ; icache off ; go 0x80200000"
echo "mmcbootcmd=echo starting from MMC ; mmc part 0; mw.b 0x87800000 0 16384 $(fill_cmd "fatload mmc 0:1" "") ; dcache off ; icache off ; go 0x80200000"
echo
echo "# Netbooting."
echo "serverip=192.168.12.10"
echo "ipaddr=192.168.12.62"
echo "usbnet_devaddr=e8:03:9a:24:f9:10"
echo "usbethaddr=e8:03:9a:24:f9:11"
echo "netbootcmd=echo starting from TFTP; mw.b 0x88000000 0 16384 $(fill_cmd "tftp" "$NETBOOT_PREFIX") ; dcache off ; icache off ; go 0x80200000"
echo "netbootcmd=echo starting from TFTP; mw.b 0x87800000 0 16384 $(fill_cmd "tftp" "$NETBOOT_PREFIX") ; dcache off ; icache off ; go 0x80200000"
exit 0

11
releasetools/release.functions
View File

@ -73,12 +73,11 @@ load=/mod03_pm
load=/mod04_sched
load=/mod05_vfs
load=/mod06_memory
load=/mod07_log
load=/mod08_tty
load=/mod09_mfs
load=/mod10_vm
load=/mod11_pfs
load=/mod12_init
load=/mod07_tty
load=/mod08_mfs
load=/mod09_vm
load=/mod10_pfs
load=/mod11_init
# This space intentionally left blank - leave to appease bootloader!
# This space intentionally left blank - leave to appease bootloader!
# This space intentionally left blank - leave to appease bootloader!

3
servers/rs/table.c
View File

@ -22,7 +22,6 @@ struct boot_image_priv boot_image_priv_table[] = {
{DS_PROC_NR, "ds", SRV_F },
{TTY_PROC_NR, "tty", SRV_F },
{MEM_PROC_NR, "memory", SRV_F },
{LOG_PROC_NR, "log", SRV_F },
{MFS_PROC_NR,"fs_imgrd", SRV_F },
{PFS_PROC_NR, "pfs", SRV_F },
{INIT_PROC_NR, "init", USR_F },
@ -36,7 +35,6 @@ struct boot_image_sys boot_image_sys_table[] = {
{ VM_PROC_NR, VM_SF },
{ PM_PROC_NR, SRVR_SF },
{ VFS_PROC_NR, SRVR_SF },
{ LOG_PROC_NR, SRV_SF },
{ MFS_PROC_NR, 0 },
{ PFS_PROC_NR, SRV_SF },
{ DEFAULT_BOOT_NR, SRV_SF } /* default entry */
@ -47,7 +45,6 @@ struct boot_image_dev boot_image_dev_table[] = {
/*endpoint, flags, dev_nr, dev_style, dev_style2 */
{ TTY_PROC_NR, SRV_DF, TTY_MAJOR, STYLE_TTY, STYLE_CTTY },
{ MEM_PROC_NR, SRV_DF, MEMORY_MAJOR, STYLE_DEV, STYLE_NDEV },
{ LOG_PROC_NR, SRV_DF, LOG_MAJOR, STYLE_DEV, STYLE_NDEV },
{ PFS_PROC_NR, SRV_DF, UDS_MAJOR, STYLE_DEV, STYLE_NDEV },
{ DEFAULT_BOOT_NR, SRV_DF, 0, STYLE_NDEV, STYLE_NDEV } /* default
* entry