diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2012-07-25 14:52:00 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-07-25 14:52:00 +0000 |
commit | 22ec767935be9f6d8681fbe155baf7935ce9ce06 (patch) | |
tree | f4d47ebfdd09178c198a3da734e4e08b4a69d749 /target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch | |
parent | 518908b8492da96f6c1bf081dc3aea2f702fcc78 (diff) | |
download | master-187ad058-22ec767935be9f6d8681fbe155baf7935ce9ce06.tar.gz master-187ad058-22ec767935be9f6d8681fbe155baf7935ce9ce06.tar.bz2 master-187ad058-22ec767935be9f6d8681fbe155baf7935ce9ce06.zip |
brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32845 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch b/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch index 9839ef8f40..2b1516d27d 100644 --- a/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch +++ b/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch @@ -4,8 +4,8 @@ # under Linux. # --obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o -+obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o bus.o +-obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o ++obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o bus.o obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o --- /dev/null +++ b/arch/mips/bcm47xx/bus.c @@ -103,7 +103,7 @@ static void bcm47xx_machine_restart(char *command) { printk(KERN_ALERT "Please stand by while rebooting the system...\n"); -@@ -291,6 +293,9 @@ static void __init bcm47xx_register_ssb( +@@ -137,6 +139,9 @@ static void __init bcm47xx_register_ssb( if (err) panic("Failed to initialize SSB bus (err %d)", err); @@ -113,16 +113,16 @@ mcore = &bcm47xx_bus.ssb.mipscore; if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { if (strstr(buf, "console=ttyS1")) { -@@ -315,6 +320,9 @@ static void __init bcm47xx_register_bcma - err = bcma_host_soc_register(&bcm47xx_bus.bcma); +@@ -195,6 +200,9 @@ static void __init bcm47xx_register_bcma if (err) panic("Failed to initialize BCMA bus (err %d)", err); -+ + + if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_SFLASH) + bcm47xx_sflash_struct_bcma_init(&bcm47xx_sflash, &bcm47xx_bus.bcma.bus.drv_cc); ++ + bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); } #endif - --- /dev/null +++ b/arch/mips/include/asm/mach-bcm47xx/bus.h @@ -0,0 +1,36 @@ |