From: Roger Quadros Date: Fri, 5 Jun 2015 09:42:20 +0000 (+0300) Subject: am335x_evm: am44xx_evm: dra7xx_evm: nand: Fix file-system partition name X-Git-Tag: v2015.07-rc3~61 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9ddef489c4c11dc54dc4896f75a877c8944dedad;p=oweals%2Fu-boot.git am335x_evm: am44xx_evm: dra7xx_evm: nand: Fix file-system partition name We almost always use UBIFS for user accessible NAND file systems and the UBIFS file system might contain more than one volume within the single NAND partition. The last NAND partition is therefore more appropriately named as "NAND.file-system" instead of "NAND.rootfs" The Linux kernel (as of v3.16) also uses "NAND.file-system" to name the last NAND partition. This patch makes the partition name consistent between u-boot and the kernel. Signed-off-by: Roger Quadros Reviewed-by: Tom Rini --- diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 8da3325b7e..1c6cbd787d 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -248,7 +248,7 @@ "128k(NAND.u-boot-env)," \ "128k(NAND.u-boot-env.backup1)," \ "8m(NAND.kernel)," \ - "-(NAND.rootfs)" + "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_NAND diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index d4f4c236a9..482a99a9b1 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -378,7 +378,7 @@ "256k(NAND.u-boot-env)," \ "256k(NAND.u-boot-env.backup1)," \ "7m(NAND.kernel)," \ - "-(NAND.rootfs)" + "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00180000 /* NAND: SPL related configs */ #ifdef CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index afcc36bb25..edd51a22bd 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -252,7 +252,7 @@ "128k(NAND.u-boot-env)," \ "128k(NAND.u-boot-env.backup1)," \ "8m(NAND.kernel)," \ - "-(NAND.rootfs)" + "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ #ifdef CONFIG_SPL_NAND_SUPPORT