mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-04 02:20:43 +09:00
arm: omap3: Remove bootargs mem_size handling
The memory size is autodetected and is passed to the Linux kernel either via ATAGs or device-tree (dtb). So there is no need to pass it via the bootargs. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Tapani Utriainen <tapani@technexion.com> Cc: Thorsten Eisbein <thorsten.eisbein@head-acoustics.de> Cc: Tom Rini <trini@ti.com>
This commit is contained in:
parent
a9f5249047
commit
b36f457c1b
@ -133,18 +133,6 @@ int misc_init_r(void)
|
|||||||
|
|
||||||
dieid_num_r();
|
dieid_num_r();
|
||||||
|
|
||||||
/* Set memory size environment variable, depending on revision */
|
|
||||||
switch (tao3530_revision()) {
|
|
||||||
case 0x2: /* Rev C1 -- 256MB */
|
|
||||||
setenv("mem_size", "mem=256M");
|
|
||||||
break;
|
|
||||||
case 0x3: /* Rev A2/B2 -- 128MB */
|
|
||||||
setenv("mem_size", "mem=128M");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
printf("Warning: Unknown TAO3530 rev, setting mem=128M\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,21 +146,18 @@
|
|||||||
"video_mode=omapdss.def_disp=lcd vram=6M omapfb.vram=0:2M,1:2M,2:2M\0" \
|
"video_mode=omapdss.def_disp=lcd vram=6M omapfb.vram=0:2M,1:2M,2:2M\0" \
|
||||||
"lcd_mode=omapfb.mode=lcd:800x480@60 \0" \
|
"lcd_mode=omapfb.mode=lcd:800x480@60 \0" \
|
||||||
"extra_options= \0" \
|
"extra_options= \0" \
|
||||||
"mem_size=mem=128M \0" \
|
|
||||||
"mmcdev=0\0" \
|
"mmcdev=0\0" \
|
||||||
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
||||||
"mmcrootfstype=ext3 rootwait\0" \
|
"mmcrootfstype=ext3 rootwait\0" \
|
||||||
"nandroot=ubi0:rootfs ubi.mtd=4\0" \
|
"nandroot=ubi0:rootfs ubi.mtd=4\0" \
|
||||||
"nandrootfstype=ubifs\0" \
|
"nandrootfstype=ubifs\0" \
|
||||||
"mmcargs=setenv bootargs console=${console} " \
|
"mmcargs=setenv bootargs console=${console} " \
|
||||||
"${mem_size} " \
|
|
||||||
"mpurate=${mpurate} " \
|
"mpurate=${mpurate} " \
|
||||||
"${video_mode} " \
|
"${video_mode} " \
|
||||||
"root=${mmcroot} " \
|
"root=${mmcroot} " \
|
||||||
"rootfstype=${mmcrootfstype} " \
|
"rootfstype=${mmcrootfstype} " \
|
||||||
"${extra_options}\0" \
|
"${extra_options}\0" \
|
||||||
"nandargs=setenv bootargs console=${console} " \
|
"nandargs=setenv bootargs console=${console} " \
|
||||||
"${mem_size} " \
|
|
||||||
"mpurate=${mpurate} " \
|
"mpurate=${mpurate} " \
|
||||||
"${video_mode} " \
|
"${video_mode} " \
|
||||||
"${network_setting} " \
|
"${network_setting} " \
|
||||||
|
Loading…
Reference in New Issue
Block a user