mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-18 19:04:38 +00:00
spl: Rename SYS_SPL_ARGS_ADDR to SPL_PAYLOAD_ARGS_ADDR
Rename this so that SPL is first, as per U-Boot convention. Also add PAYLOAD_ since this is where in memory the parameters for the payload have been stored. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
82e26e0d68
commit
9cbdc3a0fc
39 changed files with 51 additions and 51 deletions
|
@ -30,7 +30,7 @@ to understand the device tree in FIT image should be the one actually used, or
|
||||||
leave it absent to favor the stored sectors. It is easier to deploy the FIT
|
leave it absent to favor the stored sectors. It is easier to deploy the FIT
|
||||||
image with embedded static device tree to multiple boards.
|
image with embedded static device tree to multiple boards.
|
||||||
|
|
||||||
Macro CONFIG_SYS_SPL_ARGS_ADDR serves two purposes. One is the pointer to load
|
Macro CONFIG_SPL_PAYLOAD_ARGS_ADDR serves two purposes. One is the pointer to load
|
||||||
the stored sectors to. Normally this is the static device tree. The second
|
the stored sectors to. Normally this is the static device tree. The second
|
||||||
purpose is the memory location of signature header for secure boot. After the
|
purpose is the memory location of signature header for secure boot. After the
|
||||||
FIT image is loaded into memory, it is validated against the signature header
|
FIT image is loaded into memory, it is validated against the signature header
|
||||||
|
|
|
@ -1063,7 +1063,7 @@ config SPL_OS_BOOT
|
||||||
Enable booting directly to an OS from SPL.
|
Enable booting directly to an OS from SPL.
|
||||||
for more info read doc/README.falcon
|
for more info read doc/README.falcon
|
||||||
|
|
||||||
config SYS_SPL_ARGS_ADDR
|
config SPL_PAYLOAD_ARGS_ADDR
|
||||||
hex "Address in memory to load 'args' file for Falcon Mode to"
|
hex "Address in memory to load 'args' file for Falcon Mode to"
|
||||||
depends on SPL_OS_BOOT
|
depends on SPL_OS_BOOT
|
||||||
default 0x88000000 if ARCH_OMAP2PLUS
|
default 0x88000000 if ARCH_OMAP2PLUS
|
||||||
|
|
|
@ -814,8 +814,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(&spl_image, '\0', sizeof(spl_image));
|
memset(&spl_image, '\0', sizeof(spl_image));
|
||||||
#ifdef CONFIG_SYS_SPL_ARGS_ADDR
|
#ifdef CONFIG_SPL_PAYLOAD_ARGS_ADDR
|
||||||
spl_image.arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
|
spl_image.arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
|
||||||
#endif
|
#endif
|
||||||
spl_image.boot_device = BOOT_DEVICE_NONE;
|
spl_image.boot_device = BOOT_DEVICE_NONE;
|
||||||
board_boot_order(spl_boot_list);
|
board_boot_order(spl_boot_list);
|
||||||
|
@ -873,8 +873,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
||||||
#if CONFIG_IS_ENABLED(OS_BOOT)
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
||||||
case IH_OS_LINUX:
|
case IH_OS_LINUX:
|
||||||
debug("Jumping to Linux\n");
|
debug("Jumping to Linux\n");
|
||||||
#if defined(CONFIG_SYS_SPL_ARGS_ADDR)
|
#if defined(CONFIG_SPL_PAYLOAD_ARGS_ADDR)
|
||||||
spl_fixup_fdt((void *)CONFIG_SYS_SPL_ARGS_ADDR);
|
spl_fixup_fdt((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR);
|
||||||
#endif
|
#endif
|
||||||
spl_board_prepare_for_linux();
|
spl_board_prepare_for_linux();
|
||||||
jump_to_image_linux(&spl_image);
|
jump_to_image_linux(&spl_image);
|
||||||
|
|
|
@ -97,7 +97,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image,
|
||||||
puts("spl: ext4fs_open failed\n");
|
puts("spl: ext4fs_open failed\n");
|
||||||
goto defaults;
|
goto defaults;
|
||||||
}
|
}
|
||||||
err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, 0, filelen, &actlen);
|
err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
printf("spl: error reading image %s, err - %d, falling back to default\n",
|
printf("spl: error reading image %s, err - %d, falling back to default\n",
|
||||||
file, err);
|
file, err);
|
||||||
|
@ -127,7 +127,7 @@ defaults:
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
puts("spl: ext4fs_open failed\n");
|
puts("spl: ext4fs_open failed\n");
|
||||||
|
|
||||||
err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, 0, filelen, &actlen);
|
err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||||
printf("%s: error reading image %s, err - %d\n",
|
printf("%s: error reading image %s, err - %d\n",
|
||||||
|
|
|
@ -128,7 +128,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image,
|
||||||
#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
|
#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
|
||||||
file = env_get("falcon_args_file");
|
file = env_get("falcon_args_file");
|
||||||
if (file) {
|
if (file) {
|
||||||
err = file_fat_read(file, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
|
err = file_fat_read(file, (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0);
|
||||||
if (err <= 0) {
|
if (err <= 0) {
|
||||||
printf("spl: error reading image %s, err - %d, falling back to default\n",
|
printf("spl: error reading image %s, err - %d, falling back to default\n",
|
||||||
file, err);
|
file, err);
|
||||||
|
@ -153,7 +153,7 @@ defaults:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,
|
err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,
|
||||||
(void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
|
(void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0);
|
||||||
if (err <= 0) {
|
if (err <= 0) {
|
||||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||||
printf("%s: error reading image %s, err - %d\n",
|
printf("%s: error reading image %s, err - %d\n",
|
||||||
|
|
|
@ -235,7 +235,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
|
||||||
count = blk_dread(mmc_get_blk_desc(mmc),
|
count = blk_dread(mmc_get_blk_desc(mmc),
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR,
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR,
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS,
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS,
|
||||||
(void *) CONFIG_SYS_SPL_ARGS_ADDR);
|
(void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR);
|
||||||
if (count != CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS) {
|
if (count != CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS) {
|
||||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||||
puts("mmc_load_image_raw_os: mmc block read error\n");
|
puts("mmc_load_image_raw_os: mmc block read error\n");
|
||||||
|
|
|
@ -159,11 +159,11 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
|
||||||
CONFIG_CMD_SPL_WRITE_SIZE,
|
CONFIG_CMD_SPL_WRITE_SIZE,
|
||||||
(void *)CONFIG_TEXT_BASE);
|
(void *)CONFIG_TEXT_BASE);
|
||||||
/* copy to destintion */
|
/* copy to destintion */
|
||||||
for (dst = (int *)CONFIG_SYS_SPL_ARGS_ADDR,
|
for (dst = (int *)CONFIG_SPL_PAYLOAD_ARGS_ADDR,
|
||||||
src = (int *)CONFIG_TEXT_BASE;
|
src = (int *)CONFIG_TEXT_BASE;
|
||||||
src < (int *)(CONFIG_TEXT_BASE +
|
src < (int *)(CONFIG_TEXT_BASE +
|
||||||
CONFIG_CMD_SPL_WRITE_SIZE);
|
CONFIG_CMD_SPL_WRITE_SIZE);
|
||||||
src++, dst++) {
|
src++, dst++) {
|
||||||
writel(readl(src), dst);
|
writel(readl(src), dst);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,8 +54,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
|
||||||
CONFIG_SYS_OS_BASE,
|
CONFIG_SYS_OS_BASE,
|
||||||
(void *)header);
|
(void *)header);
|
||||||
|
|
||||||
#if defined CONFIG_SYS_SPL_ARGS_ADDR && defined CONFIG_CMD_SPL_NOR_OFS
|
#if defined CONFIG_SPL_PAYLOAD_ARGS_ADDR && defined CONFIG_CMD_SPL_NOR_OFS
|
||||||
memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR,
|
memcpy((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR,
|
||||||
(void *)CONFIG_CMD_SPL_NOR_OFS,
|
(void *)CONFIG_CMD_SPL_NOR_OFS,
|
||||||
CONFIG_CMD_SPL_WRITE_SIZE);
|
CONFIG_CMD_SPL_WRITE_SIZE);
|
||||||
#endif
|
#endif
|
||||||
|
@ -74,8 +74,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
|
||||||
(void *)(CONFIG_SYS_OS_BASE +
|
(void *)(CONFIG_SYS_OS_BASE +
|
||||||
sizeof(struct legacy_img_hdr)),
|
sizeof(struct legacy_img_hdr)),
|
||||||
spl_image->size);
|
spl_image->size);
|
||||||
#ifdef CONFIG_SYS_SPL_ARGS_ADDR
|
#ifdef CONFIG_SPL_PAYLOAD_ARGS_ADDR
|
||||||
spl_image->arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
|
spl_image->arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -47,7 +47,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
|
||||||
/* Read device tree. */
|
/* Read device tree. */
|
||||||
spi_flash_read(flash, CFG_SYS_SPI_ARGS_OFFS,
|
spi_flash_read(flash, CFG_SYS_SPI_ARGS_OFFS,
|
||||||
CFG_SYS_SPI_ARGS_SIZE,
|
CFG_SYS_SPI_ARGS_SIZE,
|
||||||
(void *)CONFIG_SYS_SPL_ARGS_ADDR);
|
(void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image,
|
||||||
volumes[0].vol_id = CONFIG_SPL_UBI_LOAD_KERNEL_ID;
|
volumes[0].vol_id = CONFIG_SPL_UBI_LOAD_KERNEL_ID;
|
||||||
volumes[0].load_addr = (void *)CONFIG_SYS_LOAD_ADDR;
|
volumes[0].load_addr = (void *)CONFIG_SYS_LOAD_ADDR;
|
||||||
volumes[1].vol_id = CONFIG_SPL_UBI_LOAD_ARGS_ID;
|
volumes[1].vol_id = CONFIG_SPL_UBI_LOAD_ARGS_ID;
|
||||||
volumes[1].load_addr = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
|
volumes[1].load_addr = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
|
||||||
|
|
||||||
ret = ubispl_load_volumes(&info, volumes, 2);
|
ret = ubispl_load_volumes(&info, volumes, 2);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
|
|
@ -14,7 +14,7 @@ static int spl_xip(struct spl_image_info *spl_image,
|
||||||
{
|
{
|
||||||
#if CONFIG_IS_ENABLED(OS_BOOT)
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
||||||
if (!spl_start_uboot()) {
|
if (!spl_start_uboot()) {
|
||||||
spl_image->arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
|
spl_image->arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
|
||||||
spl_image->name = "Linux";
|
spl_image->name = "Linux";
|
||||||
spl_image->os = IH_OS_LINUX;
|
spl_image->os = IH_OS_LINUX;
|
||||||
spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;
|
spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;
|
||||||
|
|
|
@ -32,7 +32,7 @@ CONFIG_SPL_NAND_ECC=y
|
||||||
CONFIG_SPL_NAND_SIMPLE=y
|
CONFIG_SPL_NAND_SIMPLE=y
|
||||||
CONFIG_SPL_NAND_BASE=y
|
CONFIG_SPL_NAND_BASE=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x84000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x2a0000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x2a0000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
||||||
|
|
|
@ -28,7 +28,7 @@ CONFIG_SPL_NAND_ECC=y
|
||||||
CONFIG_SPL_NAND_SIMPLE=y
|
CONFIG_SPL_NAND_SIMPLE=y
|
||||||
CONFIG_SPL_NAND_BASE=y
|
CONFIG_SPL_NAND_BASE=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x80000100
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x80000100
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x500
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x500
|
||||||
|
|
|
@ -45,7 +45,7 @@ CONFIG_SPL_ENV_SUPPORT=y
|
||||||
CONFIG_SPL_SAVEENV=y
|
CONFIG_SPL_SAVEENV=y
|
||||||
CONFIG_SPL_I2C=y
|
CONFIG_SPL_I2C=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x3F00
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x3F00
|
||||||
|
|
|
@ -40,7 +40,7 @@ CONFIG_SPL_SYS_MALLOC=y
|
||||||
CONFIG_SPL_DMA=y
|
CONFIG_SPL_DMA=y
|
||||||
CONFIG_SPL_I2C=y
|
CONFIG_SPL_I2C=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x3F00
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x3F00
|
||||||
|
|
|
@ -49,7 +49,7 @@ CONFIG_SPL_FIT_IMAGE_TINY=y
|
||||||
CONFIG_SPL_DMA=y
|
CONFIG_SPL_DMA=y
|
||||||
CONFIG_SPL_I2C=y
|
CONFIG_SPL_I2C=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
||||||
|
|
|
@ -50,7 +50,7 @@ CONFIG_SPL_DMA=y
|
||||||
CONFIG_SPL_I2C=y
|
CONFIG_SPL_I2C=y
|
||||||
CONFIG_SPL_NAND_SUPPORT=y
|
CONFIG_SPL_NAND_SUPPORT=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x1200000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x1200000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
||||||
|
|
|
@ -43,7 +43,7 @@ CONFIG_SPL_UBI_LOAD_KERNEL_ID=3
|
||||||
CONFIG_SPL_UBI_LOAD_ARGS_ID=4
|
CONFIG_SPL_UBI_LOAD_ARGS_ID=4
|
||||||
CONFIG_SPL_ONENAND_SUPPORT=y
|
CONFIG_SPL_ONENAND_SUPPORT=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x84000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
||||||
|
|
|
@ -51,7 +51,7 @@ CONFIG_SPL_DMA=y
|
||||||
CONFIG_SPL_MMC_TINY=y
|
CONFIG_SPL_MMC_TINY=y
|
||||||
CONFIG_SPL_DM_SPI_FLASH=y
|
CONFIG_SPL_DM_SPI_FLASH=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x44000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x44000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x800
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x800
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x400
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x400
|
||||||
|
|
|
@ -20,7 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y
|
||||||
CONFIG_BOOTDELAY=3
|
CONFIG_BOOTDELAY=3
|
||||||
CONFIG_SPL_SYS_MALLOC=y
|
CONFIG_SPL_SYS_MALLOC=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x13000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x13000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
||||||
|
|
|
@ -35,7 +35,7 @@ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot-dtb.img"
|
||||||
CONFIG_SPL_I2C=y
|
CONFIG_SPL_I2C=y
|
||||||
CONFIG_SPL_NAND_SUPPORT=y
|
CONFIG_SPL_NAND_SUPPORT=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x500000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x500000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
||||||
|
|
|
@ -35,7 +35,7 @@ CONFIG_BOOTCOMMAND="run $modeboot"
|
||||||
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
||||||
CONFIG_SPL_SYS_MALLOC=y
|
CONFIG_SPL_SYS_MALLOC=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
||||||
|
|
|
@ -38,7 +38,7 @@ CONFIG_BOOTCOMMAND="run $modeboot"
|
||||||
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
||||||
CONFIG_SPL_SYS_MALLOC=y
|
CONFIG_SPL_SYS_MALLOC=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
||||||
|
|
|
@ -32,7 +32,7 @@ CONFIG_BOOTCOMMAND="run $modeboot"
|
||||||
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
||||||
CONFIG_SPL_SYS_MALLOC=y
|
CONFIG_SPL_SYS_MALLOC=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
|
||||||
|
|
|
@ -61,7 +61,7 @@ CONFIG_SPL_I2C=y
|
||||||
CONFIG_SPL_MPC8XXX_INIT_DDR=y
|
CONFIG_SPL_MPC8XXX_INIT_DDR=y
|
||||||
CONFIG_SPL_NOR_SUPPORT=y
|
CONFIG_SPL_NOR_SUPPORT=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x90000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x90000000
|
||||||
CONFIG_SYS_OS_BASE=0x40980000
|
CONFIG_SYS_OS_BASE=0x40980000
|
||||||
CONFIG_SPL_WATCHDOG=y
|
CONFIG_SPL_WATCHDOG=y
|
||||||
CONFIG_SPL_TARGET="spl/u-boot-spl.pbl"
|
CONFIG_SPL_TARGET="spl/u-boot-spl.pbl"
|
||||||
|
|
|
@ -29,7 +29,7 @@ CONFIG_SPL_FIT_IMAGE_TINY=y
|
||||||
CONFIG_SPL_ENV_SUPPORT=y
|
CONFIG_SPL_ENV_SUPPORT=y
|
||||||
CONFIG_SPL_NOR_SUPPORT=y
|
CONFIG_SPL_NOR_SUPPORT=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x18000000
|
||||||
CONFIG_SYS_OS_BASE=0x8180000
|
CONFIG_SYS_OS_BASE=0x8180000
|
||||||
CONFIG_SYS_MAXARGS=32
|
CONFIG_SYS_MAXARGS=32
|
||||||
CONFIG_SYS_PBSIZE=532
|
CONFIG_SYS_PBSIZE=532
|
||||||
|
|
|
@ -36,7 +36,7 @@ CONFIG_SPL_NAND_ECC=y
|
||||||
CONFIG_SPL_NAND_SIMPLE=y
|
CONFIG_SPL_NAND_SIMPLE=y
|
||||||
CONFIG_SPL_NAND_BASE=y
|
CONFIG_SPL_NAND_BASE=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x84000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
||||||
|
|
|
@ -37,7 +37,7 @@ CONFIG_SPL_NAND_ECC=y
|
||||||
CONFIG_SPL_NAND_SIMPLE=y
|
CONFIG_SPL_NAND_SIMPLE=y
|
||||||
CONFIG_SPL_NAND_BASE=y
|
CONFIG_SPL_NAND_BASE=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x84000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
||||||
|
|
|
@ -35,7 +35,7 @@ CONFIG_SPL_NAND_ECC=y
|
||||||
CONFIG_SPL_NAND_SIMPLE=y
|
CONFIG_SPL_NAND_SIMPLE=y
|
||||||
CONFIG_SPL_NAND_BASE=y
|
CONFIG_SPL_NAND_BASE=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x84000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
||||||
|
|
|
@ -37,7 +37,7 @@ CONFIG_SPL_NAND_ECC=y
|
||||||
CONFIG_SPL_NAND_SIMPLE=y
|
CONFIG_SPL_NAND_SIMPLE=y
|
||||||
CONFIG_SPL_NAND_BASE=y
|
CONFIG_SPL_NAND_BASE=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x84000000
|
||||||
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
|
||||||
|
|
|
@ -35,7 +35,7 @@ CONFIG_SPL_FS_EXT4=y
|
||||||
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot-dtb.img"
|
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot-dtb.img"
|
||||||
CONFIG_SPL_FS_LOAD_ARGS_NAME="imx6dl-riotboard.dtb"
|
CONFIG_SPL_FS_LOAD_ARGS_NAME="imx6dl-riotboard.dtb"
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x13000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x13000000
|
||||||
CONFIG_SYS_MAXARGS=32
|
CONFIG_SYS_MAXARGS=32
|
||||||
CONFIG_SYS_PBSIZE=532
|
CONFIG_SYS_PBSIZE=532
|
||||||
CONFIG_CMD_GPIO=y
|
CONFIG_CMD_GPIO=y
|
||||||
|
|
|
@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
|
||||||
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
||||||
CONFIG_SPL_MTD_SUPPORT=y
|
CONFIG_SPL_MTD_SUPPORT=y
|
||||||
CONFIG_SPL_XIP_SUPPORT=y
|
CONFIG_SPL_XIP_SUPPORT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x80c0000
|
||||||
CONFIG_SPL_DM_RESET=y
|
CONFIG_SPL_DM_RESET=y
|
||||||
CONFIG_SYS_PROMPT="U-Boot > "
|
CONFIG_SYS_PROMPT="U-Boot > "
|
||||||
CONFIG_SYS_PBSIZE=1050
|
CONFIG_SYS_PBSIZE=1050
|
||||||
|
|
|
@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
|
||||||
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
||||||
CONFIG_SPL_MTD_SUPPORT=y
|
CONFIG_SPL_MTD_SUPPORT=y
|
||||||
CONFIG_SPL_XIP_SUPPORT=y
|
CONFIG_SPL_XIP_SUPPORT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x80c0000
|
||||||
CONFIG_SPL_DM_RESET=y
|
CONFIG_SPL_DM_RESET=y
|
||||||
CONFIG_SYS_PROMPT="U-Boot > "
|
CONFIG_SYS_PROMPT="U-Boot > "
|
||||||
CONFIG_SYS_PBSIZE=1050
|
CONFIG_SYS_PBSIZE=1050
|
||||||
|
|
|
@ -35,7 +35,7 @@ CONFIG_SPL_BOARD_INIT=y
|
||||||
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
||||||
CONFIG_SPL_MTD_SUPPORT=y
|
CONFIG_SPL_MTD_SUPPORT=y
|
||||||
CONFIG_SPL_XIP_SUPPORT=y
|
CONFIG_SPL_XIP_SUPPORT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x81c0000
|
||||||
CONFIG_SPL_DM_RESET=y
|
CONFIG_SPL_DM_RESET=y
|
||||||
CONFIG_SYS_PROMPT="U-Boot > "
|
CONFIG_SYS_PROMPT="U-Boot > "
|
||||||
CONFIG_SYS_PBSIZE=1050
|
CONFIG_SYS_PBSIZE=1050
|
||||||
|
|
|
@ -32,7 +32,7 @@ CONFIG_SPL_SYS_MALLOC=y
|
||||||
CONFIG_SPL_SYS_MALLOC_SIZE=0x2000000
|
CONFIG_SPL_SYS_MALLOC_SIZE=0x2000000
|
||||||
CONFIG_SPL_FS_LOAD_ARGS_NAME="system.dtb"
|
CONFIG_SPL_FS_LOAD_ARGS_NAME="system.dtb"
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x10000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x10000000
|
||||||
CONFIG_SYS_MAXARGS=32
|
CONFIG_SYS_MAXARGS=32
|
||||||
CONFIG_SYS_PBSIZE=2071
|
CONFIG_SYS_PBSIZE=2071
|
||||||
CONFIG_SYS_BOOTM_LEN=0x3c00000
|
CONFIG_SYS_BOOTM_LEN=0x3c00000
|
||||||
|
|
|
@ -32,7 +32,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y
|
||||||
CONFIG_SPL_STACK_R=y
|
CONFIG_SPL_STACK_R=y
|
||||||
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0xffe5000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0xffe5000
|
||||||
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
CONFIG_SPL_FALCON_BOOT_MMCSD=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x8800
|
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x8800
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x8000
|
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x8000
|
||||||
|
|
|
@ -43,7 +43,7 @@ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
|
||||||
CONFIG_SPL_FS_LOAD_ARGS_NAME="system.dtb"
|
CONFIG_SPL_FS_LOAD_ARGS_NAME="system.dtb"
|
||||||
CONFIG_SPL_FPGA=y
|
CONFIG_SPL_FPGA=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x10000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x10000000
|
||||||
CONFIG_SPL_SPI_LOAD=y
|
CONFIG_SPL_SPI_LOAD=y
|
||||||
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
|
||||||
CONFIG_SYS_MAXARGS=32
|
CONFIG_SYS_MAXARGS=32
|
||||||
|
|
|
@ -43,7 +43,7 @@ CONFIG_SPL_FS_LOAD_KERNEL_NAME="atf-uboot.ub"
|
||||||
CONFIG_SPL_FS_LOAD_ARGS_NAME="u-boot.bin"
|
CONFIG_SPL_FS_LOAD_ARGS_NAME="u-boot.bin"
|
||||||
CONFIG_SPL_FPGA=y
|
CONFIG_SPL_FPGA=y
|
||||||
CONFIG_SPL_OS_BOOT=y
|
CONFIG_SPL_OS_BOOT=y
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR=0x8000000
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x8000000
|
||||||
CONFIG_SPL_RAM_SUPPORT=y
|
CONFIG_SPL_RAM_SUPPORT=y
|
||||||
CONFIG_SPL_RAM_DEVICE=y
|
CONFIG_SPL_RAM_DEVICE=y
|
||||||
CONFIG_SPL_SPI_LOAD=y
|
CONFIG_SPL_SPI_LOAD=y
|
||||||
|
|
|
@ -63,7 +63,7 @@ CONFIG_CMD_SPL
|
||||||
Enable the "spl export" command.
|
Enable the "spl export" command.
|
||||||
The command "spl export" is then available in U-Boot mode.
|
The command "spl export" is then available in U-Boot mode.
|
||||||
|
|
||||||
CONFIG_SYS_SPL_ARGS_ADDR
|
CONFIG_SPL_PAYLOAD_ARGS_ADDR
|
||||||
Address in RAM where the parameters must be copied by SPL.
|
Address in RAM where the parameters must be copied by SPL.
|
||||||
In most cases, it is <start_of_ram> + 0x100.
|
In most cases, it is <start_of_ram> + 0x100.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue