arm:cleanup remove special case memory handling.

We used to load the memory driver above the other modules to allow
the memory driver (ramdisk) to grow. We no longer want or need this
this as we have a working mmc driver.

diff --git a/kernel/arch/earm/pre_init.c b/kernel/arch/earm/pre_init.c
index 972686d71ca3e3d90c7b624677cca0eaa5c849b9..45464e4ea917d2b06f8283c2cf4b52a9f99e09e3 100644 (file)
--- a/kernel/arch/earm/pre_init.c
+++ b/kernel/arch/earm/pre_init.c
@@ -125,14 +125,6 @@ void setup_mbi(multiboot_info_t *mbi)
            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].cmdline = 0;
-
-           if (i == 5) {
-               /* LSC HACK: Special case for memory, it is actually loaded at the 
-                * end, so that it can grow without having to change the 
-                * alignment of everything. currently reserving 64MiB */
-               mb_modlist[i].mod_start = 0x96800000;
-               mb_modlist[i].mod_end = mb_modlist[i].mod_start + (0x04000000) - 1;
-            }
        }
 
        /* Final 'module' is actually a string holding the boot cmdline */

diff --git a/releasetools/uEnv.txt b/releasetools/uEnv.txt
index d4341a4a80f3d02b73273c63ddccb6f73839c1f5..82bdc08bbe9154c6b136c332495cfc5466729a0a 100644 (file)
--- a/releasetools/uEnv.txt
+++ b/releasetools/uEnv.txt
@@ -4,7 +4,7 @@
 uenvcmd=run mmcbootcmd
 
 # With cmdline/bootargs in cmdline.txt
-mmcbootcmd=echo starting from MMC ; mmc part 0; fatload mmc 0:1 0x80200000 kernel.bin; fatload mmc 0:1 0x90000000 ds.elf; fatload mmc 0:1 0x90800000 rs.elf; fatload mmc 0:1 0x91000000 pm.elf; fatload mmc 0:1 0x91800000 sched.elf; fatload mmc 0:1 0x92000000 vfs.elf; fatload mmc 0:1 0x96800000 memory.elf; fatload mmc 0:1 0x93000000 log.elf; fatload mmc 0:1 0x93800000 tty.elf; fatload mmc 0:1 0x94000000 mfs.elf; fatload mmc 0:1 0x94800000 vm.elf; fatload mmc 0:1 0x95000000 pfs.elf; fatload mmc 0:1 0x95800000 init.elf; mw.b 0x96000000 0 16384; fatload mmc 0:1 0x96000000 cmdline.txt; go 0x80200000
+mmcbootcmd=echo starting from MMC ; mmc part 0; fatload mmc 0:1 0x80200000 kernel.bin; fatload mmc 0:1 0x90000000 ds.elf; fatload mmc 0:1 0x90800000 rs.elf; fatload mmc 0:1 0x91000000 pm.elf; fatload mmc 0:1 0x91800000 sched.elf; fatload mmc 0:1 0x92000000 vfs.elf; fatload mmc 0:1 0x92800000 memory.elf; fatload mmc 0:1 0x93000000 log.elf; fatload mmc 0:1 0x93800000 tty.elf; fatload mmc 0:1 0x94000000 mfs.elf; fatload mmc 0:1 0x94800000 vm.elf; fatload mmc 0:1 0x95000000 pfs.elf; fatload mmc 0:1 0x95800000 init.elf; mw.b 0x96000000 0 16384; fatload mmc 0:1 0x96000000 cmdline.txt; go 0x80200000
 
 # Netbooting.
 #echo == Configure the server IP ==
@@ -12,10 +12,6 @@ mmcbootcmd=echo starting from MMC ; mmc part 0; fatload mmc 0:1 0x80200000 kerne
 #ipaddr=192.168.12.62
 #usbnet_devaddr=e8:03:9a:24:f9:10
 #usbethaddr=e8:03:9a:24:f9:11
-#mmcbootcmd=echo starting from TFTP; usb start ; tftp 0x80200000 kernel.bin; tftp 0x90000000 ds.elf; tftp 0x90800000 rs.elf; tftp 0x91000000 pm.elf; tftp 0x91800000 sched.elf; tftp 0x92000000 vfs.elf; tftp 0x96800000 memory.elf; tftp 0x93000000 log.elf; tftp 0x93800000 tty.elf;  tftp 0x94000000 mfs.elf; tftp 0x94800000 vm.elf; tftp 0x95000000 pfs.elf; tftp 0x95800000 init.elf; mw.b 0x96000000 0 16384; tftp 0x96000000 cmdline.txt; dcache off ; icache off ; go 0x80200000
+#mmcbootcmd=echo starting from TFTP; usb start ; tftp 0x80200000 kernel.bin; tftp 0x90000000 ds.elf; tftp 0x90800000 rs.elf; tftp 0x91000000 pm.elf; tftp 0x91800000 sched.elf; tftp 0x92000000 vfs.elf; tftp 0x92800000 memory.elf; tftp 0x93000000 log.elf; tftp 0x93800000 tty.elf;  tftp 0x94000000 mfs.elf; tftp 0x94800000 vm.elf; tftp 0x95000000 pfs.elf; tftp 0x95800000 init.elf; mw.b 0x96000000 0 16384; tftp 0x96000000 cmdline.txt; dcache off ; icache off ; go 0x80200000
 
-# For mmcinfo
-#mmcbootcmd=mmcinfo; fatload mmc 0:1 0x80200000 boot.bin; go 0x80200000
 
-# beaglebone
-#mmc rescan; fatload mmc 0 0x80200000 kernel.bin; go  0x80200000