mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
SPEAr: Fix ARM relocation support
While the u-boot code is running from the flash, it is essential that no access is made to the bss segment. This is due to the fact that .rel.dyn and .bss areas overlap and former contains information used in relocation. In SPEAr, this was not taken into consideration. As a result, while the relocation wasn't complete, dram_init populated an uninitialized global variable resulting in corruption of .rel.dyn area, which resulted in u-boot crash. This commit fixes this problem by removing code that accesses bss segment Signed-off-by: Amit Virdi <amit.virdi@st.com> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
9264077635
commit
5cca72f8b3
1 changed files with 1 additions and 19 deletions
|
@ -40,27 +40,9 @@ static struct chip_data chip_data;
|
|||
|
||||
int dram_init(void)
|
||||
{
|
||||
struct xloader_table *xloader_tb =
|
||||
(struct xloader_table *)XLOADER_TABLE_ADDRESS;
|
||||
struct xloader_table_1_1 *table_1_1;
|
||||
struct xloader_table_1_2 *table_1_2;
|
||||
struct chip_data *chip = &chip_data;
|
||||
|
||||
/* Store complete RAM size and return */
|
||||
gd->ram_size = get_ram_size(PHYS_SDRAM_1, PHYS_SDRAM_1_MAXSIZE);
|
||||
|
||||
if (XLOADER_TABLE_VERSION_1_1 == xloader_tb->table_version) {
|
||||
table_1_1 = &xloader_tb->table.table_1_1;
|
||||
chip->dramfreq = table_1_1->ddrfreq;
|
||||
chip->dramtype = table_1_1->ddrtype;
|
||||
|
||||
} else if (XLOADER_TABLE_VERSION_1_2 == xloader_tb->table_version) {
|
||||
table_1_2 = &xloader_tb->table.table_1_2;
|
||||
chip->dramfreq = table_1_2->ddrfreq;
|
||||
chip->dramtype = table_1_2->ddrtype;
|
||||
} else {
|
||||
chip->dramfreq = -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue