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

arm:keep kernel and modules in the first 256MB of memory.

Browse source 
Keep kernel and modules in the first 256MB of memory in preparation
for the beaglebone. That target only has 256 MB of memory.

Change-Id: I3d92247b5d4e5d3aab7388fe01c2f5713d6a4593
This commit is contained in:
Kees Jongenburger 2013-05-23 10:45:38 +02:00
parent 571ea5b4d7
commit 69dc6a4f15
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,12 +102,12 @@ 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 0x82000000
#define MB_PARAM_MOD 0x96000000 #define MB_PARAM_MOD 0x88000000
#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 0x00400000 /* 4 MB */
#define MB_MMAP_START 0x80000000 #define MB_MMAP_START 0x80000000
#define MB_MMAP_SIZE 0x20000000 /* 512 MB */ #define MB_MMAP_SIZE 0x10000000 /* 256 MB */
multiboot_module_t mb_modlist[MB_MODS_NR]; multiboot_module_t mb_modlist[MB_MODS_NR];
multiboot_memory_map_t mb_memmap; multiboot_memory_map_t mb_memmap;
@ -123,7 +123,7 @@ void setup_mbi(multiboot_info_t *mbi)
int i; int i;
for (i = 0; i < MB_MODS_NR; ++i) { for (i = 0; i < MB_MODS_NR; ++i) {
mb_modlist[i].mod_start = MB_MODS_BASE + i * MB_MODS_ALIGN; mb_modlist[i].mod_start = MB_MODS_BASE + i * MB_MODS_ALIGN;
mb_modlist[i].mod_end = mb_modlist[i].mod_start + MB_MODS_ALIGN - 1; mb_modlist[i].mod_end = mb_modlist[i].mod_start + MB_MODS_SIZE ;
mb_modlist[i].cmdline = 0; mb_modlist[i].cmdline = 0;
} }

30
releasetools/gen_uEnv.txt.sh
View file

@ -2,19 +2,19 @@
#generate a u-boot u-env. #generate a u-boot u-env.
list="0x80200000 kernel.bin list="0x80200000 kernel.bin
0x90000000 ds.elf 0x82000000 ds.elf
0x90800000 rs.elf 0x82800000 rs.elf
0x91000000 pm.elf 0x83000000 pm.elf
0x91800000 sched.elf 0x83800000 sched.elf
0x92000000 vfs.elf 0x84000000 vfs.elf
0x92800000 memory.elf 0x84800000 memory.elf
0x93000000 log.elf 0x85000000 log.elf
0x93800000 tty.elf 0x85800000 tty.elf
0x94000000 mfs.elf 0x86000000 mfs.elf
0x94800000 vm.elf 0x86800000 vm.elf
0x95000000 pfs.elf 0x87000000 pfs.elf
0x95800000 init.elf 0x87800000 init.elf
0x96000000 cmdline.txt" 0x88000000 cmdline.txt"
# #
# PREFIX for loading file over tftp to allow hosting multiple # PREFIX for loading file over tftp to allow hosting multiple
@ -63,12 +63,12 @@ echo "# Set the command to be executed"
echo "uenvcmd=run $BOOT" echo "uenvcmd=run $BOOT"
echo echo
echo "# With cmdline/bootargs in cmdline.txt" echo "# With cmdline/bootargs in cmdline.txt"
echo "mmcbootcmd=echo starting from MMC ; mmc part 0; mw.b 0x96000000 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 0x88000000 0 16384 $(fill_cmd "fatload mmc 0:1" "") ; dcache off ; icache off ; go 0x80200000"
echo echo
echo "# Netbooting." echo "# Netbooting."
echo "serverip=192.168.12.10" echo "serverip=192.168.12.10"
echo "ipaddr=192.168.12.62" echo "ipaddr=192.168.12.62"
echo "usbnet_devaddr=e8:03:9a:24:f9:10" echo "usbnet_devaddr=e8:03:9a:24:f9:10"
echo "usbethaddr=e8:03:9a:24:f9:11" echo "usbethaddr=e8:03:9a:24:f9:11"
echo "netbootcmd=echo starting from TFTP; usb start; mw.b 0x96000000 0 16384 $(fill_cmd "tftp" "$NETBOOT_PREFIX") ; dcache off ; icache off ; go 0x80200000" echo "netbootcmd=echo starting from TFTP; usb start; mw.b 0x88000000 0 16384 $(fill_cmd "tftp" "$NETBOOT_PREFIX") ; dcache off ; icache off ; go 0x80200000"
exit 0 exit 0