Clean up the nvram reading code and add support for different nvram sizes. This depends on patch "MIPS: bcm47xx: separate functions finding flash window addr" by Rafał Miłeck, Patchwork: https://patchwork.linux-mips.org/patch/4738/ Hauke Mehrtens (6): MIPS: BCM47XX: use common error codes in nvram reads MIPS: BCM47XX: return error when init of nvram failed MIPS: BCM47XX: nvram add nand flash support MIPS: BCM47XX: rename early_nvram_init to nvram_init MIPS: BCM47XX: handle different nvram sizes MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names arch/mips/bcm47xx/nvram.c | 98 ++++++++++++++------ arch/mips/bcm47xx/setup.c | 6 +- arch/mips/bcm47xx/sprom.c | 10 +- .../asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} | 13 +-- drivers/mtd/bcm47xxpart.c | 2 +- drivers/net/ethernet/broadcom/b44.c | 4 +- drivers/ssb/driver_chipcommon_pmu.c | 4 +- include/linux/ssb/ssb_driver_gige.h | 6 +- 8 files changed, 92 insertions(+), 51 deletions(-) rename arch/mips/include/asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} (84%) -- 1.7.10.4