omap3_logic: Move CONFIG_SYS_NAND_U_BOOT_OFFS to Kconfig

Manually enable SYS_NAND_U_BOOT_LOCATIONS.
Set CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 and remove it from header

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index ffb325eb4468015407d25b80bc45e72ae607aef6..8d0a4d48e4157e3abdd970431a80eb214782a792 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -38,6 +38,8 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP36XX_PINS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
+CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index b8821d1f7856cb1fc21710df2f969ef67e71f7ef..a4a40f4e4862d411b4655229d2b3de3a3be158a3 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -90,7 +90,6 @@
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
 #define CONFIG_SYS_NAND_MAX_OOBFREE    2
 #define CONFIG_SYS_NAND_MAX_ECCPOS     56
-#define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS          /* required for UBI partition support */
 #define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"