Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig
This converts the following to Kconfig: CONFIG_SYS_SPL_ARGS_ADDR In doing so, we also consistently use this variable for SPL_OS_BOOT and not CONFIG_SYS_FDT_BASE in some cases. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
		
							parent
							
								
									a62b7f0c24
								
							
						
					
					
						commit
						b4b9a00ed5
					
				|  | @ -1188,6 +1188,14 @@ 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 | ||||||
|  | 	hex "Address in memory to load 'args' file for Falcon Mode to" | ||||||
|  | 	depends on SPL_OS_BOOT | ||||||
|  | 	default 0x88000000 if ARCH_OMAP2PLUS | ||||||
|  | 	help | ||||||
|  | 	  Address in memory where the 'args' file, typically a device tree | ||||||
|  | 	  will be loaded in to memory. | ||||||
|  | 
 | ||||||
| if SPL_OS_BOOT | if SPL_OS_BOOT | ||||||
| config SYS_OS_BASE | config SYS_OS_BASE | ||||||
| 	hex "addr, where OS is found" | 	hex "addr, where OS is found" | ||||||
|  |  | ||||||
|  | @ -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 image_header)), | 					sizeof(struct image_header)), | ||||||
| 			       spl_image->size); | 			       spl_image->size); | ||||||
| #ifdef CONFIG_SYS_FDT_BASE | #ifdef CONFIG_SYS_SPL_ARGS_ADDR | ||||||
| 			spl_image->arg = (void *)CONFIG_SYS_FDT_BASE; | 			spl_image->arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR; | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| 			return 0; | 			return 0; | ||||||
|  |  | ||||||
|  | @ -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_FDT_BASE; | 		spl_image->arg = (void *)CONFIG_SYS_SPL_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; | ||||||
|  |  | ||||||
|  | @ -31,6 +31,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_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 | ||||||
| # CONFIG_SPL_POWER is not set | # CONFIG_SPL_POWER is not set | ||||||
|  |  | ||||||
|  | @ -41,6 +41,7 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x1000000 | ||||||
| CONFIG_SPL_FS_LOAD_KERNEL_NAME="atf-uboot.ub" | 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_OS_BOOT=y | CONFIG_SPL_OS_BOOT=y | ||||||
|  | CONFIG_SYS_SPL_ARGS_ADDR=0x8000000 | ||||||
| CONFIG_SYS_MAXARGS=64 | CONFIG_SYS_MAXARGS=64 | ||||||
| CONFIG_SYS_PBSIZE=2073 | CONFIG_SYS_PBSIZE=2073 | ||||||
| CONFIG_CMD_MEMTEST=y | CONFIG_CMD_MEMTEST=y | ||||||
|  |  | ||||||
|  | @ -22,6 +22,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_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 | ||||||
| CONFIG_SYS_MAXARGS=64 | CONFIG_SYS_MAXARGS=64 | ||||||
|  |  | ||||||
|  | @ -44,6 +44,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_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_SPL_SPI_LOAD=y | CONFIG_SPL_SPI_LOAD=y | ||||||
|  |  | ||||||
|  | @ -39,6 +39,7 @@ CONFIG_SYS_SPL_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_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_SPL_SPI_LOAD=y | CONFIG_SPL_SPI_LOAD=y | ||||||
|  |  | ||||||
|  | @ -46,6 +46,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_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_SPL_POWER=y | CONFIG_SPL_POWER=y | ||||||
|  |  | ||||||
|  | @ -46,6 +46,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_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_SPL_POWER=y | CONFIG_SPL_POWER=y | ||||||
|  |  | ||||||
|  | @ -47,6 +47,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_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_SPL_POWER=y | CONFIG_SPL_POWER=y | ||||||
|  |  | ||||||
|  | @ -41,6 +41,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_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 | ||||||
| CONFIG_SYS_MAXARGS=64 | CONFIG_SYS_MAXARGS=64 | ||||||
|  |  | ||||||
|  | @ -45,6 +45,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_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_SPL_SPI_LOAD=y | CONFIG_SPL_SPI_LOAD=y | ||||||
|  |  | ||||||
|  | @ -33,7 +33,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0 | ||||||
| CONFIG_SUPPORT_EMMC_BOOT_OVERRIDE_PART_CONFIG=y | CONFIG_SUPPORT_EMMC_BOOT_OVERRIDE_PART_CONFIG=y | ||||||
| CONFIG_SPL_DMA=y | CONFIG_SPL_DMA=y | ||||||
| CONFIG_SPL_DM_SPI_FLASH=y | CONFIG_SPL_DM_SPI_FLASH=y | ||||||
| CONFIG_SPL_OS_BOOT=y |  | ||||||
| CONFIG_HUSH_PARSER=y | CONFIG_HUSH_PARSER=y | ||||||
| CONFIG_SYS_MAXARGS=32 | CONFIG_SYS_MAXARGS=32 | ||||||
| CONFIG_CMD_SPL=y | CONFIG_CMD_SPL=y | ||||||
|  |  | ||||||
|  | @ -19,6 +19,7 @@ CONFIG_DISTRO_DEFAULTS=y | ||||||
| CONFIG_BOOTDELAY=3 | CONFIG_BOOTDELAY=3 | ||||||
| CONFIG_SYS_SPL_MALLOC=y | CONFIG_SYS_SPL_MALLOC=y | ||||||
| CONFIG_SPL_OS_BOOT=y | CONFIG_SPL_OS_BOOT=y | ||||||
|  | CONFIG_SYS_SPL_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_MAXARGS=32 | CONFIG_SYS_MAXARGS=32 | ||||||
|  |  | ||||||
|  | @ -34,6 +34,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_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_SPL_USB_HOST=y | CONFIG_SPL_USB_HOST=y | ||||||
|  |  | ||||||
|  | @ -35,6 +35,7 @@ CONFIG_BOOTCOMMAND="run $modeboot" | ||||||
| CONFIG_SPL_RAW_IMAGE_SUPPORT=y | CONFIG_SPL_RAW_IMAGE_SUPPORT=y | ||||||
| CONFIG_SYS_SPL_MALLOC=y | CONFIG_SYS_SPL_MALLOC=y | ||||||
| CONFIG_SPL_OS_BOOT=y | CONFIG_SPL_OS_BOOT=y | ||||||
|  | CONFIG_SYS_SPL_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_SPL_WATCHDOG=y | CONFIG_SPL_WATCHDOG=y | ||||||
|  |  | ||||||
|  | @ -38,6 +38,7 @@ CONFIG_BOOTCOMMAND="run $modeboot" | ||||||
| CONFIG_SPL_RAW_IMAGE_SUPPORT=y | CONFIG_SPL_RAW_IMAGE_SUPPORT=y | ||||||
| CONFIG_SYS_SPL_MALLOC=y | CONFIG_SYS_SPL_MALLOC=y | ||||||
| CONFIG_SPL_OS_BOOT=y | CONFIG_SPL_OS_BOOT=y | ||||||
|  | CONFIG_SYS_SPL_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_SPL_WATCHDOG=y | CONFIG_SPL_WATCHDOG=y | ||||||
|  |  | ||||||
|  | @ -32,6 +32,7 @@ CONFIG_BOOTCOMMAND="run $modeboot" | ||||||
| CONFIG_SPL_RAW_IMAGE_SUPPORT=y | CONFIG_SPL_RAW_IMAGE_SUPPORT=y | ||||||
| CONFIG_SYS_SPL_MALLOC=y | CONFIG_SYS_SPL_MALLOC=y | ||||||
| CONFIG_SPL_OS_BOOT=y | CONFIG_SPL_OS_BOOT=y | ||||||
|  | CONFIG_SYS_SPL_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_SPL_WATCHDOG=y | CONFIG_SPL_WATCHDOG=y | ||||||
|  |  | ||||||
|  | @ -56,6 +56,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_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,6 +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_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 | ||||||
|  |  | ||||||
|  | @ -32,6 +32,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y | ||||||
| CONFIG_SPL_STACK=0x100000 | CONFIG_SPL_STACK=0x100000 | ||||||
| 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=0x2a000000 | ||||||
| CONFIG_SYS_OS_BASE=0x2c060000 | CONFIG_SYS_OS_BASE=0x2c060000 | ||||||
| CONFIG_SYS_PROMPT="U-Boot-mONStR> " | CONFIG_SYS_PROMPT="U-Boot-mONStR> " | ||||||
| CONFIG_SYS_MAXARGS=15 | CONFIG_SYS_MAXARGS=15 | ||||||
|  |  | ||||||
|  | @ -35,6 +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_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 | ||||||
| CONFIG_SYS_PROMPT="OMAP Logic # " | CONFIG_SYS_PROMPT="OMAP Logic # " | ||||||
|  |  | ||||||
|  | @ -36,6 +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_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 | ||||||
| # CONFIG_SPL_POWER is not set | # CONFIG_SPL_POWER is not set | ||||||
|  |  | ||||||
|  | @ -34,6 +34,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_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 | ||||||
| CONFIG_SYS_PROMPT="OMAP Logic # " | CONFIG_SYS_PROMPT="OMAP Logic # " | ||||||
|  |  | ||||||
|  | @ -36,6 +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_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 | ||||||
| # CONFIG_SPL_POWER is not set | # CONFIG_SPL_POWER is not set | ||||||
|  |  | ||||||
|  | @ -33,6 +33,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_FALCON_BOOT_MMCSD=y | CONFIG_SPL_FALCON_BOOT_MMCSD=y | ||||||
| CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x0 | CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x0 | ||||||
| CONFIG_SYS_MAXARGS=32 | CONFIG_SYS_MAXARGS=32 | ||||||
|  |  | ||||||
|  | @ -34,6 +34,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_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 | ||||||
|  |  | ||||||
|  | @ -34,6 +34,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_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 | ||||||
|  |  | ||||||
|  | @ -33,6 +33,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_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,6 +36,7 @@ CONFIG_SYS_SPL_MALLOC=y | ||||||
| CONFIG_SYS_SPL_MALLOC_SIZE=0x2000000 | CONFIG_SYS_SPL_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_FALCON_BOOT_MMCSD=y | CONFIG_SPL_FALCON_BOOT_MMCSD=y | ||||||
| CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x0 | CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x0 | ||||||
| CONFIG_SYS_MAXARGS=32 | CONFIG_SYS_MAXARGS=32 | ||||||
|  |  | ||||||
|  | @ -29,6 +29,7 @@ CONFIG_SPL_STACK=0xff718000 | ||||||
| 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_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_CMD_SPL=y | CONFIG_CMD_SPL=y | ||||||
|  |  | ||||||
|  | @ -41,6 +41,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_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 | ||||||
|  |  | ||||||
|  | @ -46,6 +46,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_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 | ||||||
|  |  | ||||||
|  | @ -27,8 +27,6 @@ | ||||||
| #define CONFIG_POWER_TPS62362 | #define CONFIG_POWER_TPS62362 | ||||||
| 
 | 
 | ||||||
