>>>>> "Tom" == Tom Rini <tr...@ti.com> writes:
Tom> Due to hardware design, we can't have NAND present (as we know of NAND Tom> today) when booting from SPI, so disable NAND then as that simplifies Tom> logic. Sorry, this description is not clear to me. I didn't check in detail, but as far as I remember the default pins for spi0 don't conflict with gmpc. It's also not quite clear to me if you refer to SW support for NAND flash or the hardware component when you say 'NAND' above. Tom> Signed-off-by: Tom Rini <tr...@ti.com> Tom> --- Tom> include/configs/am335x_evm.h | 9 +++++++-- Tom> 1 file changed, 7 insertions(+), 2 deletions(-) Tom> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h Tom> index 004a06a..90cc1f5 100644 Tom> --- a/include/configs/am335x_evm.h Tom> +++ b/include/configs/am335x_evm.h Tom> @@ -230,7 +230,9 @@ Tom> /* USB Device Firmware Update support */ Tom> #define CONFIG_DFU_FUNCTION Tom> #define CONFIG_DFU_MMC Tom> +#ifdef CONFIG_NAND Tom> #define CONFIG_DFU_NAND Tom> +#endif Tom> #define CONFIG_CMD_DFU Tom> #define DFU_ALT_INFO_MMC \ Tom> "boot part 0 1;" \ Tom> @@ -335,6 +337,7 @@ Tom> #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" Tom> #define CONFIG_SPL_BOARD_INIT Tom> +#ifdef CONFIG_NAND Tom> #define CONFIG_SPL_NAND_AM33XX_BCH Tom> #define CONFIG_SPL_NAND_SUPPORT Tom> #define CONFIG_SPL_NAND_BASE Tom> @@ -365,6 +368,7 @@ Tom> #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE Tom> #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 Tom> +#endif Tom> /* Tom> * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM Tom> @@ -466,7 +470,10 @@ Tom> #define CONFIG_PHY_ADDR 0 Tom> #define CONFIG_PHY_SMSC Tom> +#if !defined(CONFIG_SPI_BOOT) Tom> #define CONFIG_NAND Tom> +#endif Tom> + Tom> /* NAND support */ Tom> #ifdef CONFIG_NAND Tom> #define CONFIG_CMD_NAND Tom> @@ -484,11 +491,9 @@ Tom> /* CS0 */ Tom> #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND Tom> devices */ Tom> -#if !defined(CONFIG_SPI_BOOT) Tom> #define CONFIG_ENV_IS_IN_NAND Tom> #define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */ Tom> #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ Tom> #endif Tom> -#endif Tom> #endif /* ! __CONFIG_AM335X_EVM_H */ Tom> -- Tom> 1.7.9.5 Tom> _______________________________________________ Tom> U-Boot mailing list Tom> U-Boot@lists.denx.de Tom> http://lists.denx.de/mailman/listinfo/u-boot -- Bye, Peter Korsgaard _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
