Give the user the ability to disable NAND support by defining
CONFIG_NO_NAND. This will allow custom hardware to easily support
this configuration.
Signed-off-by: Justin Waters <justin.wat...@timesys.com>
---
boards.cfg | 16 +++++++-------
include/configs/am335x_evm.h | 49 ++++++++++++++++++++++++++----------------
2 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/boards.cfg b/boards.cfg
index c0c4282..c0cf446 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -241,14 +241,14 @@ integratorcp_cm946es arm arm946es
integrator armltd
vexpress_ca15_tc2 arm armv7 vexpress armltd
vexpress_ca5x2 arm armv7 vexpress armltd
vexpress_ca9x4 arm armv7 vexpress armltd
-am335x_evm arm armv7 am335x ti
am33xx am335x_evm:SERIAL1,CONS_INDEX=1
-am335x_evm_spiboot arm armv7 am335x ti
am33xx am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT
-am335x_evm_uart1 arm armv7 am335x ti
am33xx am335x_evm:SERIAL2,CONS_INDEX=2
-am335x_evm_uart2 arm armv7 am335x ti
am33xx am335x_evm:SERIAL3,CONS_INDEX=3
-am335x_evm_uart3 arm armv7 am335x ti
am33xx am335x_evm:SERIAL4,CONS_INDEX=4
-am335x_evm_uart4 arm armv7 am335x ti
am33xx am335x_evm:SERIAL5,CONS_INDEX=5
-am335x_evm_uart5 arm armv7 am335x ti
am33xx am335x_evm:SERIAL6,CONS_INDEX=6
-am335x_evm_usbspl arm armv7 am335x ti
am33xx am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT
+am335x_evm arm armv7 am335x ti
am33xx am335x_evm:SERIAL1,CONS_INDEX=1,NAND
+am335x_evm_spiboot arm armv7 am335x ti
am33xx am335x_evm:SERIAL1,CONS_INDEX=1,NAND,SPI_BOOT
+am335x_evm_uart1 arm armv7 am335x ti
am33xx am335x_evm:SERIAL2,CONS_INDEX=2,NAND
+am335x_evm_uart2 arm armv7 am335x ti
am33xx am335x_evm:SERIAL3,CONS_INDEX=3,NAND
+am335x_evm_uart3 arm armv7 am335x ti
am33xx am335x_evm:SERIAL4,CONS_INDEX=4,NAND
+am335x_evm_uart4 arm armv7 am335x ti
am33xx am335x_evm:SERIAL5,CONS_INDEX=5,NAND
+am335x_evm_uart5 arm armv7 am335x ti
am33xx am335x_evm:SERIAL6,CONS_INDEX=6,NAND
+am335x_evm_usbspl arm armv7 am335x ti
am33xx am335x_evm:SERIAL1,CONS_INDEX=1,NAND,SPL_USBETH_SUPPORT
ti814x_evm arm armv7 ti814x ti
am33xx
pcm051 arm armv7 pcm051
phytec am33xx pcm051
sama5d3xek_mmc arm armv7 sama5d3xek atmel
at91 sama5d3xek:SAMA5D3,SYS_USE_MMC
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index c5a6d4b..c53bc21 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -48,6 +48,27 @@
#define CONFIG_CMD_ASKENV
#define CONFIG_VERSION_VARIABLE
+#ifdef CONFIG_NAND
+#define NANDARGS \
+ "mtdids=" MTDIDS_DEFAULT "\0" \
+ "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "nandargs=setenv bootargs console=${console} " \
+ "${optargs} " \
+ "root=${nandroot} " \
+ "rootfstype=${nandrootfstype}\0" \
+ "dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \
+ "nandroot=ubi0:rootfs rw ubi.mtd=7,2048\0" \
+ "nandrootfstype=ubifs rootwait=1\0" \
+ "nandsrcaddr=0x280000\0" \
+ "nandboot=echo Booting from nand ...; " \
+ "run nandargs; " \
+ "nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
+ "bootm ${loadaddr}\0" \
+ "nandimgsize=0x500000\0"
+#else
+#define NANDARGS ""
+#endif
+
/* set to negative value for no autoboot */
#define CONFIG_BOOTDELAY 1
#define CONFIG_ENV_VARS_UBOOT_CONFIG
@@ -63,19 +84,12 @@
"fdtfile=undefined\0" \
"console=ttyO0,115200n8\0" \
"optargs=\0" \
- "mtdids=" MTDIDS_DEFAULT "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
"dfu_alt_info_mmc=" DFU_ALT_INFO_MMC "\0" \
"dfu_alt_info_emmc=rawemmc mmc 0 3751936\0" \
- "dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
"bootpart=0:2\0" \
- "nandroot=ubi0:rootfs rw ubi.mtd=7,2048\0" \
- "nandrootfstype=ubifs rootwait=1\0" \
- "nandsrcaddr=0x280000\0" \
- "nandimgsize=0x500000\0" \
"rootpath=/export/rootfs\0" \
"nfsopts=nolock\0" \
"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
@@ -86,10 +100,6 @@
"${optargs} " \
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "nandargs=setenv bootargs console=${console} " \
- "${optargs} " \
- "root=${nandroot} " \
- "rootfstype=${nandrootfstype}\0" \
"spiroot=/dev/mtdblock4 rw\0" \
"spirootfstype=jffs2\0" \
"spisrcaddr=0xe0000\0" \
@@ -118,10 +128,6 @@
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"bootm ${loadaddr} - ${fdtaddr}\0" \
- "nandboot=echo Booting from nand ...; " \
- "run nandargs; " \
- "nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
- "bootm ${loadaddr}\0" \
"spiboot=echo Booting from spi ...; " \
"run spiargs; " \
"sf probe ${spibusno}:0; " \
@@ -147,7 +153,8 @@
"if test $board_name = A335X_SK; then " \
"setenv fdtfile am335x-evmsk.dtb; fi; " \
"if test $fdtfile = undefined; then " \
- "echo WARNING: Could not determine device tree to use;
fi; \0"
+ "echo WARNING: Could not determine device tree to use;
fi; \0" \
+ NANDARGS
#endif
#define CONFIG_BOOTCOMMAND \
@@ -231,7 +238,6 @@
/* USB Device Firmware Update support */
#define CONFIG_DFU_FUNCTION
#define CONFIG_DFU_MMC
-#define CONFIG_DFU_NAND
#define CONFIG_CMD_DFU
#define DFU_ALT_INFO_MMC \
"boot part 0 1;" \
@@ -241,6 +247,8 @@
"u-boot.img.raw mmc 300 3C0;" \
"u-boot.img fat 0 1;" \
"uEnv.txt fat 0 1"
+#ifdef CONFIG_NAND
+#define CONFIG_DFU_NAND
#define DFU_ALT_INFO_NAND \
"SPL part 0 1;" \
"SPL.backup1 part 0 2;" \
@@ -249,6 +257,7 @@
"u-boot part 0 5;" \
"kernel part 0 7;" \
"rootfs part 0 8"
+#endif
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
@@ -337,9 +346,11 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 8 /* 4KB */
/* nand */
+#ifdef CONFIG_NAND
#define CONFIG_CMD_SPL_NAND_OFS 0x240000 /* end of
u-boot */
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
#define CONFIG_CMD_SPL_WRITE_SIZE 0x1000
+#endif
/* spl export command */
#define CONFIG_CMD_SPL
@@ -369,6 +380,8 @@
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
+
+#ifdef CONFIG_NAND
#define CONFIG_SPL_NAND_AM33XX_BCH
#define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_NAND_BASE
@@ -395,6 +408,7 @@
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
+#endif
/*
* 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
@@ -490,7 +504,6 @@
#define CONFIG_PHY_ADDR 0
#define CONFIG_PHY_SMSC
-#define CONFIG_NAND
/* NAND support */
#ifdef CONFIG_NAND
#define CONFIG_CMD_NAND
--
1.7.9.6
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
