From c9f6a369b7c9b95c7bb1c9cd749850d51b6213ab Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Tue, 9 Aug 2016 11:24:42 +0200 Subject: [PATCH] sama5d2_xplained: ensure proper bootargs are defined The sama5d2_xplained doesn't have a NAND flash and the rootfs always end up on the MMC. Ensure we always try to boot from there. Signed-off-by: Alexandre Belloni --- include/configs/sama5d2_xplained.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 5df2c32bde1..3bbf0fe3c08 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -123,7 +123,10 @@ #undef CONFIG_BOOTARGS #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait" - +#else +#undef CONFIG_BOOTARGS +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p1 rw rootwait" #endif /* SPL */