From 332656ca210c1040db82c26da31af83f9d60f89f Mon Sep 17 00:00:00 2001 From: Josep Orga Date: Sat, 25 Apr 2020 10:29:31 +0200 Subject: [PATCH] arm: imx: Change to somdevices configuration. Signed-off-by: Josep Orga --- board/somdevices/imx6ull_somdevices/Kconfig | 8 +++--- .../somdevices/imx6ull_somdevices/MAINTAINERS | 11 ++++---- board/somdevices/imx6ull_somdevices/Makefile | 2 +- board/somdevices/imx6ull_somdevices/README | 28 ++++--------------- .../imx6ull_somdevices/imx6ull_somdevices.c | 2 +- .../imx6ull_somdevices/imximage.cfg | 2 +- .../imx6ull_somdevices/imximage_lpddr2.cfg | 2 +- 7 files changed, 18 insertions(+), 37 deletions(-) diff --git a/board/somdevices/imx6ull_somdevices/Kconfig b/board/somdevices/imx6ull_somdevices/Kconfig index 985763c84f..8af21c3e7f 100644 --- a/board/somdevices/imx6ull_somdevices/Kconfig +++ b/board/somdevices/imx6ull_somdevices/Kconfig @@ -1,13 +1,13 @@ -if TARGET_MX6ULL_14X14_EVK || TARGET_MX6ULL_9X9_EVK +if TARGET_IMX6ULL_SOMDEVICES config SYS_BOARD - default "mx6ullevk" + default "imx6ull_somdevices" config SYS_VENDOR - default "freescale" + default "somdevices" config SYS_CONFIG_NAME - default "mx6ullevk" + default "imx6ull_somdevices" config SYS_TEXT_BASE default 0x87800000 diff --git a/board/somdevices/imx6ull_somdevices/MAINTAINERS b/board/somdevices/imx6ull_somdevices/MAINTAINERS index 73031cd121..e4698d4752 100644 --- a/board/somdevices/imx6ull_somdevices/MAINTAINERS +++ b/board/somdevices/imx6ull_somdevices/MAINTAINERS @@ -1,7 +1,6 @@ -MX6ULLEVK BOARD -M: Peng Fan +iMX6ULL SOMDEVICES BOARD +M: Josep Orga S: Maintained -F: board/freescale/mx6ullevk/ -F: include/configs/mx6ullevk.h -F: configs/mx6ull_14x14_evk_defconfig -F: configs/mx6ull_14x14_evk_plugin_defconfig +F: board/somdevices/imx6ull_somdevices/ +F: include/configs/imx6ull_somdevices.h +F: configs/imx6ull_somdevices_defconfig diff --git a/board/somdevices/imx6ull_somdevices/Makefile b/board/somdevices/imx6ull_somdevices/Makefile index 1ff03b5f1c..1fad7ce713 100644 --- a/board/somdevices/imx6ull_somdevices/Makefile +++ b/board/somdevices/imx6ull_somdevices/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ # (C) Copyright 2016 Freescale Semiconductor, Inc. -obj-y := mx6ullevk.o +obj-y := imx6ull_somdevices.o diff --git a/board/somdevices/imx6ull_somdevices/README b/board/somdevices/imx6ull_somdevices/README index d5c8770863..f74718ffc0 100644 --- a/board/somdevices/imx6ull_somdevices/README +++ b/board/somdevices/imx6ull_somdevices/README @@ -1,36 +1,18 @@ -How to use U-Boot on Freescale MX6ULL 14x14 EVK +How to use U-Boot on Freescale iMX6ULL SOMDEVICES ---------------------------------------------- - First make sure you have installed the dtc package (device tree compiler): $ sudo apt-get install device-tree-compiler -- Build U-Boot for MX6ULL 14x14 EVK: +- Build U-Boot for iMX6ULL SOMDEVICES: $ make mrproper -$ make mx6ull_14x14_evk_defconfig +$ make imx6ull_somdevices_defconfig $ make This generates the u-boot-dtb.imx image in the current directory. -- Flash the u-boot-dtb.imx image into the micro SD card: +- Flash the u-boot-dtb.imx image into the eMMC flash: -$ sudo dd if=u-boot-dtb.imx of=/dev/sdb bs=1K seek=1 && sync - -- Jumper settings: - -SW601: 0 0 1 0 -Sw602: 1 0 - -Where 0 means bottom position and 1 means top position (from the switch label -numbers reference). - -Connect the USB cable between the EVK and the PC for the console. -(The USB console connector is the one close the push buttons) - -Insert the micro SD card in the board, power it up and U-Boot messages should -come up. - -The link for the board: http://www.nxp.com/products/microcontrollers-and- \ -processors/arm-processors/i.mx-applications-processors/i.mx-6-processors/ \ -i.mx6qp/evaluation-kit-for-the-i.mx-6ull-applications-processor:MCIMX6ULL-EVK +$ sudo dd if=u-boot-dtb.imx of=/dev/mmcblk1 bs=1K seek=1 && sync diff --git a/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c b/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c index 3b0a8ade4b..fc4384b134 100644 --- a/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c +++ b/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c @@ -408,7 +408,7 @@ int checkboard(void) else if (is_cpu_type(MXC_CPU_MX6ULZ)) puts("Board: MX6ULZ 14x14 EVK\n"); else - puts("Board: MX6ULL 14x14 EVK\n"); + puts("Board: iMX6ULL SOMDEVICES\n"); return 0; } diff --git a/board/somdevices/imx6ull_somdevices/imximage.cfg b/board/somdevices/imx6ull_somdevices/imximage.cfg index 33e7fcd2ce..9109067af3 100644 --- a/board/somdevices/imx6ull_somdevices/imximage.cfg +++ b/board/somdevices/imx6ull_somdevices/imximage.cfg @@ -31,7 +31,7 @@ BOOT_FROM sd #ifdef CONFIG_USE_IMXIMG_PLUGIN /*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx6ullevk/plugin.bin 0x00907000 +PLUGIN board/somdevices/imx6ull_somdevices/plugin.bin 0x00907000 #else #ifdef CONFIG_SECURE_BOOT diff --git a/board/somdevices/imx6ull_somdevices/imximage_lpddr2.cfg b/board/somdevices/imx6ull_somdevices/imximage_lpddr2.cfg index 3e3ad269f1..d79c20d344 100644 --- a/board/somdevices/imx6ull_somdevices/imximage_lpddr2.cfg +++ b/board/somdevices/imx6ull_somdevices/imximage_lpddr2.cfg @@ -32,7 +32,7 @@ BOOT_FROM sd #ifdef CONFIG_USE_IMXIMG_PLUGIN /*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx6ullevk/plugin.bin 0x00907000 +PLUGIN board/somdevices/imx6ull_somdevices/plugin.bin 0x00907000 #else #ifdef CONFIG_SECURE_BOOT -- 2.17.1