From 960130e99c8ecc6a914c815d303bf00a7e0731f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 10 Dec 2014 18:29:26 +0000 Subject: bcm53xx: clean up nvram header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 43606 --- ...vram-add-new-nvram-driver-with-dt-support.patch | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'target/linux/bcm53xx/patches-3.18') 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 --- a/include/linux/bcm47xx_nvram.h +++ b/include/linux/bcm47xx_nvram.h -@@ -15,9 +15,11 @@ +@@ -14,19 +14,24 @@ + #include #include - ++ +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 { 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 */ -- cgit v1.2.3