| /* SPL defines. */ | /* SPL defines. */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \ |  | ||||||
| 					 (128 << 20)) |  | ||||||
| 
 | 
 | ||||||
| /* Enabling L2 Cache */ | /* Enabling L2 Cache */ | ||||||
| #define CONFIG_SYS_L2_PL310 | #define CONFIG_SYS_L2_PL310 | ||||||
|  |  | ||||||
|  | @ -29,8 +29,6 @@ | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_SPL_OS_BOOT | #ifdef CONFIG_SPL_OS_BOOT | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR		0x80F80000 |  | ||||||
| 
 |  | ||||||
| /* RAW SD card / eMMC */ | /* RAW SD card / eMMC */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x80	/* address 0x10000 */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x80	/* address 0x10000 */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */ | ||||||
|  |  | ||||||
|  | @ -76,7 +76,6 @@ | ||||||
| 		"bootz ${loadaddr} - ${fdtaddr}\0" | 		"bootz ${loadaddr} - ${fdtaddr}\0" | ||||||
| 
 | 
 | ||||||
| /* SPL defines. */ | /* SPL defines. */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + (128 << 20)) |  | ||||||
| #define CONFIG_SYS_MONITOR_LEN		(512 * 1024) | #define CONFIG_SYS_MONITOR_LEN		(512 * 1024) | ||||||
| 
 | 
 | ||||||
