mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-22 02:49:44 +09:00
efb2172ece
There is a rather subtle build problem where the build time stamp is not updated for out-of-tree builds if there exists an in-tree build which has a valid timestamp file. So if you do an in-tree build, then an out-of-tree build your timestamp will not change. The correct timestamp_autogenerated.h lives in the object tree, but it is not always found there. The source still lives in the source tree and when compiling version.h, it includes timestamp_autogenerated.h. Since the current directory is always searched first, this will come from the source tree rather than the object tree if it exists there. This affects dependency generation also, which means that common/cmd_version.o will not even be rebuilt if you have ever done an in-tree build. A similar problem exists with the version file. This change moves both files into the 'generated' subdir, which is already used for asm-offsets.h. Then timestamp.h and version.h are updated to include the files from there. There are other places where these generated files are included, but I cannot see why these don't just use the timestamp.h and version.h headers. So this change also tidies that up. I have tested this with in- and out-of-tree builds, but not SPL. I have looked at various other options for fixing this, including sed on the dep files, -I- and -include flags to gcc, but I don't think they can be made to work. Comments welcome. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
150 lines
3.5 KiB
C
150 lines
3.5 KiB
C
/*
|
|
* (C) Copyright 2010
|
|
* Texas Instruments, <www.ti.com>
|
|
*
|
|
* Aneesh V <aneesh@ti.com>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
#include <common.h>
|
|
#include <asm/u-boot.h>
|
|
#include <asm/utils.h>
|
|
#include <asm/arch/sys_proto.h>
|
|
#include <mmc.h>
|
|
#include <fat.h>
|
|
#include <version.h>
|
|
#include <asm/omap_common.h>
|
|
#include <asm/arch/mmc_host_def.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
#ifdef CONFIG_GENERIC_MMC
|
|
int board_mmc_init(bd_t *bis)
|
|
{
|
|
switch (omap_boot_device()) {
|
|
case BOOT_DEVICE_MMC1:
|
|
omap_mmc_init(0);
|
|
break;
|
|
case BOOT_DEVICE_MMC2:
|
|
omap_mmc_init(1);
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static void mmc_load_image_raw(struct mmc *mmc)
|
|
{
|
|
u32 image_size_sectors, err;
|
|
const struct image_header *header;
|
|
|
|
header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
|
|
sizeof(struct image_header));
|
|
|
|
/* read image header to find the image size & load address */
|
|
err = mmc->block_dev.block_read(0,
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1,
|
|
(void *)header);
|
|
|
|
if (err <= 0)
|
|
goto end;
|
|
|
|
spl_parse_image_header(header);
|
|
|
|
/* convert size to sectors - round up */
|
|
image_size_sectors = (spl_image.size + MMCSD_SECTOR_SIZE - 1) /
|
|
MMCSD_SECTOR_SIZE;
|
|
|
|
/* Read the header too to avoid extra memcpy */
|
|
err = mmc->block_dev.block_read(0,
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
|
|
image_size_sectors, (void *)spl_image.load_addr);
|
|
|
|
end:
|
|
if (err <= 0) {
|
|
printf("spl: mmc blk read err - %d\n", err);
|
|
hang();
|
|
}
|
|
}
|
|
|
|
static void mmc_load_image_fat(struct mmc *mmc)
|
|
{
|
|
s32 err;
|
|
struct image_header *header;
|
|
|
|
header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
|
|
sizeof(struct image_header));
|
|
|
|
err = fat_register_device(&mmc->block_dev,
|
|
CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
|
|
if (err) {
|
|
printf("spl: fat register err - %d\n", err);
|
|
hang();
|
|
}
|
|
|
|
err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
|
|
(u8 *)header, sizeof(struct image_header));
|
|
if (err <= 0)
|
|
goto end;
|
|
|
|
spl_parse_image_header(header);
|
|
|
|
err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
|
|
(u8 *)spl_image.load_addr, 0);
|
|
|
|
end:
|
|
if (err <= 0) {
|
|
printf("spl: error reading image %s, err - %d\n",
|
|
CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err);
|
|
hang();
|
|
}
|
|
}
|
|
|
|
void spl_mmc_load_image(void)
|
|
{
|
|
struct mmc *mmc;
|
|
int err;
|
|
u32 boot_mode;
|
|
|
|
mmc_initialize(gd->bd);
|
|
/* We register only one device. So, the dev id is always 0 */
|
|
mmc = find_mmc_device(0);
|
|
if (!mmc) {
|
|
puts("spl: mmc device not found!!\n");
|
|
hang();
|
|
}
|
|
|
|
err = mmc_init(mmc);
|
|
if (err) {
|
|
printf("spl: mmc init failed: err - %d\n", err);
|
|
hang();
|
|
}
|
|
boot_mode = omap_boot_mode();
|
|
if (boot_mode == MMCSD_MODE_RAW) {
|
|
debug("boot mode - RAW\n");
|
|
mmc_load_image_raw(mmc);
|
|
} else if (boot_mode == MMCSD_MODE_FAT) {
|
|
debug("boot mode - FAT\n");
|
|
mmc_load_image_fat(mmc);
|
|
} else {
|
|
puts("spl: wrong MMC boot mode\n");
|
|
hang();
|
|
}
|
|
}
|