[OpenWrt-Devel] [PATCH 7/8] mvebu: use device-tree board detection

Hauke Mehrtens hauke at hauke-m.de
Fri May 3 15:03:29 PDT 2019


On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote:
> Convert whole target to Device Tree based board detection instead of
> identifying devices by dts file name. With this we can drop mvebu.sh
> translation script and rely on common method for model detection.
> 
> Signed-off-by: Tomasz Maciej Nowak <tomek_n at o2.pl>
> ---
>  .../mvebu/base-files/etc/board.d/01_leds      | 22 ++---
>  .../mvebu/base-files/etc/board.d/02_network   | 60 ++++++------
>  target/linux/mvebu/base-files/etc/diag.sh     | 16 ++--
>  .../base-files/etc/init.d/linksys_recovery    |  2 +-
>  .../base-files/etc/uci-defaults/03_wireless   |  4 +-
>  .../base-files/etc/uci-defaults/04_mambafan   |  2 +-
>  target/linux/mvebu/base-files/lib/mvebu.sh    | 94 -------------------
>  .../mvebu/base-files/lib/preinit/01_sysinfo   |  9 --
>  .../base-files/lib/preinit/06_set_iface_mac   | 14 +--
>  .../base-files/lib/preinit/79_move_config     |  2 +-
>  .../base-files/lib/preinit/81_linksys_syscfg  |  2 +-
>  .../mvebu/base-files/lib/upgrade/platform.sh  | 10 +-
>  .../mvebu/base-files/lib/upgrade/sdcard.sh    |  2 +-
>  target/linux/mvebu/image/cortex-a9.mk         | 20 +++-
>  14 files changed, 85 insertions(+), 174 deletions(-)
>  delete mode 100755 target/linux/mvebu/base-files/lib/mvebu.sh
>  delete mode 100644 target/linux/mvebu/base-files/lib/preinit/01_sysinfo
> 

> diff --git a/target/linux/mvebu/base-files/lib/preinit/79_move_config b/target/linux/mvebu/base-files/lib/preinit/79_move_config
> index f7e23cc324..640fb5cdad 100644
> --- a/target/linux/mvebu/base-files/lib/preinit/79_move_config
> +++ b/target/linux/mvebu/base-files/lib/preinit/79_move_config
> @@ -9,7 +9,7 @@ move_config() {
>  
>  	if export_bootdevice && export_partdevice partdev 1; then
>  		case $(board_name) in
> -			armada-385-turris-omnia)
> +			cznic,turris-omnia)

This does not apply correctly, the old version uses "turris-omnia" and
not "armada-385-turris-omnia".

>  			insmod nls_cp437
>  			insmod nls_iso8859-1
>  			insmod fat



More information about the openwrt-devel mailing list