Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / at91sam9x5ek.h

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 915714f0299ba5dfbfc61097d141ac98a1869caf..f9e5a4a707e41384819b468ae3a282d15c2aa3db 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -195,8 +195,7 @@
 #define CONFIG_BOOTCOMMAND     "nand read " \
                                "0x22000000 0x200000 0x300000; " \
                                "bootm 0x22000000"
 #define CONFIG_BOOTCOMMAND     "nand read " \
                                "0x22000000 0x200000 0x300000; " \
                                "bootm 0x22000000"

-#else
-#ifdef CONFIG_SYS_USE_SPIFLASH
+#elif defined(CONFIG_SYS_USE_SPIFLASH)

 /* bootstrap + u-boot + env + linux in spi flash */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET      0x5000
 /* bootstrap + u-boot + env + linux in spi flash */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET      0x5000


@@ -206,14 +205,28 @@
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x100000 0x300000; " \
                                "bootm 0x22000000"
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x100000 0x300000; " \
                                "bootm 0x22000000"

-#endif
+#else /* CONFIG_SYS_USE_MMC */
+/* bootstrap + u-boot + env + linux in mmc */
+#define CONFIG_ENV_IS_IN_MMC
+/* For FAT system, most cases it should be in the reserved sector */
+#define CONFIG_ENV_OFFSET      0x2000
+#define CONFIG_ENV_SIZE                0x1000
+#define CONFIG_SYS_MMC_ENV_DEV 0

 #endif
 
 #endif
 

+#ifdef CONFIG_SYS_USE_MMC
+#define CONFIG_BOOTARGS                "mem=128M console=ttyS0,115200 " \
+                               "mtdparts=atmel_nand:" \
+                               "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
+                               "root=/dev/mmcblk0p2 " \
+                               "rw rootfstype=ext4 rootwait"
+#else

 #define CONFIG_BOOTARGS                "mem=128M console=ttyS0,115200 " \
                                "mtdparts=atmel_nand:" \
                                "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
                                "root=/dev/mtdblock1 rw " \
                                "rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"
 #define CONFIG_BOOTARGS                "mem=128M console=ttyS0,115200 " \
                                "mtdparts=atmel_nand:" \
                                "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
                                "root=/dev/mtdblock1 rw " \
                                "rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"

+#endif

 
 #define CONFIG_BAUDRATE                115200
 
 
 #define CONFIG_BAUDRATE                115200