Skip to content

Commit

Permalink
kernel: rework bcm47xx backport, fix build errors on the brcm47xx tar…
Browse files Browse the repository at this point in the history
…get (#21974)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48925 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information
nbd committed Mar 5, 2016
1 parent efc26cc commit c75367d
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 52 deletions.
49 changes: 49 additions & 0 deletions target/linux/generic/files/include/linux/bcm47xx_nvram.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* This program 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 of the License, or (at your
* option) any later version.
*/

#ifndef __BCM47XX_NVRAM_H
#define __BCM47XX_NVRAM_H

#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/vmalloc.h>

#if defined(CONFIG_BCM47XX_NVRAM) || defined(CONFIG_BCM47XX)
int bcm47xx_nvram_init_from_mem(u32 base, u32 lim);
int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
int bcm47xx_nvram_gpio_pin(const char *name);
char *bcm47xx_nvram_get_contents(size_t *val_len);
static inline void bcm47xx_nvram_release_contents(char *nvram)
{
vfree(nvram);
};
#else
static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
{
return -ENOTSUPP;
};
static inline int bcm47xx_nvram_getenv(const char *name, char *val,
size_t val_len)
{
return -ENOTSUPP;
};
static inline int bcm47xx_nvram_gpio_pin(const char *name)
{
return -ENOTSUPP;
};

static inline char *bcm47xx_nvram_get_contents(size_t *val_len)
{
return NULL;
};

static inline void bcm47xx_nvram_release_contents(char *nvram)
{
};
#endif

#endif /* __BCM47XX_NVRAM_H */
52 changes: 0 additions & 52 deletions target/linux/generic/patches-3.18/030-backport_bcm47xx_nvram.patch

This file was deleted.

0 comments on commit c75367d

Please sign in to comment.