sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: provide means to pass boot cmdline

Browse source
This commit is contained in:
Thomas Veerman 2013-01-17 11:37:53 +00:00
parent 0968a93748
commit c96cd5e1a0
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,8 @@ struct kmessages kmessages;
/* pg_utils.c uses this; in this phase, there is a 1:1 mapping. */ /* pg_utils.c uses this; in this phase, there is a 1:1 mapping. */
phys_bytes vir2phys(void *addr) { return (phys_bytes) addr; } phys_bytes vir2phys(void *addr) { return (phys_bytes) addr; }
static void setup_mbi(multiboot_info_t *mbi);
/* String length used for mb_itoa */ /* String length used for mb_itoa */
#define ITOA_BUFFER_SIZE 20 #define ITOA_BUFFER_SIZE 20
@ -98,6 +100,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 12
#define MB_MODS_BASE 0x90000000 #define MB_MODS_BASE 0x90000000
#define MB_PARAM_MOD 0x96000000
#define MB_MODS_ALIGN 0x00800000 /* 8 MB */ #define MB_MODS_ALIGN 0x00800000 /* 8 MB */
#define MB_MODS_SIZE 0x00004000 /* 16 KB */ #define MB_MODS_SIZE 0x00004000 /* 16 KB */
#define MB_MMAP_START MB_MODS_BASE #define MB_MMAP_START MB_MODS_BASE
@ -109,7 +112,8 @@ multiboot_memory_map_t mb_memmap;
void setup_mbi(multiboot_info_t *mbi) void setup_mbi(multiboot_info_t *mbi)
{ {
memset(mbi, 0, sizeof(*mbi)); memset(mbi, 0, sizeof(*mbi));
mbi->flags = MULTIBOOT_INFO_MODS | MULTIBOOT_INFO_MEM_MAP; mbi->flags = MULTIBOOT_INFO_MODS | MULTIBOOT_INFO_MEM_MAP |
MULTIBOOT_INFO_CMDLINE;
mbi->mods_count = MB_MODS_NR; mbi->mods_count = MB_MODS_NR;
mbi->mods_addr = (u32_t)&mb_modlist; mbi->mods_addr = (u32_t)&mb_modlist;
@ -119,6 +123,9 @@ void setup_mbi(multiboot_info_t *mbi)
mb_modlist[i].mod_end = mb_modlist[i].mod_start + MB_MODS_ALIGN - 1; mb_modlist[i].cmdline = 0; mb_modlist[i].mod_end = mb_modlist[i].mod_start + MB_MODS_ALIGN - 1; mb_modlist[i].cmdline = 0;
} }
/* Final 'module' is actually a string holding the boot cmdline */
mbi->cmdline = MB_PARAM_MOD;
mbi->mmap_addr = (void*)&mb_memmap; mbi->mmap_addr = (void*)&mb_memmap;
mbi->mmap_length = sizeof(mb_memmap); mbi->mmap_length = sizeof(mb_memmap);