diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-22 19:42:37 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-22 19:42:37 +0000 |
commit | 4bee3672dd6f29b9e89f0a4a570d585402114bbb (patch) | |
tree | 957eecad25f6915a618536cd1404cf1a7e913210 /target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch | |
parent | 1ccae0efc047862b02787fb9f1d25f2925f805b9 (diff) | |
download | upstream-4bee3672dd6f29b9e89f0a4a570d585402114bbb.tar.gz upstream-4bee3672dd6f29b9e89f0a4a570d585402114bbb.tar.bz2 upstream-4bee3672dd6f29b9e89f0a4a570d585402114bbb.zip |
brcm47xx: refresh patches with kernel 2.6.37-rc7
The deleted patches went upstream in 2.6.37-rc7
SVN-Revision: 24803
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch b/target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch deleted file mode 100644 index b2bdf744ce..0000000000 --- a/target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 12b15e5d5914d174e3411d0f0b3fd55dc1b5e55a Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Sat, 27 Nov 2010 00:34:02 +0100 -Subject: [PATCH 1/6] MIPS: BCM47xx: Do not read config from CFE - -The config options read out here are not stored in CFE, but only in -NVRAM on the devices. Remove reading from CFE and only access the NVRAM. -Reading out CFE does not harm, but is useless here. - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - arch/mips/bcm47xx/setup.c | 28 +++++++++------------------- - 1 files changed, 9 insertions(+), 19 deletions(-) - ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -32,7 +32,6 @@ - #include <asm/reboot.h> - #include <asm/time.h> - #include <bcm47xx.h> --#include <asm/fw/cfe/cfe_api.h> - #include <asm/mach-bcm47xx/nvram.h> - - struct ssb_bus ssb_bcm47xx; -@@ -82,42 +81,33 @@ static int bcm47xx_get_invariants(struct - /* Fill boardinfo structure */ - memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo)); - -- if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0 || -- nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0) - iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0); -- if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0 || -- nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) - iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0); -- if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0 || -- nvram_getenv("boardrev", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0) - iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0); - - /* Fill sprom structure */ - memset(&(iv->sprom), 0, sizeof(struct ssb_sprom)); - iv->sprom.revision = 3; - -- if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0 || -- nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0) - str2eaddr(buf, iv->sprom.et0mac); - -- if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0 || -- nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0) - str2eaddr(buf, iv->sprom.et1mac); - -- if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 || -- nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0) - iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 0); - -- if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 || -- nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0) - iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 0); - -- if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0 || -- nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0) - iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10); - -- if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0 || -- nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0) -+ if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0) - iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10); - - return 0; |