From: Adam Ford Date: Sun, 13 Aug 2017 13:21:39 +0000 (-0500) Subject: omap3_logic: Move CONFIG_SYS_NAND_U_BOOT_OFFS to Kconfig X-Git-Tag: v2017.09-rc4~29 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db35573a71aa4033cfba44b098892d129fa66333;p=oweals%2Fu-boot.git 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 --- diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index ffb325eb44..8d0a4d48e4 100644 --- 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 b8821d1f78..a4a40f4e48 100644 --- 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"