| /* EEPROM */ | /* EEPROM */ | ||||||
|  |  | ||||||
|  | @ -124,7 +124,4 @@ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x8   /* address 0x1000 */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x8   /* address 0x1000 */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	8     /* 4KB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	8     /* 4KB */ | ||||||
| 
 | 
 | ||||||
| #undef CONFIG_SYS_SPL_ARGS_ADDR |  | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR        (PHYS_SDRAM_1 + 0x100) |  | ||||||
| 
 |  | ||||||
| #endif /* __CONFIG_H */ | #endif /* __CONFIG_H */ | ||||||
|  |  | ||||||
|  | @ -10,7 +10,6 @@ | ||||||
| #include "mx6_common.h" | #include "mx6_common.h" | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x18000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - MMC support */ | /* Falcon Mode - MMC support */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x3F00 | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x3F00 | ||||||
|  |  | ||||||
|  | @ -53,7 +53,6 @@ | ||||||
| #ifdef CONFIG_SPL | #ifdef CONFIG_SPL | ||||||
| #include "imx6_spl.h" | #include "imx6_spl.h" | ||||||
| /* RiOTboard */ | /* RiOTboard */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR 0x13000000 |  | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0 /* offset 69KB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0 /* offset 69KB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* offset 69KB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* offset 69KB */ | ||||||
|  |  | ||||||
|  | @ -10,7 +10,6 @@ | ||||||
| /* Location in NAND to read U-Boot from */ | /* Location in NAND to read U-Boot from */ | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x18000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - NAND support: args@17MB kernel@18MB */ | /* Falcon Mode - NAND support: args@17MB kernel@18MB */ | ||||||
| #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS	(18 * SZ_1M) | #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS	(18 * SZ_1M) | ||||||
|  |  | ||||||
|  | @ -135,8 +135,6 @@ | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #ifdef CONFIG_SPL_OS_BOOT | #ifdef CONFIG_SPL_OS_BOOT | ||||||
| # define CONFIG_SYS_SPL_ARGS_ADDR	0x18000000 |  | ||||||
| 
 |  | ||||||
