aclindsa/aedrix-kernel
1
0
Fork 0
Code Releases Activity

Move atags support to be ARM arch-specific

Browse Source
This commit is contained in:
Aaron Lindsay
2012-12-24 12:40:30 -05:00
parent ed52a8af5c
commit 62755b8f38
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
kernel/atags.c
View File

@@ -1,62 +0,0 @@
/*
Copyright (C) 2012, Aaron Lindsay <aaron@aclindsay.com>
This file is part of Aedrix.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <atags.h>
extern arch_uint_ptr atags_ptr;
int atag_valid(struct atag *a) {
switch (a->tag) {
case ATAG_NONE:
return a->size == 2;
case ATAG_CORE:
return a->size == 2 || a->size == 5;
case ATAG_MEM:
case ATAG_INITRD2:
case ATAG_SERIAL:
return a->size == 4;
case ATAG_VIDEOTEXT:
case ATAG_RAMDISK:
return a->size == 5;
case ATAG_REVISION:
return a->size == 3;
case ATAG_VIDEOLFB:
return a->size == 8;
case ATAG_CMDLINE:
return a->size >= 3;
default:
return 0;
}
}
int _atags_mem_region(struct atag **mem_header, int initialize) {
if (initialize)
*mem_header = (struct atag *)atags_ptr;
else
*mem_header = (struct atag *)((uint32 *)*mem_header + (*mem_header)->size);
while (atag_valid(*mem_header) && (*mem_header)->tag != ATAG_NONE && (*mem_header)->tag != ATAG_MEM) {
*mem_header = (struct atag *)((uint32 *)*mem_header + (*mem_header)->size);
}
if (!atag_valid(*mem_header) || (*mem_header)->tag == ATAG_NONE)
return -1;
return 0;
}

17
kernel/init.c
View File

@@ -18,7 +18,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <atags.h>
#include <console.h>
#include <framebuffer.h>
#include <kmalloc.h>
@@ -94,11 +93,9 @@ void serial_console_init() {
//once, and only here
void serial_init();
void kmalloc_init();
int detect_memory();
int main(void) {
char *lower, *upper;
struct atag *atags;
//setup MMU
mmu_reinit();
@@ -114,19 +111,11 @@ int main(void) {
//setup memory subsystems
mm_init();
kmalloc_init();
if (atags_first_mem_region(&atags)) {
print("Error: atags must contain at least one memory region\n");
if (detect_memory()) {
print("Error: Failed to detect memory.\n");
return -1;
}
do {
lower = (char *)atags->data.mem.start;
upper = lower + atags->data.mem.size - 1;
print("atags: physical memory at %x-%x\n", lower, upper);
declare_memory_region(lower, upper);
} while (!atags_next_mem_region(&atags));
init_initcalls();
video_console_init();

3
kernel/kernel.mk
View File

@@ -3,8 +3,7 @@ SUBDIRS :=
include $(BASEDIR)/header.mk
OBJS_$(d) := $(d)/atags.o \
$(d)/console.o \
OBJS_$(d) := $(d)/console.o \
$(d)/font.o \
$(d)/framebuffer.o \
$(d)/init.o \