[PATCH 3/3] Add support for Fritzbox 4040 and add target ipq40xx
Christian Dresel
fff at chrisi01.de
Mo Apr 22 09:55:06 CEST 2019
Reviewed-by: Christian Dresel <fff at chrisi01.de>
On 16.04.19 23:42, Adrian Schmutzler wrote:
> This patch is for testing setup without VLAN switch driver.
>
> This is based on the network patchset, but should be independent
> of the wireless changes.
>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
> bsp/board_ipq40xx.bsp | 6 ++++++
> bsp/ipq40xx/.config | 7 +++++++
> src/packages/fff/fff-boardname/Makefile | 2 +-
> .../fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname | 3 +++
> src/packages/fff/fff-network/Makefile | 2 +-
> .../fff/fff-network/files/etc/uci-defaults/22b-config-ports | 7 +++++++
> src/packages/fff/fff-sysupgrade/Makefile | 2 +-
> src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 3 +++
> 8 files changed, 29 insertions(+), 3 deletions(-)
> create mode 100644 bsp/board_ipq40xx.bsp
> create mode 100644 bsp/ipq40xx/.config
>
> diff --git a/bsp/board_ipq40xx.bsp b/bsp/board_ipq40xx.bsp
> new file mode 100644
> index 00000000..eac5759c
> --- /dev/null
> +++ b/bsp/board_ipq40xx.bsp
> @@ -0,0 +1,6 @@
> +machine=ipq40xx
> +chipset=ipq40xx
> +subtarget=generic
> +target=$builddir/$machine
> +images=("openwrt-${chipset}-avm_fritzbox-4040-squashfs-sysupgrade.bin"
> + )
> diff --git a/bsp/ipq40xx/.config b/bsp/ipq40xx/.config
> new file mode 100644
> index 00000000..272dec2e
> --- /dev/null
> +++ b/bsp/ipq40xx/.config
> @@ -0,0 +1,7 @@
> +# Generated using "./buildscript config openwrt".
> +# Do no edit manually
> +#
> +CONFIG_TARGET_ipq40xx=y
> +CONFIG_TARGET_MULTI_PROFILE=y
> +CONFIG_TARGET_DEVICE_ipq40xx_DEVICE_avm_fritzbox-4040=y
> +CONFIG_BUSYBOX_CUSTOM=y
> diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile
> index 9c2f76d9..01fcc0ae 100644
> --- a/src/packages/fff/fff-boardname/Makefile
> +++ b/src/packages/fff/fff-boardname/Makefile
> @@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-boardname
> -PKG_RELEASE:=6
> +PKG_RELEASE:=7
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>
> diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
> index ee9c3d39..0918e533 100644
> --- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
> +++ b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
> @@ -70,6 +70,9 @@ case "$BOARD" in
> archer-c7)
> BOARD=archer-c7-v2
> ;;
> + avm,fritzbox-4040)
> + BOARD=fritzbox-4040
> + ;;
> esac
>
> uci set board.model.name=$BOARD
> diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
> index 11796797..072082a6 100644
> --- a/src/packages/fff/fff-network/Makefile
> +++ b/src/packages/fff/fff-network/Makefile
> @@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-network
> -PKG_RELEASE:=11
> +PKG_RELEASE:=12
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>
> diff --git a/src/packages/fff/fff-network/files/etc/uci-defaults/22b-config-ports b/src/packages/fff/fff-network/files/etc/uci-defaults/22b-config-ports
> index c1d8381e..40d478f1 100644
> --- a/src/packages/fff/fff-network/files/etc/uci-defaults/22b-config-ports
> +++ b/src/packages/fff/fff-network/files/etc/uci-defaults/22b-config-ports
> @@ -23,6 +23,13 @@ case "$BOARD" in
> setupWan "eth0.2"
> uci set "fff.ui.portsetup=cpev1"
> ;;
> + fritzbox-4040)
> + # Set whole switch to BATMAN, since VLANs are not supported
> + # (eth0 is connected untagged to switch)
> + setupOnePort "eth1" "WAN"
> + setup2ndEth "eth0" "BATMAN"
> + uci set "fff.ui.portsetup=twoeth"
> + ;;
> gl-ar150)
> # Default: CLIENT
> setupSwitch "eth1" "0t 1" "0t"
> diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
> index 0f2e6a1e..e88b51d4 100644
> --- a/src/packages/fff/fff-sysupgrade/Makefile
> +++ b/src/packages/fff/fff-sysupgrade/Makefile
> @@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-sysupgrade
> -PKG_RELEASE:=11
> +PKG_RELEASE:=12
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>
> diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> index c8d037ce..49992e44 100755
> --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> @@ -19,6 +19,9 @@ case $BOARD in
> tl-wdr4900-v1 )
> SOC="mpc85xx-g"
> ;;
> + avm_fritzbox-4040 )
> + SOC="ipq40xx"
> + ;;
> * )
> SOC="ar71xx-t"
> ;;
Mehr Informationen über die Mailingliste franken-dev