From 203dc1b3a8ea79190c8574c58b75a8aa5e5d9d1e Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Fri, 4 Aug 2017 16:34:49 -0600 Subject: [PATCH] Convert CONFIG_CMD_SPL_NAND_OFS to Kconfig This converts the following to Kconfig: CONFIG_CMD_SPL_NAND_OFS Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> --- cmd/Kconfig | 10 ++++++++++ configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/cairo_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/twister_defconfig | 1 + 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 -- scripts/config_whitelist.txt | 1 - 39 files changed, 30 insertions(+), 20 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 1ca91fcc384..4f7336aeb01 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -285,6 +285,16 @@ config CMD_SPL doc/README.falcon for full information about how to use this command. +config CMD_SPL_NAND_OFS + hex "Offset of OS command line args for Falcon-mode NAND boot" + depends on CMD_SPL + default 0 + help + This provides the offset of the command line arguments for Linux + when booting from NAND in Falcon mode. See doc/README.falcon + for full information about how to use this option (and also see + board/gateworks/gw_ventana/README for an example). + endmenu menu "Environment commands" diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 8c842c755ec..6dcb58f05e8 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 061ac7388c2..411d35c73a3 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_NAND=y +CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MTDPARTS=y CONFIG_DFU_MMC=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index afb62048996..34a6975d5a7 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -23,6 +23,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 1a8736787dd..a66d8070c0f 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index a53466ce5bf..5679f31c2c6 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 99c1f9e954b..549ec0a0202 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 3122287b9ad..3045b83e2f7 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 71a382d89cf..875c8881f9a 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x680000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 316df3e97f0..3318faee0f7 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x1100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index d04a92b83af..7830d90ca21 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x1100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 02b4d2bec3a..3b0f42d3773 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -33,6 +33,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x1100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 2375f861f12..576674cc334 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 03da20162ba..b80db9a8767 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index fb8c9251132..237bc43f5db 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index c97256d0ffe..702b3115682 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -18,6 +18,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00180000 CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y # CONFIG_CMD_FLASH is not set diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 7cb5662bd44..b3c447f834c 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index d1eb9419fbc..27c9e21bd53 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="OMAP Logic # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 # CONFIG_CMD_EEPROM is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 12dab49318f..18bb6a124db 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 545958a7900..3db9eb08b04 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -30,6 +30,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 46dbdd5c943..130806047b3 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -12,6 +12,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="twister => " # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00800000 CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index fbab610d7a7..e11527fcff6 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 4f3b605a968..7a811a0a2b6 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 598352b3ce7..d5413fd071d 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 6beb347a8b8..8acc771e3af 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 9688c4a7768..3dbbf67b5c6 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 f01783b8fdf..1874cd38e8e 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 5b249d1f67f..30c165cd774 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 1a58c6ef24f..9316a122788 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 0c395e5480e..d389058573b 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 4824941dc3b..6adbb8e7789 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 a87a75e3cc0..c6839013f27 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 4f8ce541448..5f9f8156fd6 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 e5ffb853811..795538bc883 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 bc4a59e1289..bfcf7900026 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 7f4f56f1716..d3c72f30b27 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 a76bbce9ff3..1c611677b79 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 c45ae87a414..80d480b1034 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) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 663c7adfa7c..e570f0ffe47 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -293,7 +293,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SPL_NAND_OFS CONFIG_CMD_SPL_WRITE_SIZE CONFIG_CMD_STRINGS CONFIG_CMD_SX151X -- GitLab