Convert CONFIG_SYS_NAND_SPL_KERNEL_OFFS to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_NAND_SPL_KERNEL_OFFS

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 71b2600df586f39eebedcd81e04b86714a336691..05049c1ffd7ce2c4bfebbef4e6f77374d80f9ebd 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1196,6 +1196,10 @@ config SYS_SPL_ARGS_ADDR
          Address in memory where the 'args' file, typically a device tree
          will be loaded in to memory.
 
+config SYS_NAND_SPL_KERNEL_OFFS
+       hex "Address in memory to load the OS file for Falcon mode to"
+       depends on SPL_OS_BOOT && SPL_NAND_SUPPORT
+
 if SPL_OS_BOOT
 config SYS_OS_BASE
        hex "addr, where OS is found"

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index e1c19c11d31117797438a253a7d3e6ce24c7c6fe..8a5beabd6d20262f31e066cc17ff1e2cfb851024 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_NET=y
 CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x200000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SPL_USB_GADGET=y

diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
index f640cc47a8fdff225790122b078471cb0c230b0f..78469d7154fab0c3310595e50e270a5f63fcdaab 100644 (file)
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -40,6 +40,7 @@ CONFIG_SPL_UBI_LOAD_MONITOR_ID=0
 CONFIG_SPL_UBI_LOAD_KERNEL_ID=3
 CONFIG_SPL_UBI_LOAD_ARGS_ID=4
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SPL_POWER=y

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 05ee3570fc939b2885e180aeca5b36c6e3c8a9ca..f6baee0a2b2b31c664a79b00b3655bffa20673bd 100644 (file)
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -32,6 +32,7 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x2a0000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 # CONFIG_SPL_POWER is not set

diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index ebfb018d2de4f95c051f54a5ff1cd1b6a48b55f1..0825ea1636d18d3931a7f3ee26c5d77d2c2051f5 100644 (file)
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -29,6 +29,7 @@ CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_NET=y
 CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x300000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SPL_USB_HOST=y

diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
index 5e6975129e7bdfe2c02d8a0ae1b18b02c4e99199..0cdc4018cfc811db2f781f1e140919c3bb68813d 100644 (file)
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -26,6 +26,7 @@ CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x300000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 429ab732e127bdd1873bcca0bd9d1074e5d314b7..963cb93545c0764e33ae83693f954d2f54eee3a4 100644 (file)
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -25,6 +25,7 @@ CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x300000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SPL_USB_HOST=y

diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index dc07c146bdb2cad8993fa4dcc500ff5c00844ec5..f8a98531f377d1d41ae758b99fc896147d6df5dc 100644 (file)
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -23,6 +23,7 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x80000100
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x500
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 5922e86d7a6db31dd5198488455a102587ccae48..fdd89e6f555b354cec51350e0f3c6cf94dcb71b0 100644 (file)
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -39,6 +39,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x200000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SPL_RAM_SUPPORT=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 200ecf4a0f93322a24607081c8dcb39cecbc4a34..68ffe3e847ea4de7a73f0e0e41e05b16d7a263bf 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -48,6 +48,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x1200000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_POWER=y

diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 96f2f9df8160762373d74abc95d4f7628c1946ee..3b65a22513c5565eab1a07743646ef0429f28513 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -42,6 +42,7 @@ CONFIG_SPL_UBI_LOAD_ARGS_ID=4
 CONFIG_SPL_ONENAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
index cc7a6f0aa097ad50b87ca44202f826d2579b4562..df4c1c1f950a21a05c33604387cfd9ac582f0bd5 100644 (file)
--- a/configs/imx6q_logic_defconfig
+++ b/configs/imx6q_logic_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x500000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_USB_HOST=y

diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index 6efc50fdf5e955767a679cf58cbd9b7d1e9c28ce..a8d789e11e9c5fbb4529abd5d0a5a45e6da46d19 100644 (file)
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -36,6 +36,7 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SYS_PROMPT="OMAP Logic # "

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 3ea4d7a724ef53bbb548c12b9211c9b43813186a..5264f4bc5ebd659e351e7afb334110569e6c0323 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -37,6 +37,7 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 # CONFIG_SPL_POWER is not set

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 5c7d30d66ed0a0a7b06cff274a20f9d56c241bb0..292b4650656f58b11096f51504884ca9a6219c20 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SYS_PROMPT="OMAP Logic # "

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index 9961e005a07a24858ad955e9d579f8013457e3bb..aee7589b9c3b1833e03cc7ed3b38844e3352119a 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -37,6 +37,7 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x280000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 # CONFIG_SPL_POWER is not set

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 78b359dcea9300fa3e8790e9bb034780f3b461c8..3e98e5c66531013a3465fd654cd1e08c0ba15d2d 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -193,10 +193,6 @@
 
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
-/* NAND: SPL related configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000 /* kernel offset */
-#endif
 #endif /* !CONFIG_MTD_RAW_NAND */
 
 /* USB Device Firmware Update support */

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 1848aecb3901cedac1f53d091b9e920c1554cdc0..b896f962f080e78cc689f932d236849bb38e6e6e 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -28,7 +28,6 @@
 #define CONFIG_SYS_NAND_MAX_OOBFREE    2
 #define CONFIG_SYS_NAND_MAX_ECCPOS     56
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
 /* NAND block size is 128 KiB.  Synchronize these values with
  * corresponding Device Tree entries in Linux:
  *  MLO(SPL)             4 * NAND_BLOCK_SIZE = 512 KiB  @ 0x000000

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index bce035531ce6055cdbc7573fe67441a9bf292b2d..665ace5b01bc52449db58cc927bd5fd29f5f458f 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -151,11 +151,6 @@
                        }
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       26
-/* NAND: SPL related configs */
-/* NAND: SPL falcon mode configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00300000 /* kernel offset */
-#endif
 #define NANDARGS \
        "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index b98d4ab68ad29b2fff2836cec06e748c4677dce4..240089318cc10bc59b47d4e47810831a298a7c24 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -33,10 +33,6 @@
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x80    /* address 0x10000 */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
 
