Commit Graph

27 Commits (1cb763c559b81a7c38eadffcf1f6c6d3cde72153)

Author SHA1 Message Date
Jo-Philipp Wich d7d10f2c1e brcm47xx: rework model detection
On brcm47xx boards, the model ID is the combination of the "boardtype" nvram
variable and an optional supplemental "boardnum" variable while the human
readable model name is usually exposed in the "machine" field of the
/proc/cpuinfo file.

Move the extraction of the board nvram variables and model name string into
the 01_sysinfo file and rework the 01_detect board configuration script to
solely use the prepared sysinfo values without performing own detection
logic.

As a consequence, we can drop the ucidef_set_board_id() and
ucidef_set_model_name() invocations in favor to the generic behaviour
which copies the /tmp/sysinfo/{board_name,model} values into the board.json
"id" and "name" fields respectively.

Since "01_detect" only contains network configuration logic after this
change, move it to "01_network" and rename the contained "detect_by_xxx"
functions to "configure_by_xxx" instead, to avoid potential confusion.

Fixes FS#1576
Acked-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years ago
Mathias Kresin 78cf5eed6e treewide: do board detection during preinit
Do the board detection during preinit to unify it across all targets.

Signed-off-by: Mathias Kresin <dev@kresin.me>
7 years ago
Jo-Philipp Wich 833c500cb2 brcm47xx: remove target specific network preinit config
The generic preinit code is now able to setup network and switch vlan settings
from the /etc/board.json file, therefor drop the target specific code.

Fixes FS#790.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years ago
John Crispin 20940138ac scripts: fix wrong usage of '==' operator
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

SVN-Revision: 42911
10 years ago
Hauke Mehrtens edab966e45 brcm47xx: fix network failsafe indication
Remove the code used on the old switch driver.
The Ethernet drive is loaded as a module and needs some time to get up
therefor we added some wait function.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 39254
11 years ago
Hauke Mehrtens 3bc90a4d23 brcm47xx: fix switch handling
This fixes some problems with the switch handling

 * It now send the messages again to indicate a button for failsafe mode should be pressed
 * it does not leak packages between wan and lan any more
 * the switch works again in normal mode

The Ethernet connection has to be up when the switch driver switch-robo
is insmoded therefor we just do it again.
Explicitly set enable_vlan to prevent leaking packages.

This should close #13869, #13868 and #13716

SVN-Revision: 37286
11 years ago
Hauke Mehrtens ef0b9be95e brcm47xx: do not load the kernel modules needed for Ethernet manually
add the boot flag to make the kernel modules needed for Ethernet and
diag load on startup.

SVN-Revision: 37284
11 years ago
Hauke Mehrtens e800436de3 brcm47xx: do not change nvram without user interaction
SVN-Revision: 37281
11 years ago
Hauke Mehrtens e041d370a7 brcm47xx: proc gets mounted without this patch
SVN-Revision: 37272
11 years ago
Hauke Mehrtens 8dabd7a26b brcm47xx: remove obsolete hotplug stuff
SVN-Revision: 37271
11 years ago
John Crispin 39df8d1a45 brcm47xx: dont manually insmod switch drivers
Signed-off-by: John Crispin <bloic@openwrt.org>

SVN-Revision: 36993
11 years ago
Hauke Mehrtens 9afdb046d3 brcm47xx: do not use vlan0 any more.
The Broadcom switch driver says that vlan0 should not be used with any switch other than bcm5325.

This makes OpenWrt always use vlan1 and vlan2 instead.

SVN-Revision: 35704
12 years ago
Hauke Mehrtens 9de704a03b brcm47xx: improve cpuport detection for filesafe
Do not try to load bcm57xx.ko any more this is not needed for kernel 2.6 and 3.X
Ask the switch driver where the CPU port is.

SVN-Revision: 35624
12 years ago
Hauke Mehrtens a1e3c0ca46 Add Failsafe support for Linksys E3000V1 / WRT610NV2
Adds specification of the correct cpu_port for Linksys E3000V1 and WRT610NV2
in /lib/preinit/05_init_interfaces_brcm.  The list of devices will need to
be expanded.  Is there a way to determine the correct cpu_port to use in a
generic sense; for instance, if "/proc/switch/eth0/port/8" exists, or if
"/sys/class/net/eth0/device/driver/module/drivers/bcma:bgmac" exists?  Could
a similar method be used in "/etc/init.d/netconfig"?

Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>

SVN-Revision: 35491
12 years ago
Hauke Mehrtens 68aeb7af8e brcm47xx: load pps_core and ptp before tg3 to make the interface available for failsafe.
SVN-Revision: 35341
12 years ago
Hauke Mehrtens 4443997fd8 brcm47xx: add bgmac driver
This Ethernet driver is in early development stage and still has some problems.
This was working on my bcm4716 based device.

Thanks to Rafał Miłecki <zajec5@gmail.com> for writing this driver.

SVN-Revision: 34995
12 years ago
Hauke Mehrtens 8f6bdcffa1 brcm47xx: build b44 as a module
SVN-Revision: 34994
12 years ago
Hauke Mehrtens 22d62d311a brcm47xx: run ifup before starting the switch
In addition check_module is not needed, nobody checks the return value.

SVN-Revision: 34993
12 years ago
Mirko Vogt e34a4e0c7b Do not use deprecated path to functions.sh (/etc/functions.sh -> /lib/functions.sh)
SVN-Revision: 34793
12 years ago
Mirko Vogt 439a869090 Do not overload mount-call - trying to reduce confusion
The behaviour of calling 'mount' differed depending on whether it called
the busybox-mount, the mount of util-linux, the mount defined in
/lib/functions.sh and /lib/functions/boot.sh

/etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh,
both re-defining 'mount'.

SVN-Revision: 34792
12 years ago
Hauke Mehrtens 4901ac8225 brcm47xx: improve suppressing printing if a module was found in preinit function.
Thank you Bastian Bittorf

SVN-Revision: 34680
12 years ago
Hauke Mehrtens 235c065e12 brcm47xx: suppress printing if a module was found in preinit function.
SVN-Revision: 34653
12 years ago
Hauke Mehrtens 3a4a6cfd64 kernel: in kernel 3.6.8 and later tg3 depends on hwmon.ko
SVN-Revision: 34652
12 years ago
Hauke Mehrtens aa8e887a46 brcm47xx: whitespace cleanups
SVN-Revision: 34329
12 years ago
Hauke Mehrtens 0818180715 activate failsafe on all ports of the switch and not just port 0.
Sometimes the port 0 was the WAN port or there could be some device
where the port 0 is not wired to an actual Ethernet port. Now telnet in
failsafe will listen on all ports of the switch so user do not have to
search for the correct port any more. This change will make the switch
leak traffic between the WAN and the LAN port, but you should not use
failsafe while connected to a untrusted network.

SVN-Revision: 33544
12 years ago
Daniel Dickinson 17ba48cd90 target (base-files): Fixed failsafe mode by adding back insmod diag
SVN-Revision: 22186
14 years ago
Felix Fietkau 812f026323 add back the base-files/image code from brcm-2.4 to brcm47xx
SVN-Revision: 21945
14 years ago