do not longer support the sccMerge flag "-1slot"

This commit is contained in:
Stefan Lankes 2011-08-15 04:49:38 -07:00
parent 329acebfcd
commit aacfcd31ed
2 changed files with 10 additions and 1 deletions

View file

@ -161,6 +161,15 @@ int mmu_init(void)
atomic_int32_inc(&total_available_pages);
}
// Note: The last slot belongs always to the private memory.
for(addr=0xFF000000; addr<0xFFFFFFFF; addr+=PAGE_SIZE) {
page_clear_mark(addr >> PAGE_SHIFT);
if (addr > addr + PAGE_SIZE)
break;
atomic_int32_inc(&total_pages);
atomic_int32_inc(&total_available_pages);
}
/*
* Mark the bootinfo as used.
*/

View file

@ -50,7 +50,7 @@ SCC: scc_bootinfo.bin scc_setup.bin reset_vector.bin initrd.img bin2obj
chmod a-x *.bin
. ./prepare.sh
./bin2obj -m load.map -o metalsvm.obj
sccMerge -noimage -1slot -m 8 -n 12 -force ./metalsvm.mt
sccMerge -noimage -m 8 -n 12 -force ./metalsvm.mt
clean:
$(RM) -rf *.o *~ bin2obj make_initrd initrd.img *.bin *.obj *.hex *.elf obj