-/* NAND */
-#ifdef CONFIG_MTD_RAW_NAND
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS                0x140000
-#endif /* CONFIG_MTD_RAW_NAND */
 #endif /* CONFIG_SPL_OS_BOOT */
 
 #ifdef CONFIG_MTD_RAW_NAND

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index ad2e88189075ee50ef0a14d7d9defe8dc68065a2..b3ccc3cac3dac576204be4c1034faa69730e9401 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -86,9 +86,6 @@
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x500000
-#endif
 
 /* GPIO pin + bank to pin ID mapping */
 #define GPIO_PIN(_bank, _pin)          ((_bank << 5) + _pin)

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 2a3daea9f2539f08951f8596017bf9d92102d3ba..d5d1c68bdaaf7e8bbd51b8fec30eae708ab98fad 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -116,9 +116,6 @@
 
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    0x200000
 
-/* SPL OS boot options */
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
-
 #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 */

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 9f685b19879174de41a145d16ed25a5d61afe588..9247720f8b6d8660ed0977f7467ac7edf76641a0 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -84,11 +84,6 @@
                                         50, 51, 52, 53, 54, 55, 56, 57, }
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
-/* NAND: SPL related configs */
-/* NAND: SPL falcon mode configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000 /* kernel offset */
-#endif
 #endif /* !CONFIG_MTD_RAW_NAND */
 
 /* Parallel NOR Support */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 2e6b9523f45b27d4ab6f3422bd9dc66d58de68c9..c07e48629bb2a37dc807ec313b744de411946c0a 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -11,9 +11,6 @@
 
 /* Falcon Mode */
 
-/* Falcon Mode - NAND support: args@17MB kernel@18MB */
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        (18 * SZ_1M)
-
 /* 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)

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 324016a53b24ccb6b4996e5f1ca9e08fe648a443..8019dfc0a71f900fbcafa664216e9c3ec42746bc 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -119,7 +119,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00500000
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 158773acedb997c854bfa034e7e1895592976537..ab742798b92b0069a4a036ffd5154d8ad6064503 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -28,9 +28,6 @@
 #define CONFIG_SYS_NAND_ECCBYTES        3
 #define CONFIG_SYS_ENV_SECT_SIZE        SZ_128K
 /* NAND: SPL falcon mode configs */
-#if defined(CONFIG_SPL_OS_BOOT)
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
-#endif /* CONFIG_SPL_OS_BOOT */
 #endif /* CONFIG_MTD_RAW_NAND */
 
 /* Enable Multi Bus support for I2C */

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index eeb9ef8c741a7060aa5ef76a4e8ea77c3fdd019b..9c4e172d037df00d68b8c8ef6b2e806c95c208f0 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -32,10 +32,6 @@
 #define CONFIG_SYS_NAND_ECCSIZE         512
 #define CONFIG_SYS_NAND_ECCBYTES        3
 #define CONFIG_SYS_ENV_SECT_SIZE        SZ_128K
-/* NAND: SPL falcon mode configs */
-#if defined(CONFIG_SPL_OS_BOOT)
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
-#endif /* CONFIG_SPL_OS_BOOT */
 #endif /* CONFIG_MTD_RAW_NAND */
 
 #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 4112e5570f6a625d18ab19502d4e4cbf56963f8f..12e502cd3640a762f09e470002bae3887fc9d153 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -158,11 +158,4 @@
 
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
 
-/* Defines for SPL */
-
-/* NAND: SPL falcon mode configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
-#endif
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index af6f7e14dfde195fe3acd82e2fab4770d43706d2..7fa911620e11c31d33752009f606f56b622759d5 100644 (file)
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -97,10 +97,6 @@
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
 
-/* NAND: SPL related configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000 /* kernel offset */
-#endif
 #endif /* !CONFIG_MTD_RAW_NAND */
 
 /* CPU */

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 073520bd5e5f80e0e098c1e612342340d0f002ff..3bb53a0dd1b5d7bb07e1d6975cd7ce49521349b8 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -58,9 +58,4 @@
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
 /* U-Boot proper stored by default at 0x200 (256 KiB) */
 
-/* Falcon boot support on FAT on MMC */
-
-/* Falcon boot support on raw NAND */
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS                0x1a0000
-
 #endif