From 203dc1b3a8ea79190c8574c58b75a8aa5e5d9d1e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 4 Aug 2017 16:34:49 -0600 Subject: Convert CONFIG_CMD_SPL_NAND_OFS to Kconfig This converts the following to Kconfig: CONFIG_CMD_SPL_NAND_OFS Signed-off-by: Simon Glass Reviewed-by: Bin Meng Reviewed-by: Philipp Tomsich --- include/configs/am335x_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cm_t335.h | 1 - include/configs/devkit8000.h | 2 -- include/configs/dra7xx_evm.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/pengwyn.h | 1 - include/configs/twister.h | 2 -- 17 files changed, 19 deletions(-) (limited to 'include') diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index fbab610..e11527f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -238,7 +238,6 @@ #define CONFIG_SPL_NAND_AM33XX_BCH #endif #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4f3b605..7a811a0 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -307,7 +307,6 @@ #endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00100000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00300000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #endif diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 598352b..d5413fd 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -45,7 +45,6 @@ #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 6beb347..8acc771 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -395,7 +395,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SPL_NAND_AM33XX_BCH #endif #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 9688c4a..3dbbf67 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -66,7 +66,6 @@ /* NAND */ #ifdef CONFIG_NAND -#define CONFIG_CMD_SPL_NAND_OFS 0x080000 /* end of u-boot */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x140000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif /* CONFIG_NAND */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index f01783b..1874cd3 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -137,7 +137,6 @@ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_NAND_ONFI_DETECTION #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x400000 /* un-assigned: (using dtb) */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x500000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5b249d1..30c165c 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -210,8 +210,6 @@ /* SPL OS boot options */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ -#define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\ - 0x400000) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #undef CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 1a58c6e..9316a12 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -209,7 +209,6 @@ #endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os-boot params*/ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 0c395e5..d389058 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -16,7 +16,6 @@ #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) /* Falcon Mode - NAND support: args@17MB kernel@18MB */ -#define CONFIG_CMD_SPL_NAND_OFS (17 * SZ_1M) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS (18 * SZ_1M) /* Falcon Mode - MMC support: args@1MB kernel@2MB */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 4824941..6adbb8e 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -276,7 +276,6 @@ /* add FALCON boot mode */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 #define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR -#define CONFIG_CMD_SPL_NAND_OFS 0x00180000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* GPIO support */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a87a75e..c683901 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -276,7 +276,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 4f8ce54..5f9f815 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -200,7 +200,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index e5ffb85..795538b 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -263,7 +263,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index bc4a59e..bfcf790 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -217,7 +217,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 7f4f56f..d3c72f3 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -57,7 +57,6 @@ #if defined(CONFIG_CMD_NAND) /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index a76bbce..1c61167 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -163,7 +163,6 @@ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 /* un-assigned */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/twister.h b/include/configs/twister.h index c45ae87..80d480b 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -38,8 +38,6 @@ /* SPL OS boot options */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 -#define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\ - 0x600000) #define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100) -- cgit v1.1