Merge branch 'reloc'

This commit is contained in:
Wolfgang Denk 2009-10-09 00:03:18 +02:00
commit cd77dd109c
300 changed files with 154 additions and 1413 deletions

View File

@ -80,7 +80,6 @@ SECTIONS
common/env_embedded.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -73,7 +73,6 @@ SECTIONS
common/env_embedded.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -65,7 +65,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -67,7 +67,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -67,7 +67,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -67,7 +67,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
common/env_embedded.o (.ppcenv)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -54,7 +54,6 @@ SECTIONS
{
cpu/mpc8xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
. = ALIGN(16);
*(.eh_frame)

View File

@ -62,7 +62,6 @@ SECTIONS
. = ALIGN(0x10000);
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -62,7 +62,6 @@ SECTIONS
. = ALIGN(0x10000);
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -70,7 +70,6 @@ SECTIONS
board/amcc/bamboo/bamboo.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -62,7 +62,6 @@ SECTIONS
. = ALIGN(0x80000);
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/amcc/canyonlands/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/amcc/ebony/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -66,7 +66,6 @@ SECTIONS
board/amcc/katmai/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -62,7 +62,6 @@ SECTIONS
. = ALIGN(0x10000);
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/amcc/luan/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/amcc/ocotea/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -73,7 +73,6 @@ SECTIONS
/* common/env_embedded.o(.text)*/
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -62,7 +62,6 @@ SECTIONS
. = ALIGN(0x10000);
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -53,7 +53,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -68,7 +68,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/amcc/taishan/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/amcc/yosemite/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/amcc/yucca/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -72,7 +72,6 @@ SECTIONS
/* common/env_embedded.o(.text)*/
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -66,7 +66,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -52,7 +52,6 @@ SECTIONS
{
cpu/mpc5xxx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
. = ALIGN(16);
*(.eh_frame)

View File

@ -54,7 +54,6 @@ SECTIONS
{
*(.text)
common/env_embedded.o(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -78,7 +78,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -79,7 +79,6 @@ SECTIONS
/* common/env_embedded.o(.text)*/
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -79,7 +79,6 @@ SECTIONS
/* common/env_embedded.o(.text)*/
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -73,7 +73,6 @@ SECTIONS
lib_generic/zlib.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -320,36 +320,6 @@ static int do_mtc_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ARRAY_SIZE(cmd_mtc_sub), cmdtp, flag, argc, argv);
}
/* Relocate the command table function pointers when running in RAM */
int mtc_cmd_init_r(void)
{
cmd_tbl_t *cmdtp;
for (cmdtp = &cmd_mtc_sub[0]; cmdtp !=
&cmd_mtc_sub[ARRAY_SIZE(cmd_mtc_sub)]; cmdtp++) {
ulong addr;
addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
cmdtp->cmd =
(int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
addr = (ulong)(cmdtp->name) + gd->reloc_off;
cmdtp->name = (char *)addr;
if (cmdtp->usage) {
addr = (ulong)(cmdtp->usage) + gd->reloc_off;
cmdtp->usage = (char *)addr;
}
#ifdef CONFIG_SYS_LONGHELP
if (cmdtp->help) {
addr = (ulong)(cmdtp->help) + gd->reloc_off;
cmdtp->help = (char *)addr;
}
#endif
}
return 0;
}
int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
cmd_tbl_t *c;

View File

@ -240,7 +240,6 @@ void board_get_enetaddr (uchar * enet)
int misc_init_r(void)
{
extern int mtc_cmd_init_r (void);
uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
@ -248,7 +247,6 @@ int misc_init_r(void)
eth_setenv_enetaddr("ethaddr", enetaddr);
}
mtc_cmd_init_r();
return 0;
}

View File

@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -56,7 +56,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -55,7 +55,6 @@ SECTIONS
cpu/mpc8xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -65,7 +65,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -54,7 +54,6 @@ SECTIONS
{
cpu/mpc8xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
. = ALIGN(16);
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))

View File

@ -78,7 +78,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -65,7 +65,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -75,7 +75,6 @@ SECTIONS
/* common/env_embedded.o(.text)*/
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -442,9 +442,9 @@ int pmc440_init_fpga(void)
{
char *s;
debug("%s:%d: Initialize FPGA interface (relocation offset = 0x%.8lx)\n",
__FUNCTION__, __LINE__, gd->reloc_off);
fpga_init(gd->reloc_off);
debug("%s:%d: Initialize FPGA interface\n",
__FUNCTION__, __LINE__);
fpga_init();
fpga_serialslave_init ();
debug("%s:%d: Adding fpga 0\n", __FUNCTION__, __LINE__);

View File

@ -62,7 +62,6 @@ SECTIONS
. = ALIGN(0x10000);
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -65,7 +65,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -66,7 +66,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -68,7 +68,6 @@ SECTIONS
. = env_offset;
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -71,7 +71,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -77,7 +77,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -56,7 +56,6 @@ SECTIONS
common/env_embedded.o (.ppcenv)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -65,7 +65,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -55,7 +55,6 @@ SECTIONS
cpu/mpc8xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -64,7 +64,6 @@ SECTIONS
common/env_embedded.o(.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -276,7 +276,6 @@ pci_init_board(void)
{
volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI1_ADDR;
struct pci_controller *hose = &pci1_hose;
struct pci_config_table *table;
struct pci_region *r = hose->regions;
uint pci_32 = gur->pordevsr & MPC85xx_PORDEVSR_PCI1_PCI32; /* PORDEVSR[15] */
@ -312,12 +311,6 @@ pci_init_board(void)
PCI_REGION_IO);
hose->region_count = r - hose->regions;
/* relocate config table pointers */
hose->config_table = \
(struct pci_config_table *)((uint)hose->config_table + gd->reloc_off);
for (table = hose->config_table; table && table->vendor; table++)
table->config_device += gd->reloc_off;
hose->first_busno=first_free_busno;
fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);

View File

@ -61,7 +61,6 @@ SECTIONS
lib_ppc/extable.o (.text)
lib_generic/zlib.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -62,7 +62,6 @@ SECTIONS
lib_generic/zlib.o (.text)
drivers/bios_emulator/atibios.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -60,7 +60,6 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

View File

@ -69,7 +69,6 @@ SECTIONS
board/gdsys/gdppc440etx/init.o (.text)
*(.text)
*(.fixup)
*(.got1)
}
_etext = .;

Some files were not shown because too many files have changed in this diff Show More