2009-06-10 01:46:12

by Greg Ungerer

[permalink] [raw]
Subject: Re: [uClinux-dev] [PATCH 1/2] mtd/maps: uclinux: fix building when partition support is disabled


Mike Frysinger wrote:
> From: Timofei Bondarenko <[email protected]>
>
> The uClinux map driver doesn't even use partitions, so we shouldn't require
> it in order to work properly.
>
> Signed-off-by: Timofei Bondarenko <[email protected]>
> Signed-off-by: Mike Frysinger <[email protected]>
> Signed-off-by: Sonic Zhang <[email protected]>
> CC: Greg Ungerer <[email protected]>

Acked-by: Greg Ungerer <[email protected]>


> CC: [email protected]
> CC: [email protected]
> ---
> drivers/mtd/maps/uclinux.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
> index 81756e3..57699c2 100644
> --- a/drivers/mtd/maps/uclinux.c
> +++ b/drivers/mtd/maps/uclinux.c
> @@ -87,7 +87,11 @@ static int __init uclinux_mtd_init(void)
> mtd->priv = mapp;
>
> uclinux_ram_mtdinfo = mtd;
> +#ifdef CONFIG_MTD_PARTITIONS
> add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
> +#else
> + add_mtd_device(mtd);
> +#endif
>
> return(0);
> }
> @@ -97,7 +101,11 @@ static int __init uclinux_mtd_init(void)
> static void __exit uclinux_mtd_cleanup(void)
> {
> if (uclinux_ram_mtdinfo) {
> +#ifdef CONFIG_MTD_PARTITIONS
> del_mtd_partitions(uclinux_ram_mtdinfo);
> +#else
> + del_mtd_device(uclinux_ram_mtdinfo);
> +#endif
> map_destroy(uclinux_ram_mtdinfo);
> uclinux_ram_mtdinfo = NULL;
> }

--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: [email protected]
SnapGear Group, McAfee PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com