mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-30 03:12:07 +00:00
a0759684e0
I messed up application of patch5a428e7510("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS"). I took it from a work-in-progress branch where I changed usage of CONFIG_SDCARD to CONFIG_SD_BOOT and refactored SYS_MPC85XX_NO_RESETVEC mess. But these changes aren't in master yet. Fix the wrong usage of these macros. Fixes:5a428e7510("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS") Signed-off-by: Marek Behún <kabel@kernel.org> Reviewed-by: Pali Rohár <pali@kernel.org>
125 lines
2.5 KiB
Text
125 lines
2.5 KiB
Text
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* (C) Copyright 2006
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de
|
|
*
|
|
* Copyright 2009 Freescale Semiconductor, Inc.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
OUTPUT_ARCH(powerpc)
|
|
|
|
SECTIONS
|
|
{
|
|
/* Optional boot sector */
|
|
#if defined(CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR)
|
|
.bootsect IMAGE_TEXT_BASE - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512 : {
|
|
KEEP(*(.bootsect))
|
|
. = CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512;
|
|
}
|
|
#endif
|
|
|
|
. = IMAGE_TEXT_BASE;
|
|
.text : {
|
|
/* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */
|
|
#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
|
|
KEEP(*(.bootpg))
|
|
#endif
|
|
*(.text*)
|
|
}
|
|
_etext = .;
|
|
|
|
.reloc : {
|
|
_GOT2_TABLE_ = .;
|
|
KEEP(*(.got2))
|
|
KEEP(*(.got))
|
|
_FIXUP_TABLE_ = .;
|
|
KEEP(*(.fixup))
|
|
}
|
|
__got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
|
|
__fixup_entries = (. - _FIXUP_TABLE_) >> 2;
|
|
|
|
. = ALIGN(8);
|
|
.data : {
|
|
*(.rodata*)
|
|
*(.data*)
|
|
*(.sdata*)
|
|
}
|
|
_edata = .;
|
|
|
|
. = ALIGN(4);
|
|
__u_boot_list : {
|
|
KEEP(*(SORT(__u_boot_list*)));
|
|
}
|
|
|
|
. = .;
|
|
__start___ex_table = .;
|
|
__ex_table : { *(__ex_table) }
|
|
__stop___ex_table = .;
|
|
|
|
. = ALIGN(4);
|
|
__init_begin = .;
|
|
__init_end = .;
|
|
_end = .;
|
|
|
|
#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
|
|
#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
|
|
mmc_u_boot_offs = .;
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef CONFIG_SPL_SKIP_RELOCATE
|
|
. = ALIGN(4);
|
|
__bss_start = .;
|
|
.bss : {
|
|
*(.sbss*)
|
|
*(.bss*)
|
|
}
|
|
. = ALIGN(4);
|
|
__bss_end = .;
|
|
#endif
|
|
|
|
/* For nor and nand is needed the SPL with section .resetvec */
|
|
#if !CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
|
|
#if defined(CONFIG_FSL_IFC) /* Restrict bootpg at 4K boundry for IFC */
|
|
#ifndef BOOT_PAGE_OFFSET
|
|
#define BOOT_PAGE_OFFSET 0x1000
|
|
#endif
|
|
.bootpg IMAGE_TEXT_BASE + BOOT_PAGE_OFFSET :
|
|
{
|
|
arch/powerpc/cpu/mpc85xx/start.o (.bootpg)
|
|
}
|
|
#ifndef RESET_VECTOR_OFFSET
|
|
#define RESET_VECTOR_OFFSET 0x1ffc /* IFC has 8K sram */
|
|
#endif
|
|
#elif defined(CONFIG_FSL_ELBC)
|
|
#define RESET_VECTOR_OFFSET 0xffc /* LBC has 4k sram */
|
|
#else
|
|
#error unknown NAND controller
|
|
#endif
|
|
.resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : {
|
|
KEEP(*(.resetvec))
|
|
} = 0xffff
|
|
#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
|
|
mmc_u_boot_offs = .;
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef CONFIG_SPL_SKIP_RELOCATE
|
|
/*
|
|
* Make sure that the bss segment isn't linked at 0x0, otherwise its
|
|
* address won't be updated during relocation fixups.
|
|
*/
|
|
. |= 0x10;
|
|
|
|
. = ALIGN(4);
|
|
__bss_start = .;
|
|
.bss : {
|
|
*(.sbss*)
|
|
*(.bss*)
|
|
}
|
|
. = ALIGN(4);
|
|
__bss_end = .;
|
|
#endif
|
|
}
|