Convert CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR et al to Kconfig
This converts the following to Kconfig: CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -30,8 +30,6 @@
|
||||
|
||||
#ifdef CONFIG_SPL_OS_BOOT
|
||||
/* RAW SD card / eMMC */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address 0x10000 */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */
|
||||
|
||||
#endif /* CONFIG_SPL_OS_BOOT */
|
||||
|
||||
|
||||
@@ -116,9 +116,4 @@
|
||||
|
||||
#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000
|
||||
|
||||
#undef CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR
|
||||
#undef CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x8 /* address 0x1000 */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 8 /* 4KB */
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -12,9 +12,6 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* Falcon Mode - MMC support */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x3F00
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS \
|
||||
(CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
|
||||
/*
|
||||
* display5 SPI-NOR memory layout
|
||||
|
||||
@@ -54,9 +54,6 @@
|
||||
#include "imx6_spl.h"
|
||||
/* RiOTboard */
|
||||
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* offset 69KB */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* offset 69KB */
|
||||
|
||||
#endif
|
||||
|
||||
/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
|
||||
|
||||
@@ -12,8 +12,6 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
|
||||
#include "imx6_spl.h" /* common IMX6 SPL configuration */
|
||||
#include "mx6_common.h"
|
||||
|
||||
@@ -136,8 +136,6 @@
|
||||
/* Falcon Mode */
|
||||
#ifdef CONFIG_SPL_OS_BOOT
|
||||
/* MMC support: args@1MB kernel@2MB */
|
||||
# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */
|
||||
# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
#endif
|
||||
|
||||
/* Framebuffer */
|
||||
|
||||
@@ -131,7 +131,5 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
|
||||
#endif /* __IMX6LOGIC_CONFIG_H */
|
||||
|
||||
@@ -53,8 +53,6 @@
|
||||
/* Falcon */
|
||||
|
||||
/* MMC support: args@1MB kernel@2MB */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
|
||||
/* Miscellaneous configurable options */
|
||||
|
||||
|
||||
@@ -19,11 +19,6 @@
|
||||
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SD_BOOT
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x500
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 30
|
||||
#endif
|
||||
|
||||
/*
|
||||
* NOR Flash Definitions
|
||||
*/
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
* design force U-Boot run when we boot in development
|
||||
* mode from SD card (SD2)
|
||||
*/
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (0x800)
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (0x80)
|
||||
|
||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||||
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
/* Falcon Mode */
|
||||
#ifdef CONFIG_SPL_OS_BOOT
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
|
||||
@@ -20,8 +20,6 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
||||
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
#endif
|
||||
|
||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
#endif
|
||||
|
||||
/* Network support */
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
#endif
|
||||
|
||||
#define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR
|
||||
|
||||
@@ -54,8 +54,6 @@
|
||||
#define CONFIG_SYS_MONITOR_LEN (2 * SZ_512K)
|
||||
|
||||
/* Falcon boot support on raw MMC */
|
||||
#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)
|
||||
/* U-Boot proper stored by default at 0x200 (256 KiB) */
|
||||
|
||||
#endif
|
||||
|
||||
@@ -118,8 +118,6 @@
|
||||
/* FAT */
|
||||
|
||||
/* RAW SD card / eMMC */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1500 /* address 0x2A0000 */
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x200 /* 256KiB */
|
||||
#endif
|
||||
|
||||
/* General parts of the framework, required. */
|
||||
|
||||
@@ -24,8 +24,6 @@
|
||||
/* Falcon Mode */
|
||||
|
||||
/* 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_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -20,9 +20,6 @@
|
||||
#define CONFIG_SYS_SPI_ARGS_OFFS SZ_512K
|
||||
#define CONFIG_SYS_SPI_ARGS_SIZE SZ_32K
|
||||
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (SZ_512K / 0x200)
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (SZ_32K / 0x200)
|
||||
|
||||
/* Memory configuration */
|
||||
#define PHYS_SDRAM_1 0x40000000 /* Base address */
|
||||
#define PHYS_SDRAM_1_SIZE 0x10000000 /* Max 256 MB RAM */
|
||||
|
||||
@@ -209,10 +209,6 @@
|
||||
|
||||
/* ATF is my kernel image */
|
||||
|
||||
/* MMC support */
|
||||
# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */
|
||||
# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */
|
||||
|
||||
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
|
||||
# define CONFIG_SPL_HASH
|
||||
# define CONFIG_ENV_MAX_ENTRIES 10
|
||||
|
||||
@@ -212,8 +212,6 @@
|
||||
/* Address in RAM where the parameters must be copied by SPL. */
|
||||
|
||||
/* 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_SECTORS 0
|
||||
|
||||
/* qspi mode is working fine */
|
||||
#ifdef CONFIG_ZYNQ_QSPI
|
||||
|
||||
Reference in New Issue
Block a user