sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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 8fea5ab8bd
commit 36ac0dbcf8
14 changed files with 43 additions and 70 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/mod07_tty minix-sys
./boot/minix/.temp/mod08_tty minix-sys ./boot/minix/.temp/mod08_mfs minix-sys
./boot/minix/.temp/mod09_mfs minix-sys ./boot/minix/.temp/mod09_vm minix-sys
./boot/minix/.temp/mod10_vm minix-sys ./boot/minix/.temp/mod10_pfs minix-sys
./boot/minix/.temp/mod11_pfs minix-sys ./boot/minix/.temp/mod11_init minix-sys
./boot/minix/.temp/mod12_init minix-sys
./etc/rc.capes minix-sys ./etc/rc.capes minix-sys
./etc/rc.capes/BB-BONE-WTHR-01 minix-sys ./etc/rc.capes/BB-BONE-WTHR-01 minix-sys
./etc/system.conf.d/lan8710a minix-sys ./etc/system.conf.d/lan8710a minix-sys
./multiboot/mod07_log minix-sys ./multiboot/mod07_tty minix-sys
./multiboot/mod08_tty minix-sys ./multiboot/mod08_mfs minix-sys
./multiboot/mod09_mfs minix-sys ./multiboot/mod09_vm minix-sys
./multiboot/mod10_vm minix-sys ./multiboot/mod10_pfs minix-sys
./multiboot/mod11_pfs minix-sys ./multiboot/mod11_init minix-sys
./multiboot/mod12_init minix-sys
./sbin/gpio minix-sys ./sbin/gpio minix-sys
./usr/bin/eepromread minix-sys ./usr/bin/eepromread minix-sys
./usr/include/arm 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/mod07_tty minix-sys
./boot/minix/.temp/mod08_tty minix-sys ./boot/minix/.temp/mod08_mfs minix-sys
./boot/minix/.temp/mod09_mfs minix-sys ./boot/minix/.temp/mod09_vm minix-sys
./boot/minix/.temp/mod10_vm minix-sys ./boot/minix/.temp/mod10_pfs minix-sys
./boot/minix/.temp/mod11_pfs minix-sys ./boot/minix/.temp/mod11_init minix-sys
./boot/minix/.temp/mod12_init minix-sys
./etc/system.conf.d/atl2 minix-sys ./etc/system.conf.d/atl2 minix-sys
./etc/system.conf.d/dec21140A minix-sys ./etc/system.conf.d/dec21140A minix-sys
./etc/system.conf.d/e1000 minix-sys ./etc/system.conf.d/e1000 minix-sys
@ -13,12 +12,11 @@
./etc/system.conf.d/rtl8139 minix-sys ./etc/system.conf.d/rtl8139 minix-sys
./etc/system.conf.d/rtl8169 minix-sys ./etc/system.conf.d/rtl8169 minix-sys
./etc/system.conf.d/virtio_net minix-sys ./etc/system.conf.d/virtio_net minix-sys
./multiboot/mod07_log minix-sys ./multiboot/mod07_tty minix-sys
./multiboot/mod08_tty minix-sys ./multiboot/mod08_mfs minix-sys
./multiboot/mod09_mfs minix-sys ./multiboot/mod09_vm minix-sys
./multiboot/mod10_vm minix-sys ./multiboot/mod10_pfs minix-sys
./multiboot/mod11_pfs minix-sys ./multiboot/mod11_init minix-sys
./multiboot/mod12_init minix-sys
./sbin/ahci minix-sys ./sbin/ahci minix-sys
./sbin/at_wini minix-sys ./sbin/at_wini minix-sys
./sbin/floppy minix-sys ./sbin/floppy minix-sys

4
drivers/Makefile
View file

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

3
etc/rc
View file

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

24
etc/system.conf
View file

