aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
blob: fea2854b8280828ccba582b4dded801b3f7efd76 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From cd68d1b12b5ea4c01a664c064179ada42bf55d3d Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 15 May 2014 20:55:42 +0200
Subject: [PATCH 5/5] ubi: set ROOT_DEV to ubiblock "rootfs" if unset
To: openwrt-devel@lists.openwrt.org

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 drivers/mtd/ubi/block.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -50,6 +50,7 @@
 #include <linux/scatterlist.h>
 #include <linux/idr.h>
 #include <asm/div64.h>
+#include <linux/root_dev.h>
 
 #include "ubi-media.h"
 #include "ubi.h"
@@ -447,6 +448,15 @@ int ubiblock_create(struct ubi_volume_in
 	add_disk(dev->gd);
 	dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
 		 dev->ubi_num, dev->vol_id, vi->name);
+
+	if (!strcmp(vi->name, "rootfs") &&
+	    IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
+	    ROOT_DEV == 0) {
+		pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n",
+			  dev->ubi_num, dev->vol_id, vi->name);
+		ROOT_DEV = MKDEV(gd->major, gd->first_minor);
+	}
+
 	return 0;
 
 out_free_queue:
HTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. // Copyright (C) 2002 Andrew Lunn // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free // Software Foundation; either version 2 or (at your option) any later version. // // eCos is distributed in the hope that it will be useful, but WITHOUT ANY // WARRANTY; without even the implied warranty of MERCHANTABILITY or // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. // // You should have received a copy of the GNU General Public License along // with eCos; if not, write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. // // As a special exception, if other files instantiate templates or use macros // or inline functions from this file, or you compile this file and link it // with other works to produce a work based on this file, this file does not // by itself cause the resulting work to be covered by the GNU General Public // License. However the source code for this file must still be made available // in accordance with section (3) of the GNU General Public License. // // This exception does not invalidate any other reasons why a work based on // this file might be covered by the GNU General Public License. // // Alternative licenses for eCos may be arranged by contacting Red Hat, Inc. // at http://sources.redhat.com/ecos/ecos-license/ // ------------------------------------------- //####ECOSGPLCOPYRIGHTEND#### //========================================================================== //#####DESCRIPTIONBEGIN#### // // Author(s): Andrew Lunn // Contributors: Andrew Lunn // Date: 2002-08-06 // Purpose: // Description: // // This code is part of eCos (tm). // //####DESCRIPTIONEND#### // //========================================================================== #ifndef _SERVICES_CRC_CRC_H_ #define _SERVICES_CRC_CRC_H_ #if 0 #include <cyg/infra/cyg_type.h> #else #include <stdint.h> typedef uint32_t cyg_uint32; typedef uint16_t cyg_uint16; #endif #ifndef __externC # ifdef __cplusplus # define __externC extern "C" # else # define __externC extern # endif #endif // Compute a CRC, using the POSIX 1003 definition __externC cyg_uint32 cyg_posix_crc32(unsigned char *s, int len); // Gary S. Brown's 32 bit CRC __externC cyg_uint32 cyg_crc32(unsigned char *s, int len); // Gary S. Brown's 32 bit CRC, but accumulate the result from a // previous CRC calculation __externC cyg_uint32 cyg_crc32_accumulate(cyg_uint32 crc, unsigned char *s, int len); // Ethernet FCS Algorithm __externC cyg_uint32 cyg_ether_crc32(unsigned char *s, int len); // Ethernet FCS algorithm, but accumulate the result from a previous // CRC calculation. __externC cyg_uint32 cyg_ether_crc32_accumulate(cyg_uint32 crc, unsigned char *s, int len); // 16 bit CRC with polynomial x^16+x^12+x^5+1 __externC cyg_uint16 cyg_crc16(unsigned char *s, int len); #endif // _SERVICES_CRC_CRC_H_