Author: blogic Date: 2015-11-22 09:04:37 +0100 (Sun, 22 Nov 2015) New Revision: 47572
Added: trunk/target/linux/brcm2708/base-files.mk trunk/target/linux/brcm2708/base-files/etc/board.d/ trunk/target/linux/brcm2708/base-files/etc/board.d/02_network trunk/target/linux/brcm2708/base-files/lib/brcm2708.sh trunk/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh trunk/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 Removed: trunk/target/linux/brcm2708/base-files/etc/uci-defaults/ Modified: trunk/target/linux/brcm2708/base-files/etc/diag.sh trunk/target/linux/brcm2708/bcm2708/config-4.1 trunk/target/linux/brcm2708/bcm2709/config-4.1 Log: brcm2708: add device detection and use it for network, leds and preinit Signed-off-by: ?\195?\129lvaro Fern?\195?\161ndez Rojas <[email protected]> Added: trunk/target/linux/brcm2708/base-files/etc/board.d/02_network =================================================================== --- trunk/target/linux/brcm2708/base-files/etc/board.d/02_network (rev 0) +++ trunk/target/linux/brcm2708/base-files/etc/board.d/02_network 2015-11-22 08:04:37 UTC (rev 47572) @@ -0,0 +1,25 @@ +#!/bin/sh +# Copyright (C) 2014-2015 OpenWrt.org + +. /lib/functions/uci-defaults-new.sh +. /lib/brcm2708.sh +. /lib/functions.sh +. /lib/functions/system.sh + +board_config_update + +ucidef_set_interface_loopback + +board=$(brcm2708_board_name) + +case "$board" in +rpi-b |\ +rpi-b-plus |\ +rpi-2-b) + ucidef_set_interface_lan "eth0" + ;; +esac + +board_config_flush + +exit 0 Property changes on: trunk/target/linux/brcm2708/base-files/etc/board.d/02_network ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Modified: trunk/target/linux/brcm2708/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/brcm2708/base-files/etc/diag.sh 2015-11-21 21:26:20 UTC (rev 47571) +++ trunk/target/linux/brcm2708/base-files/etc/diag.sh 2015-11-22 08:04:37 UTC (rev 47572) @@ -4,9 +4,19 @@ # . /lib/functions/leds.sh +. /lib/brcm2708.sh set_state() { - status_led="led0" + case "$(brcm2708_board_name)" in + rpi-b |\ + rpi-cm) + status_led="led0" + ;; + rpi-b-plus |\ + rpi-2-b) + status_led="led1" + ;; + esac case "$1" in preinit) Added: trunk/target/linux/brcm2708/base-files/lib/brcm2708.sh =================================================================== --- trunk/target/linux/brcm2708/base-files/lib/brcm2708.sh (rev 0) +++ trunk/target/linux/brcm2708/base-files/lib/brcm2708.sh 2015-11-22 08:04:37 UTC (rev 47572) @@ -0,0 +1,41 @@ +#!/bin/sh +# Copyright (C) 2015 OpenWrt.org + +ifname="" + +brcm2708_detect() { + local board_name model + + model=$(cat /proc/device-tree/model) + case "$model" in + "Raspberry Pi Model B Rev"*) + board_name="rpi-b" + ;; + "Raspberry Pi Model B+ Rev"*) + board_name="rpi-b-plus" + ;; + "Raspberry Pi Compute Module Rev"*) + board_name="rpi-cm" + ;; + "Raspberry Pi 2 Model B Rev"*) + board_name="rpi-2-b" + ;; + *) + board_name="unknown" + ;; + esac + + [ -e "/tmp/sysinfo" ] || mkdir -p "/tmp/sysinfo" + + echo "$board_name" > /tmp/sysinfo/board_name + echo "$model" > /tmp/sysinfo/model +} + +brcm2708_board_name() { + local name + + [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name) + [ -n "$name" ] || name="unknown" + + echo $name +} Added: trunk/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh =================================================================== --- trunk/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh (rev 0) +++ trunk/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh 2015-11-22 08:04:37 UTC (rev 47572) @@ -0,0 +1,10 @@ +#!/bin/sh +# Copyright (C) 2015 OpenWrt.org + +do_brcm2708() { + . /lib/brcm2708.sh + + brcm2708_detect +} + +boot_hook_add preinit_main do_brcm2708 Added: trunk/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 =================================================================== --- trunk/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 (rev 0) +++ trunk/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 2015-11-22 08:04:37 UTC (rev 47572) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# Copyright (C) 2015 OpenWrt.org +# + +. /lib/brcm2708.sh + +set_preinit_iface() { + case "$(brcm2708_board_name)" in + rpi-b |\ + rpi-b-plus |\ + rpi-2-b) + ifname=eth0 + ;; + esac +} + +boot_hook_add preinit_main set_preinit_iface Copied: trunk/target/linux/brcm2708/base-files.mk (from rev 47571, trunk/target/linux/ar71xx/base-files.mk) =================================================================== --- trunk/target/linux/brcm2708/base-files.mk (rev 0) +++ trunk/target/linux/brcm2708/base-files.mk 2015-11-22 08:04:37 UTC (rev 47572) @@ -0,0 +1,3 @@ +define Package/base-files/install-target + rm -f $(1)/etc/config/network +endef Modified: trunk/target/linux/brcm2708/bcm2708/config-4.1 =================================================================== --- trunk/target/linux/brcm2708/bcm2708/config-4.1 2015-11-21 21:26:20 UTC (rev 47571) +++ trunk/target/linux/brcm2708/bcm2708/config-4.1 2015-11-22 08:04:37 UTC (rev 47572) @@ -225,7 +225,7 @@ # CONFIG_KERNEL_XZ is not set # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_LEDS_GPIO=y -# CONFIG_LEDS_TRIGGER_INPUT is not set +CONFIG_LEDS_TRIGGER_INPUT=y CONFIG_LIBFDT=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_CLUT224=y Modified: trunk/target/linux/brcm2708/bcm2709/config-4.1 =================================================================== --- trunk/target/linux/brcm2708/bcm2709/config-4.1 2015-11-21 21:26:20 UTC (rev 47571) +++ trunk/target/linux/brcm2708/bcm2709/config-4.1 2015-11-22 08:04:37 UTC (rev 47572) @@ -237,7 +237,7 @@ # CONFIG_KERNEL_XZ is not set # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_LEDS_GPIO=y -# CONFIG_LEDS_TRIGGER_INPUT is not set +CONFIG_LEDS_TRIGGER_INPUT=y CONFIG_LIBFDT=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LOGO=y _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