@ -212,24 +212,8 @@ service memory
service log service log
{ {
uid 0; ipc SYSTEM vfs rs vm;
ipc ALL_SYS; # All system ipc targets allowed priority 2;
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
}; };
service init service init
@ -513,7 +497,7 @@ service osscore
4/1 # Multimedia / Audio device 4/1 # Multimedia / Audio device
; ;
ipc ipc
SYSTEM pm rs log tty ds vfs vm SYSTEM pm rs tty ds vfs vm
pci inet lwip amddev pci inet lwip amddev
; ;
uid 0; uid 0;
@ -537,7 +521,7 @@ service hello
DEVIO # 21 DEVIO # 21
; ;
ipc ipc
SYSTEM pm rs log tty ds vm vfs SYSTEM pm rs tty ds vm vfs
pci inet lwip amddev pci inet lwip amddev
; ;
uid 0; uid 0;

2
etc/usr/rc
View file

@ -195,6 +195,8 @@ start)
up -n ipc up -n ipc
up log -dev /dev/klog
if [ $ARCH = i386 ] if [ $ARCH = i386 ]
then then
up -n printer -dev /dev/lp -period 10HZ 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 VFS_PROC_NR ((endpoint_t) 1) /* file system */
#define RS_PROC_NR ((endpoint_t) 2) /* reincarnation server */ #define RS_PROC_NR ((endpoint_t) 2) /* reincarnation server */
#define MEM_PROC_NR ((endpoint_t) 3) /* memory driver (RAM disk, null, etc.) */ #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 TTY_PROC_NR ((endpoint_t) 5) /* terminal (TTY) driver */
#define DS_PROC_NR ((endpoint_t) 6) /* data store server */ #define DS_PROC_NR ((endpoint_t) 6) /* data store server */
#define MFS_PROC_NR ((endpoint_t) 7) /* minix root filesystem */ #define MFS_PROC_NR ((endpoint_t) 7) /* minix root filesystem */
#define VM_PROC_NR ((endpoint_t) 8) /* memory server */ #define VM_PROC_NR ((endpoint_t) 8) /* memory server */
#define PFS_PROC_NR ((endpoint_t) 9) /* pipe filesystem */ #define PFS_PROC_NR ((endpoint_t) 9) /* pipe filesystem */
#define SCHED_PROC_NR ((endpoint_t) 10) /* scheduler */ #define LAST_SPECIAL_PROC_NR 10 /* An untyped version for
#define LAST_SPECIAL_PROC_NR 11 /* An untyped version for
computation in macros.*/ computation in macros.*/
#define INIT_PROC_NR ((endpoint_t) LAST_SPECIAL_PROC_NR) /* init #define INIT_PROC_NR ((endpoint_t) LAST_SPECIAL_PROC_NR) /* init
-- goes multiuser */ -- goes multiuser */

2
kernel/arch/earm/pre_init.c
View file

@ -173,7 +173,7 @@ int overlaps(multiboot_module_t *mod, int n, int cmp_mod)
} }
/* XXX: hard-coded stuff for modules */ /* 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_MODS_BASE 0x82000000
#define MB_MODS_ALIGN 0x00800000 /* 8 MB */ #define MB_MODS_ALIGN 0x00800000 /* 8 MB */
#define MB_MMAP_START 0x80000000 #define MB_MMAP_START 0x80000000

1
kernel/table.c
View file

