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 --- configs/omap3_logic_defconfig | 4 +++- include/configs/omap3_logic.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 464a41f..8d382f7 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -22,10 +22,10 @@ CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x240000 # CONFIG_CMD_EEPROM is not set # CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_USB is not set -# CONFIG_CMD_FPGA is not set CONFIG_CMD_CACHE=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y @@ -36,6 +36,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_USB=y CONFIG_USB_MUSB_GADGET=y diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 5490fc9..c939003 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -97,7 +97,6 @@ #define CONFIG_BCH #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"