aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-12-10 18:29:26 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-12-10 18:29:26 +0000
commit960130e99c8ecc6a914c815d303bf00a7e0731f1 (patch)
tree7923f17b65afdc52387f126517daa8eabdade93d /target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
parentfa5f896cb7eedd142e2a1916a4b664f7d2f43d04 (diff)
downloadupstream-960130e99c8ecc6a914c815d303bf00a7e0731f1.tar.gz
upstream-960130e99c8ecc6a914c815d303bf00a7e0731f1.tar.bz2
upstream-960130e99c8ecc6a914c815d303bf00a7e0731f1.zip
bcm53xx: clean up nvram header
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43606
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch27
1 files changed, 14 insertions, 13 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch b/target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
index 38925cf346..410ea26a32 100644
--- a/target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
+++ b/target/linux/bcm53xx/patches-3.18/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
@@ -328,22 +328,12 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/include/linux/bcm47xx_nvram.h
+++ b/include/linux/bcm47xx_nvram.h
-@@ -15,9 +15,11 @@
+@@ -14,19 +14,24 @@
+
#include <linux/types.h>
#include <linux/kernel.h>
-
++
+struct device;
-+
- struct nvram_header {
- u32 magic;
-- u32 len;
-+ __le32 len;
- u32 crc_ver_init; /* 0:7 crc, 8:15 ver, 16:31 sdram_init */
- u32 config_refresh; /* 0:15 sdram_config, 16:31 sdram_refresh */
- u32 config_ncdl; /* ncdl values for memc */
-@@ -33,18 +35,21 @@ struct nvram_header {
- #define NVRAM_MAX_VALUE_LEN 255
- #define NVRAM_MAX_PARAM_LEN 64
-#ifdef CONFIG_BCM47XX
-int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
@@ -368,3 +358,14 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
{
return -ENXIO;
}
+--- a/drivers/misc/bcm47xx-nvram.c
++++ b/drivers/misc/bcm47xx-nvram.c
+@@ -28,7 +28,7 @@
+
+ struct nvram_header {
+ u32 magic;
+- u32 len;
++ __le32 len;
+ u32 crc_ver_init; /* 0:7 crc, 8:15 ver, 16:31 sdram_init */
+ u32 config_refresh; /* 0:15 sdram_config, 16:31 sdram_refresh */
+ u32 config_ncdl; /* ncdl values for memc */