| /* MMC support: args@1MB kernel@2MB */ | /* MMC support: args@1MB kernel@2MB */ | ||||||
| # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR		0x800   /* 1MB */ | # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR		0x800   /* 1MB */ | ||||||
| # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS		(CONFIG_CMD_SPL_WRITE_SIZE / 512) | # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS		(CONFIG_CMD_SPL_WRITE_SIZE / 512) | ||||||
|  |  | ||||||
|  | @ -130,7 +130,6 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | ||||||
|  |  | ||||||
|  | @ -51,7 +51,6 @@ | ||||||
| #define CONFIG_USB_MAX_CONTROLLER_COUNT		2 | #define CONFIG_USB_MAX_CONTROLLER_COUNT		2 | ||||||
| 
 | 
 | ||||||
| /* Falcon */ | /* Falcon */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x13000000 |  | ||||||
| 
 | 
 | ||||||
| /* MMC support: args@1MB kernel@2MB */ | /* MMC support: args@1MB kernel@2MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR		0x800   /* 1MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR		0x800   /* 1MB */ | ||||||
|  |  | ||||||
|  | @ -20,7 +20,6 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_SD_BOOT | #ifdef CONFIG_SD_BOOT | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x90000000 |  | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x500 | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x500 | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	30 | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	30 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|  | @ -20,7 +20,6 @@ | ||||||
| 
 | 
 | ||||||
| #if defined(CONFIG_QSPI_BOOT) | #if defined(CONFIG_QSPI_BOOT) | ||||||
| #define CONFIG_SYS_UBOOT_BASE		0x40100000 | #define CONFIG_SYS_UBOOT_BASE		0x40100000 | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x90000000 |  | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_NAND_BASE		0x7e800000 | #define CONFIG_SYS_NAND_BASE		0x7e800000 | ||||||
|  |  | ||||||
|  | @ -12,7 +12,6 @@ | ||||||
| #include "imx6_spl.h" | #include "imx6_spl.h" | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000) | #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000) | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x18000000 |  | ||||||
| 
 | 
 | ||||||
| /*
 | /*
 | ||||||
|  * Below defines are set but NOT really used since we by |  * Below defines are set but NOT really used since we by | ||||||
|  |  | ||||||
|  | @ -115,13 +115,6 @@ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE | #define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE | ||||||
| 
 | 
 | ||||||
| /* for booting directly linux */ |  | ||||||
| #define CONFIG_SYS_FDT_BASE		(CONFIG_SYS_TEXT_BASE + \ |  | ||||||
| 					0x40000) |  | ||||||
| 
 |  | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_TEXT_BASE + \ |  | ||||||