@ -57,7 +57,6 @@ struct boot_image image[NR_BOOT_PROCS] = {
{SCHED_PROC_NR, "sched" }, {SCHED_PROC_NR, "sched" },
{VFS_PROC_NR, "vfs" }, {VFS_PROC_NR, "vfs" },
{MEM_PROC_NR, "memory"}, {MEM_PROC_NR, "memory"},
{LOG_PROC_NR, "log" },
{TTY_PROC_NR, "tty" }, {TTY_PROC_NR, "tty" },
{MFS_PROC_NR, "mfs" }, {MFS_PROC_NR, "mfs" },
{VM_PROC_NR, "vm" }, {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/sched/sched
PROGRAMS+= ${PROGROOT}/servers/vfs/vfs PROGRAMS+= ${PROGROOT}/servers/vfs/vfs
PROGRAMS+= ${PROGROOT}/drivers/memory/memory PROGRAMS+= ${PROGROOT}/drivers/memory/memory
PROGRAMS+= ${PROGROOT}/drivers/log/log
PROGRAMS+= ${PROGROOT}/drivers/tty/tty PROGRAMS+= ${PROGROOT}/drivers/tty/tty
PROGRAMS+= ${PROGROOT}/servers/mfs/mfs PROGRAMS+= ${PROGROOT}/servers/mfs/mfs
PROGRAMS+= ${PROGROOT}/servers/vm/vm PROGRAMS+= ${PROGROOT}/servers/vm/vm

2
releasetools/arm_sdimage.sh
View file

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

11
releasetools/gen_uEnv.txt.sh
View file

@ -8,12 +8,11 @@ list="0x80200000 kernel.bin
0x83800000 sched.elf 0x83800000 sched.elf
0x84000000 vfs.elf 0x84000000 vfs.elf
0x84800000 memory.elf 0x84800000 memory.elf
0x85000000 log.elf 0x85000000 tty.elf
0x85800000 tty.elf 0x85800000 mfs.elf
0x86000000 mfs.elf 0x86000000 vm.elf
0x86800000 vm.elf 0x86800000 pfs.elf
0x87000000 pfs.elf 0x87000000 init.elf"
0x87800000 init.elf"
# #
# PREFIX for loading file over tftp to allow hosting multiple # PREFIX for loading file over tftp to allow hosting multiple

11
releasetools/release.functions
View file

@ -73,12 +73,11 @@ load=/mod03_pm
load=/mod04_sched load=/mod04_sched
load=/mod05_vfs load=/mod05_vfs
load=/mod06_memory load=/mod06_memory
load=/mod07_log load=/mod07_tty
load=/mod08_tty load=/mod08_mfs
load=/mod09_mfs load=/mod09_vm
load=/mod10_vm load=/mod10_pfs
load=/mod11_pfs load=/mod11_init
load=/mod12_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! # 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 }, {DS_PROC_NR, "ds", SRV_F },
{TTY_PROC_NR, "tty", SRV_F }, {TTY_PROC_NR, "tty", SRV_F },
{MEM_PROC_NR, "memory", SRV_F }, {MEM_PROC_NR, "memory", SRV_F },
{LOG_PROC_NR, "log", SRV_F },
{MFS_PROC_NR,"fs_imgrd", SRV_F }, {MFS_PROC_NR,"fs_imgrd", SRV_F },
{PFS_PROC_NR, "pfs", SRV_F }, {PFS_PROC_NR, "pfs", SRV_F },
{INIT_PROC_NR, "init", USR_F }, {INIT_PROC_NR, "init", USR_F },
@ -36,7 +35,6 @@ struct boot_image_sys boot_image_sys_table[] = {
{ VM_PROC_NR, VM_SF }, { VM_PROC_NR, VM_SF },
{ PM_PROC_NR, SRVR_SF }, { PM_PROC_NR, SRVR_SF },
{ VFS_PROC_NR, SRVR_SF }, { VFS_PROC_NR, SRVR_SF },
{ LOG_PROC_NR, SRV_SF },
{ MFS_PROC_NR, 0 }, { MFS_PROC_NR, 0 },
{ PFS_PROC_NR, SRV_SF }, { PFS_PROC_NR, SRV_SF },
{ DEFAULT_BOOT_NR, SRV_SF } /* default entry */ { 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 */ /*endpoint, flags, dev_nr, dev_style, dev_style2 */
{ TTY_PROC_NR, SRV_DF, TTY_MAJOR, STYLE_TTY, STYLE_CTTY }, { TTY_PROC_NR, SRV_DF, TTY_MAJOR, STYLE_TTY, STYLE_CTTY },
{ MEM_PROC_NR, SRV_DF, MEMORY_MAJOR, STYLE_DEV, STYLE_NDEV }, { 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 }, { PFS_PROC_NR, SRV_DF, UDS_MAJOR, STYLE_DEV, STYLE_NDEV },
{ DEFAULT_BOOT_NR, SRV_DF, 0, STYLE_NDEV, STYLE_NDEV } /* default { DEFAULT_BOOT_NR, SRV_DF, 0, STYLE_NDEV, STYLE_NDEV } /* default
* entry * entry