diff options
Diffstat (limited to 'arch/arm/boards/zii-vf610-dev')
| -rw-r--r-- | arch/arm/boards/zii-vf610-dev/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/boards/zii-vf610-dev/board.c | 31 | ||||
| -rw-r--r-- | arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg | 16 | ||||
| -rw-r--r-- | arch/arm/boards/zii-vf610-dev/lowlevel.c | 29 |
4 files changed, 36 insertions, 43 deletions
diff --git a/arch/arm/boards/zii-vf610-dev/Makefile b/arch/arm/boards/zii-vf610-dev/Makefile index 3c3a3f2387..a1a8318e15 100644 --- a/arch/arm/boards/zii-vf610-dev/Makefile +++ b/arch/arm/boards/zii-vf610-dev/Makefile @@ -1,4 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + obj-y += board.o -CFLAGS_pbl-lowlevel.o := -fno-tree-switch-conversion -fno-jump-tables lwl-y += lowlevel.o bbenv-y += defaultenv-zii-vf610-dev diff --git a/arch/arm/boards/zii-vf610-dev/board.c b/arch/arm/boards/zii-vf610-dev/board.c index 1d10f12f63..675f13b882 100644 --- a/arch/arm/boards/zii-vf610-dev/board.c +++ b/arch/arm/boards/zii-vf610-dev/board.c @@ -1,17 +1,7 @@ -/* - * Copyright (C) 2016 Zodiac Inflight Innovation - * Author: Andrey Smirnov <andrew.smirnov@gmail.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2016 Zodiac Inflight Innovation + +/* Author: Andrey Smirnov <andrew.smirnov@gmail.com> */ #include <common.h> #include <init.h> @@ -20,7 +10,7 @@ #include <linux/clk.h> #include <dt-bindings/clock/vf610-clock.h> #include <envfs.h> -#include <mach/bbu.h> +#include <mach/imx/bbu.h> static int expose_signals(const struct gpio *signals, @@ -141,6 +131,7 @@ static int zii_vf610_dev_set_hostname(void) } } + defaultenv_append_directory(defaultenv_zii_common); defaultenv_append_directory(defaultenv_zii_vf610_dev); return 0; } @@ -161,6 +152,14 @@ static int zii_vf610_dev_register_bbu(void) return ret; } + ret = vf610_bbu_internal_mmc_register_handler("SD", + "/dev/mmc1", + 0); + if (ret) { + pr_err("Failed to register SD BBU handler\n"); + return ret; + } + return 0; } late_initcall(zii_vf610_dev_register_bbu); @@ -185,4 +184,4 @@ static int zii_vf610_register_emmc_bbu(void) return 0; } -late_initcall(zii_vf610_register_emmc_bbu);
\ No newline at end of file +late_initcall(zii_vf610_register_emmc_bbu); diff --git a/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg b/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg index 7076a6431f..aace9e9226 100644 --- a/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg +++ b/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg @@ -1,13 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + soc vf610 loadaddr 0x80000000 -dcdofs 0x400 +ivtofs 0x400 -#include <mach/vf610-iomux-regs.h> -#include <mach/vf610-ddrmc-regs.h> +#include <mach/imx/vf610-iomux-regs.h> +#include <mach/imx/vf610-ddrmc-regs.h> -#include <mach/flash-header/vf610-ddr-pll2-400mhz.imxcfg> -#include <mach/flash-header/vf610-iomux-ddr-default.imxcfg> -#include <mach/flash-header/vf610-ddr-cr-default.imxcfg> +#include <mach/imx/flash-header/vf610-ddr-pll2-400mhz.imxcfg> +#include <mach/imx/flash-header/vf610-iomux-ddr-default.imxcfg> +#include <mach/imx/flash-header/vf610-ddr-cr-default.imxcfg> wm 32 DDRMC_CR26 0x0c300068 wm 32 DDRMC_CR31 0x006c0200 @@ -19,7 +21,7 @@ wm 32 DDRMC_CR73 0x0a010100 */ wm 32 DDRMC_CR73 0x0a010100 -#include <mach/flash-header/vf610-ddr-phy-default.imxcfg> +#include <mach/imx/flash-header/vf610-ddr-phy-default.imxcfg> wm 32 DDRMC_CR00 DDRMC_CR00_DRAM_CLASS_DDR3_START diff --git a/arch/arm/boards/zii-vf610-dev/lowlevel.c b/arch/arm/boards/zii-vf610-dev/lowlevel.c index 9b57581d1b..e45e31f7d8 100644 --- a/arch/arm/boards/zii-vf610-dev/lowlevel.c +++ b/arch/arm/boards/zii-vf610-dev/lowlevel.c @@ -1,28 +1,19 @@ -/* - * Copyright (C) 2016 Zodiac Inflight Innovation - * Author: Andrey Smirnov <andrew.smirnov@gmail.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2016 Zodiac Inflight Innovation + +/* Author: Andrey Smirnov <andrew.smirnov@gmail.com> */ #include <common.h> #include <linux/sizes.h> -#include <mach/generic.h> +#include <mach/imx/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> -#include <mach/esdctl.h> -#include <mach/vf610-regs.h> -#include <mach/clock-vf610.h> -#include <mach/iomux-vf610.h> +#include <mach/imx/esdctl.h> +#include <mach/imx/vf610-regs.h> +#include <mach/imx/clock-vf610.h> +#include <mach/imx/iomux-vf610.h> #include <debug_ll.h> +#include <mach/imx/debug_ll.h> static inline void setup_uart(void) { |