| 					 0x1000000) |  | ||||||
| 
 |  | ||||||
| /* SP location before relocation, must use scratch RAM */ | /* SP location before relocation, must use scratch RAM */ | ||||||
| /* BRAM start */ | /* BRAM start */ | ||||||
| #define CONFIG_SYS_INIT_RAM_ADDR	0x0 | #define CONFIG_SYS_INIT_RAM_ADDR	0x0 | ||||||
|  |  | ||||||
|  | @ -27,7 +27,6 @@ | ||||||
| /* SPL -> Uboot */ | /* SPL -> Uboot */ | ||||||
| 
 | 
 | ||||||
| /* UBoot -> Kernel */ | /* UBoot -> Kernel */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x40000000 |  | ||||||
| 
 | 
 | ||||||
| /* DRAM */ | /* DRAM */ | ||||||
| #define CONFIG_SYS_SDRAM_BASE		0x40000000 | #define CONFIG_SYS_SDRAM_BASE		0x40000000 | ||||||
|  |  | ||||||
|  | @ -28,8 +28,6 @@ | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #ifdef CONFIG_SPL_OS_BOOT | #ifdef CONFIG_SPL_OS_BOOT | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000 |  | ||||||
| 
 |  | ||||||
| /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) | ||||||
|  |  | ||||||
|  | @ -18,7 +18,6 @@ | ||||||
| #include "mx6sabre_common.h" | #include "mx6sabre_common.h" | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | ||||||
|  |  | ||||||
|  | @ -14,7 +14,6 @@ | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_SPL_OS_BOOT | #ifdef CONFIG_SPL_OS_BOOT | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR   0x18000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | ||||||
|  |  | ||||||
|  | @ -16,7 +16,6 @@ | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_SPL_OS_BOOT | #ifdef CONFIG_SPL_OS_BOOT | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR   0x88000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | ||||||
|  |  | ||||||
|  | @ -14,7 +14,6 @@ | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_SPL_OS_BOOT | #ifdef CONFIG_SPL_OS_BOOT | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x88000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | /* Falcon Mode - MMC support: args@1MB kernel@2MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */ | ||||||
|  |  | ||||||
|  | @ -57,7 +57,6 @@ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x100  /* 128 KiB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x100  /* 128 KiB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	(CONFIG_CMD_SPL_WRITE_SIZE / 512) | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	(CONFIG_CMD_SPL_WRITE_SIZE / 512) | ||||||
| /* U-Boot proper stored by default at 0x200 (256 KiB) */ | /* U-Boot proper stored by default at 0x200 (256 KiB) */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR		0x22000000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon boot support on FAT on MMC */ | /* Falcon boot support on FAT on MMC */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -43,10 +43,6 @@ | ||||||
| #define CONFIG_SYS_UBOOT_BASE		(CONFIG_SYS_FLASH_BASE + \ | #define CONFIG_SYS_UBOOT_BASE		(CONFIG_SYS_FLASH_BASE + \ | ||||||
| 					 CONFIG_SPL_PAD_TO) | 					 CONFIG_SPL_PAD_TO) | ||||||
| 
 | 
 | ||||||
| /* DT blob (fdt) address */ |  | ||||||
| #define CONFIG_SYS_FDT_BASE		(CONFIG_SYS_FLASH_BASE + \ |  | ||||||
| 					0x1C0000) |  | ||||||
| 
 |  | ||||||
| /* For splashcreen */ | /* For splashcreen */ | ||||||
| 
 | 
 | ||||||
| #endif /* __CONFIG_H */ | #endif /* __CONFIG_H */ | ||||||
|  |  | ||||||
|  | @ -32,8 +32,6 @@ | ||||||
|  * supports X-MODEM loading via UART, and we leverage this and then use |  * supports X-MODEM loading via UART, and we leverage this and then use | ||||||
|  * Y-MODEM to load u-boot.img, when booted over UART. |  * Y-MODEM to load u-boot.img, when booted over UART. | ||||||
|  */ |  */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \ |  | ||||||
| 					 (128 << 20)) |  | ||||||
| 
 | 
 | ||||||
| /* Enable the watchdog inside of SPL */ | /* Enable the watchdog inside of SPL */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -55,8 +55,6 @@ | ||||||
| #define CONFIG_SYS_MONITOR_LEN		(256 << 10) | #define CONFIG_SYS_MONITOR_LEN		(256 << 10) | ||||||
| 
 | 
 | ||||||
| /* SPL */ | /* SPL */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \ |  | ||||||
| 					 (64 << 20)) |  | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_MTD_RAW_NAND | #ifdef CONFIG_MTD_RAW_NAND | ||||||
| #define CONFIG_SYS_NAND_BASE		0x30000000 | #define CONFIG_SYS_NAND_BASE		0x30000000 | ||||||
|  |  | ||||||
|  | @ -113,8 +113,6 @@ | ||||||
|  * SPL is overlapped with public stack and breaking non HS devices to boot. |  * SPL is overlapped with public stack and breaking non HS devices to boot. | ||||||
|  * So moving TEXT_BASE down to non-HS limit. |  * So moving TEXT_BASE down to non-HS limit. | ||||||
|  */ |  */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \ |  | ||||||
| 					 (128 << 20)) |  | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_SPL_BUILD | #ifdef CONFIG_SPL_BUILD | ||||||
| /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */ | /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */ | ||||||
|  |  | ||||||
|  | @ -305,7 +305,4 @@ | ||||||
|  */ |  */ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \ |  | ||||||
| 					 (128 << 20)) |  | ||||||
| 
 |  | ||||||
| #endif /* __CONFIG_TI_OMAP5_COMMON_H */ | #endif /* __CONFIG_TI_OMAP5_COMMON_H */ | ||||||
|  |  | ||||||
|  | @ -127,7 +127,6 @@ | ||||||
| 	"fdtaddr=40800000\0" \ | 	"fdtaddr=40800000\0" \ | ||||||
| 
 | 
 | ||||||
| /* Falcon mode definitions */ | /* Falcon mode definitions */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR        CONFIG_SYS_SDRAM_BASE + 0x100 |  | ||||||
| 
 | 
 | ||||||
| /* GPT */ | /* GPT */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -22,7 +22,6 @@ | ||||||
| 
 | 
 | ||||||
| #ifndef CONFIG_TPL_BUILD | #ifndef CONFIG_TPL_BUILD | ||||||
| /* Falcon Mode */ | /* Falcon Mode */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x0ffe5000 |  | ||||||
| 
 | 
 | ||||||
| /* Falcon Mode - MMC support: args@16MB kernel@17MB */ | /* Falcon Mode - MMC support: args@16MB kernel@17MB */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR		0x8000	/* 16MB */ | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR		0x8000	/* 16MB */ | ||||||
|  |  | ||||||
|  | @ -16,8 +16,6 @@ | ||||||
| 
 | 
 | ||||||
| /* SPL */ | /* SPL */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x44000000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_SYS_SPI_KERNEL_OFFS	SZ_1M | #define CONFIG_SYS_SPI_KERNEL_OFFS	SZ_1M | ||||||
| #define CONFIG_SYS_SPI_ARGS_OFFS	SZ_512K | #define CONFIG_SYS_SPI_ARGS_OFFS	SZ_512K | ||||||
| #define CONFIG_SYS_SPI_ARGS_SIZE	SZ_32K | #define CONFIG_SYS_SPI_ARGS_SIZE	SZ_32K | ||||||
|  |  | ||||||
|  | @ -206,7 +206,6 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| /* u-boot is like dtb */ | /* u-boot is like dtb */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x8000000 |  | ||||||
| 
 | 
 | ||||||
| /* ATF is my kernel image */ | /* ATF is my kernel image */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -210,7 +210,6 @@ | ||||||
| #define CONFIG_SYS_MMC_MAX_DEVICE	1 | #define CONFIG_SYS_MMC_MAX_DEVICE	1 | ||||||
| 
 | 
 | ||||||
| /* Address in RAM where the parameters must be copied by SPL. */ | /* Address in RAM where the parameters must be copied by SPL. */ | ||||||
| #define CONFIG_SYS_SPL_ARGS_ADDR	0x10000000 |  | ||||||
| 
 | 
 | ||||||
| /* Not using MMC raw mode - just for compilation purpose */ | /* Not using MMC raw mode - just for compilation purpose */ | ||||||
| #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0 | #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue