[U-Boot] [PATCH next 3/3] mx6sabreauto: Update to SPL only mode

Stefano Babic sbabic at denx.de
Fri Jun 30 08:54:25 UTC 2017


On 29/06/2017 14:33, Vanessa Maegima wrote:
> As mx6sabreauto supports SPL now, all variants can boot using the same
> defconfig.
> 
> This patch:
> - Removes non-SPL targets.
> - Renames target to mx6sabreauto_defconfig.
> - Renames folder and board files to mx6sabreauto.
> - Updates MAINTAINERS, Makefile and Kconfig accordingly.
> - Removes .cfg files.
> - Adds a README with instructions to build and flash SPL and u-boot.img.
> 
> Signed-off-by: Vanessa Maegima <vanessa.maegima at nxp.com>
> ---
>  arch/arm/cpu/armv7/mx6/Kconfig                     |   6 +-
>  board/freescale/mx6qsabreauto/MAINTAINERS          |   9 --
>  board/freescale/mx6qsabreauto/imximage.cfg         | 129 ------------------
>  board/freescale/mx6qsabreauto/mx6dl.cfg            | 130 ------------------
>  board/freescale/mx6qsabreauto/mx6qp.cfg            | 145 ---------------------
>  .../{mx6qsabreauto => mx6sabreauto}/Kconfig        |   6 +-
>  board/freescale/mx6sabreauto/MAINTAINERS           |   7 +
>  .../{mx6qsabreauto => mx6sabreauto}/Makefile       |   2 +-
>  board/freescale/mx6sabreauto/README                |  20 +++
>  .../mx6sabreauto.c}                                |   0
>  configs/mx6dlsabreauto_defconfig                   |  44 -------
>  configs/mx6qpsabreauto_defconfig                   |  43 ------
>  configs/mx6qsabreauto_defconfig                    |  44 -------
>  ...reauto_spl_defconfig => mx6sabreauto_defconfig} |   2 +-
>  .../configs/{mx6qsabreauto.h => mx6sabreauto.h}    |   6 +-
>  15 files changed, 38 insertions(+), 555 deletions(-)
>  delete mode 100644 board/freescale/mx6qsabreauto/MAINTAINERS
>  delete mode 100644 board/freescale/mx6qsabreauto/imximage.cfg
>  delete mode 100644 board/freescale/mx6qsabreauto/mx6dl.cfg
>  delete mode 100644 board/freescale/mx6qsabreauto/mx6qp.cfg
>  rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Kconfig (54%)
>  create mode 100644 board/freescale/mx6sabreauto/MAINTAINERS
>  rename board/freescale/{mx6qsabreauto => mx6sabreauto}/Makefile (85%)
>  create mode 100644 board/freescale/mx6sabreauto/README
>  rename board/freescale/{mx6qsabreauto/mx6qsabreauto.c => mx6sabreauto/mx6sabreauto.c} (100%)
>  delete mode 100644 configs/mx6dlsabreauto_defconfig
>  delete mode 100644 configs/mx6qpsabreauto_defconfig
>  delete mode 100644 configs/mx6qsabreauto_defconfig
>  rename configs/{mx6qsabreauto_spl_defconfig => mx6sabreauto_defconfig} (97%)
>  rename include/configs/{mx6qsabreauto.h => mx6sabreauto.h} (94%)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
> index 0d500aa..4a38dc2 100644
> --- a/arch/arm/cpu/armv7/mx6/Kconfig
> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
> @@ -202,8 +202,8 @@ config TARGET_MX6Q_ICORE_RQS
>  	select SUPPORT_SPL
>  	select SPL_LOAD_FIT
>  
> -config TARGET_MX6QSABREAUTO
> -	bool "mx6qsabreauto"
> +config TARGET_MX6SABREAUTO
> +	bool "mx6sabreauto"
>  	select BOARD_LATE_INIT
>  	select SUPPORT_SPL
>  	select DM
> @@ -413,7 +413,7 @@ source "board/engicam/icorem6/Kconfig"
>  source "board/engicam/icorem6_rqs/Kconfig"
>  source "board/engicam/isiotmx6ul/Kconfig"
>  source "board/freescale/mx6qarm2/Kconfig"
> -source "board/freescale/mx6qsabreauto/Kconfig"
> +source "board/freescale/mx6sabreauto/Kconfig"
>  source "board/freescale/mx6sabresd/Kconfig"
>  source "board/freescale/mx6slevk/Kconfig"
>  source "board/freescale/mx6sllevk/Kconfig"
> diff --git a/board/freescale/mx6qsabreauto/MAINTAINERS b/board/freescale/mx6qsabreauto/MAINTAINERS
> deleted file mode 100644
> index f148dac..0000000
> --- a/board/freescale/mx6qsabreauto/MAINTAINERS
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -MX6QSABREAUTO BOARD
> -M:	Fabio Estevam <fabio.estevam at nxp.com>
> -M:	Peng Fan <peng.fan at nxp.com>
> -S:	Maintained
> -F:	board/freescale/mx6qsabreauto/
> -F:	include/configs/mx6qsabreauto.h
> -F:	configs/mx6dlsabreauto_defconfig
> -F:	configs/mx6qsabreauto_defconfig
> -F:	configs/mx6qpsabreauto_defconfig
> diff --git a/board/freescale/mx6qsabreauto/imximage.cfg b/board/freescale/mx6qsabreauto/imximage.cfg
> deleted file mode 100644
> index 16bf473..0000000
> --- a/board/freescale/mx6qsabreauto/imximage.cfg
> +++ /dev/null
> @@ -1,129 +0,0 @@
> -/*
> - * Copyright (C) 2012 Freescale Semiconductor, Inc.
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of
> - * spi, sd (the board has no nand neither onenand)
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0798 0x000C0000
> -DATA 4 0x020e0758 0x00000000
> -DATA 4 0x020e0588 0x00000030
> -DATA 4 0x020e0594 0x00000030
> -DATA 4 0x020e056c 0x00000030
> -DATA 4 0x020e0578 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e057c 0x00000030
> -DATA 4 0x020e058c 0x00000000
> -DATA 4 0x020e059c 0x00000030
> -DATA 4 0x020e05a0 0x00000030
> -DATA 4 0x020e078c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e05a8 0x00000028
> -DATA 4 0x020e05b0 0x00000028
> -DATA 4 0x020e0524 0x00000028
> -DATA 4 0x020e051c 0x00000028
> -DATA 4 0x020e0518 0x00000028
> -DATA 4 0x020e050c 0x00000028
> -DATA 4 0x020e05b8 0x00000028
> -DATA 4 0x020e05c0 0x00000028
> -DATA 4 0x020e0774 0x00020000
> -DATA 4 0x020e0784 0x00000028
> -DATA 4 0x020e0788 0x00000028
> -DATA 4 0x020e0794 0x00000028
> -DATA 4 0x020e079c 0x00000028
> -DATA 4 0x020e07a0 0x00000028
> -DATA 4 0x020e07a4 0x00000028
> -DATA 4 0x020e07a8 0x00000028
> -DATA 4 0x020e0748 0x00000028
> -DATA 4 0x020e05ac 0x00000028
> -DATA 4 0x020e05b4 0x00000028
> -DATA 4 0x020e0528 0x00000028
> -DATA 4 0x020e0520 0x00000028
> -DATA 4 0x020e0514 0x00000028
> -DATA 4 0x020e0510 0x00000028
> -DATA 4 0x020e05bc 0x00000028
> -DATA 4 0x020e05c4 0x00000028
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001F001F
> -DATA 4 0x021b0810 0x001F001F
> -DATA 4 0x021b480c 0x001F001F
> -DATA 4 0x021b4810 0x001F001F
> -DATA 4 0x021b083c 0x43260335
> -DATA 4 0x021b0840 0x031A030B
> -DATA 4 0x021b483c 0x4323033B
> -DATA 4 0x021b4840 0x0323026F
> -DATA 4 0x021b0848 0x483D4545
> -DATA 4 0x021b4848 0x44433E48
> -DATA 4 0x021b0850 0x41444840
> -DATA 4 0x021b4850 0x4835483E
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020036
> -DATA 4 0x021b0008 0x09444040
> -DATA 4 0x021b000c 0x8A8F7955
> -DATA 4 0x021b0010 0xFF328F64
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x008F1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x021b001c 0x04088032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x09408030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025576
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -
> -/* set the default clock gate to save power */
> -DATA 4 0x020c4068 0x00C03F3F
> -DATA 4 0x020c406c 0x0030FC03
> -DATA 4 0x020c4070 0x0FFFC000
> -DATA 4 0x020c4074 0x3FF00000
> -DATA 4 0x020c4078 0xFFFFF300
> -DATA 4 0x020c407c 0x0F0000F3
> -DATA 4 0x020c4080 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4 0x020e0010 0xF00000CF
> -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> -DATA 4 0x020e0018 0x007F007F
> -DATA 4 0x020e001c 0x007F007F
> diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg
> deleted file mode 100644
> index 89078e5..0000000
> --- a/board/freescale/mx6qsabreauto/mx6dl.cfg
> +++ /dev/null
> @@ -1,130 +0,0 @@
> -/*
> - * Copyright (C) 2013 Freescale Semiconductor, Inc.
> - * Jason Liu <r64343 at freescale.com>
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of
> - * spi, sd (the board has no nand neither onenand)
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0774 0x000C0000
> -DATA 4 0x020e0754 0x00000000
> -DATA 4 0x020e04ac 0x00000030
> -DATA 4 0x020e04b0 0x00000030
> -DATA 4 0x020e0464 0x00000030
> -DATA 4 0x020e0490 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e0494 0x00000030
> -DATA 4 0x020e04a0 0x00000000
> -DATA 4 0x020e04b4 0x00000030
> -DATA 4 0x020e04b8 0x00000030
> -DATA 4 0x020e076c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e04bc 0x00000028
> -DATA 4 0x020e04c0 0x00000028
> -DATA 4 0x020e04c4 0x00000028
> -DATA 4 0x020e04c8 0x00000028
> -DATA 4 0x020e04cc 0x00000028
> -DATA 4 0x020e04d0 0x00000028
> -DATA 4 0x020e04d4 0x00000028
> -DATA 4 0x020e04d8 0x00000028
> -DATA 4 0x020e0760 0x00020000
> -DATA 4 0x020e0764 0x00000028
> -DATA 4 0x020e0770 0x00000028
> -DATA 4 0x020e0778 0x00000028
> -DATA 4 0x020e077c 0x00000028
> -DATA 4 0x020e0780 0x00000028
> -DATA 4 0x020e0784 0x00000028
> -DATA 4 0x020e078c 0x00000028
> -DATA 4 0x020e0748 0x00000028
> -DATA 4 0x020e0470 0x00000028
> -DATA 4 0x020e0474 0x00000028
> -DATA 4 0x020e0478 0x00000028
> -DATA 4 0x020e047c 0x00000028
> -DATA 4 0x020e0480 0x00000028
> -DATA 4 0x020e0484 0x00000028
> -DATA 4 0x020e0488 0x00000028
> -DATA 4 0x020e048c 0x00000028
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001F001F
> -DATA 4 0x021b0810 0x001F001F
> -DATA 4 0x021b480c 0x001F001F
> -DATA 4 0x021b4810 0x001F001F
> -DATA 4 0x021b083c 0x42190217
> -DATA 4 0x021b0840 0x017B017B
> -DATA 4 0x021b483c 0x4176017B
> -DATA 4 0x021b4840 0x015F016C
> -DATA 4 0x021b0848 0x4C4C4D4C
> -DATA 4 0x021b4848 0x4A4D4C48
> -DATA 4 0x021b0850 0x3F3F3F40
> -DATA 4 0x021b4850 0x3538382E
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020025
> -DATA 4 0x021b0008 0x00333030
> -DATA 4 0x021b000c 0x676B5313
> -DATA 4 0x021b0010 0xB66E8B63
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x006B1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x021b001c 0x04008032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x05208030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025565
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -
> -/* set the default clock gate to save power */
> -DATA 4 0x020c4068 0x00C03F3F
> -DATA 4 0x020c406c 0x0030FC03
> -DATA 4 0x020c4070 0x0FFFC000
> -DATA 4 0x020c4074 0x3FF00000
> -DATA 4 0x020c4078 0xFFFFF300
> -DATA 4 0x020c407c 0x0F0000C3
> -DATA 4 0x020c4080 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4 0x020e0010 0xF00000CF
> -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> -DATA 4 0x020e0018 0x007F007F
> -DATA 4 0x020e001c 0x007F007F
> diff --git a/board/freescale/mx6qsabreauto/mx6qp.cfg b/board/freescale/mx6qsabreauto/mx6qp.cfg
> deleted file mode 100644
> index 2298c77..0000000
> --- a/board/freescale/mx6qsabreauto/mx6qp.cfg
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -/*
> - * Copyright (C) 2015 Freescale Semiconductor, Inc.
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - *
> - * Refer doc/README.imximage for more details about how-to configure
> - * and create imximage boot image
> - *
> - * The syntax is taken as close as possible with the kwbimage
> - */
> -/* image version */
> -
> -#define __ASSEMBLY__
> -#include <config.h>
> -
> -IMAGE_VERSION 2
> -
> -/*
> - * Boot Device : one of spi, sd, eimnor, nand, sata:
> - * spinor: flash_offset: 0x0400
> - * nand:   flash_offset: 0x0400
> - * sata:   flash_offset: 0x0400
> - * sd/mmc: flash_offset: 0x0400
> - * eimnor: flash_offset: 0x1000
> - */
> -BOOT_FROM	sd
> -
> -/*
> - * Device Configuration Data (DCD)
> - *
> - * Each entry must have the format:
> - * Addr-type           Address        Value
> - *
> - * where:
> - *	Addr-type register length (1,2 or 4 bytes)
> - *	Address	  absolute address of the register
> - *	value	  value to be stored in the register
> - */
> -DATA 4 0x020e0798 0x000C0000
> -DATA 4 0x020e0758 0x00000000
> -DATA 4 0x020e0588 0x00000030
> -DATA 4 0x020e0594 0x00000030
> -DATA 4 0x020e056c 0x00000030
> -DATA 4 0x020e0578 0x00000030
> -DATA 4 0x020e074c 0x00000030
> -DATA 4 0x020e057c 0x00000030
> -DATA 4 0x020e058c 0x00000000
> -DATA 4 0x020e059c 0x00000030
> -DATA 4 0x020e05a0 0x00000030
> -DATA 4 0x020e078c 0x00000030
> -DATA 4 0x020e0750 0x00020000
> -DATA 4 0x020e05a8 0x00000030
> -DATA 4 0x020e05b0 0x00000030
> -DATA 4 0x020e0524 0x00000030
> -DATA 4 0x020e051c 0x00000030
> -DATA 4 0x020e0518 0x00000030
> -DATA 4 0x020e050c 0x00000030
> -DATA 4 0x020e05b8 0x00000030
> -DATA 4 0x020e05c0 0x00000030
> -DATA 4 0x020e0774 0x00020000
> -DATA 4 0x020e0784 0x00000030
> -DATA 4 0x020e0788 0x00000030
> -DATA 4 0x020e0794 0x00000030
> -DATA 4 0x020e079c 0x00000030
> -DATA 4 0x020e07a0 0x00000030
> -DATA 4 0x020e07a4 0x00000030
> -DATA 4 0x020e07a8 0x00000030
> -DATA 4 0x020e0748 0x00000030
> -DATA 4 0x020e05ac 0x00000030
> -DATA 4 0x020e05b4 0x00000030
> -DATA 4 0x020e0528 0x00000030
> -DATA 4 0x020e0520 0x00000030
> -DATA 4 0x020e0514 0x00000030
> -DATA 4 0x020e0510 0x00000030
> -DATA 4 0x020e05bc 0x00000030
> -DATA 4 0x020e05c4 0x00000030
> -DATA 4 0x021b0800 0xa1390003
> -DATA 4 0x021b080c 0x001b001e
> -DATA 4 0x021b0810 0x002e0029
> -DATA 4 0x021b480c 0x001b002a
> -DATA 4 0x021b4810 0x0019002c
> -DATA 4 0x021b083c 0x43240334
> -DATA 4 0x021b0840 0x0324031a
> -DATA 4 0x021b483c 0x43340344
> -DATA 4 0x021b4840 0x03280276
> -DATA 4 0x021b0848 0x44383A3E
> -DATA 4 0x021b4848 0x3C3C3846
> -DATA 4 0x021b0850 0x2e303230
> -DATA 4 0x021b4850 0x38283E34
> -DATA 4 0x021b081c 0x33333333
> -DATA 4 0x021b0820 0x33333333
> -DATA 4 0x021b0824 0x33333333
> -DATA 4 0x021b0828 0x33333333
> -DATA 4 0x021b481c 0x33333333
> -DATA 4 0x021b4820 0x33333333
> -DATA 4 0x021b4824 0x33333333
> -DATA 4 0x021b4828 0x33333333
> -DATA 4 0x021b08c0 0x24912492
> -DATA 4 0x021b48c0 0x24912492
> -DATA 4 0x021b08b8 0x00000800
> -DATA 4 0x021b48b8 0x00000800
> -DATA 4 0x021b0004 0x00020036
> -DATA 4 0x021b0008 0x09444040
> -DATA 4 0x021b000c 0x898E7955
> -DATA 4 0x021b0010 0xFF328F64
> -DATA 4 0x021b0014 0x01FF00DB
> -DATA 4 0x021b0018 0x00001740
> -DATA 4 0x021b001c 0x00008000
> -
> -DATA 4 0x021b002c 0x000026d2
> -DATA 4 0x021b0030 0x008E1023
> -DATA 4 0x021b0040 0x00000047
> -DATA 4 0x021b0400 0x14420000
> -DATA 4 0x021b0000 0x841A0000
> -DATA 4 0x00bb0008 0x00000004
> -DATA 4 0x00bb000c 0x2891E41A
> -DATA 4 0x00bb0038 0x00000564
> -DATA 4 0x00bb0014 0x00000040
> -DATA 4 0x00bb0028 0x00000020
> -DATA 4 0x00bb002c 0x00000020
> -DATA 4 0x021b001c 0x04088032
> -DATA 4 0x021b001c 0x00008033
> -DATA 4 0x021b001c 0x00048031
> -DATA 4 0x021b001c 0x09408030
> -DATA 4 0x021b001c 0x04008040
> -DATA 4 0x021b0020 0x00005800
> -DATA 4 0x021b0818 0x00011117
> -DATA 4 0x021b4818 0x00011117
> -DATA 4 0x021b0004 0x00025576
> -DATA 4 0x021b0404 0x00011006
> -DATA 4 0x021b001c 0x00000000
> -/* set the default clock gate to save power */
> -DATA 4, 0x020c4068, 0x00C03F3F
> -DATA 4, 0x020c406c, 0x0030FC03
> -DATA 4, 0x020c4070, 0x0FFFC000
> -DATA 4, 0x020c4074, 0x3FF00000
> -DATA 4, 0x020c4078, 0xFFFFF300
> -DATA 4, 0x020c407c, 0x0F0000F3
> -DATA 4, 0x020c4080, 0x00000FFF
> -
> -/* enable AXI cache for VDOA/VPU/IPU */
> -DATA 4, 0x020e0010, 0xF00000CF
> -/* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */
> -DATA 4, 0x020e0018, 0x77177717
> -DATA 4, 0x020e001c, 0x77177717
> diff --git a/board/freescale/mx6qsabreauto/Kconfig b/board/freescale/mx6sabreauto/Kconfig
> similarity index 54%
> rename from board/freescale/mx6qsabreauto/Kconfig
> rename to board/freescale/mx6sabreauto/Kconfig
> index e579c0f..5b4faf6 100644
> --- a/board/freescale/mx6qsabreauto/Kconfig
> +++ b/board/freescale/mx6sabreauto/Kconfig
> @@ -1,12 +1,12 @@
> -if TARGET_MX6QSABREAUTO
> +if TARGET_MX6SABREAUTO
>  
>  config SYS_BOARD
> -	default "mx6qsabreauto"
> +	default "mx6sabreauto"
>  
>  config SYS_VENDOR
>  	default "freescale"
>  
>  config SYS_CONFIG_NAME
> -	default "mx6qsabreauto"
> +	default "mx6sabreauto"
>  
>  endif
> diff --git a/board/freescale/mx6sabreauto/MAINTAINERS b/board/freescale/mx6sabreauto/MAINTAINERS
> new file mode 100644
> index 0000000..a89f05a
> --- /dev/null
> +++ b/board/freescale/mx6sabreauto/MAINTAINERS
> @@ -0,0 +1,7 @@
> +MX6SABREAUTO BOARD
> +M:	Fabio Estevam <fabio.estevam at nxp.com>
> +M:	Peng Fan <peng.fan at nxp.com>
> +S:	Maintained
> +F:	board/freescale/mx6sabreauto/
> +F:	include/configs/mx6sabreauto.h
> +F:	configs/mx6sabreauto_defconfig
> diff --git a/board/freescale/mx6qsabreauto/Makefile b/board/freescale/mx6sabreauto/Makefile
> similarity index 85%
> rename from board/freescale/mx6qsabreauto/Makefile
> rename to board/freescale/mx6sabreauto/Makefile
> index ac5bc81..87f4ec0 100644
> --- a/board/freescale/mx6qsabreauto/Makefile
> +++ b/board/freescale/mx6sabreauto/Makefile
> @@ -6,4 +6,4 @@
>  # SPDX-License-Identifier:	GPL-2.0+
>  #
>  
> -obj-y  := mx6qsabreauto.o
> +obj-y  := mx6sabreauto.o
> diff --git a/board/freescale/mx6sabreauto/README b/board/freescale/mx6sabreauto/README
> new file mode 100644
> index 0000000..7e4596a
> --- /dev/null
> +++ b/board/freescale/mx6sabreauto/README
> @@ -0,0 +1,20 @@
> +How to use and build U-Boot on mx6sabreauto
> +-------------------------------------------
> +
> +mx6sabreauto_defconfig target supports mx6q/mx6dl/mx6qp sabreauto variants.
> +
> +In order to build it:
> +
> +$ make mx6sabreauto_defconfig
> +
> +$ make
> +
> +This will generate the SPL and u-boot.img binaries.
> +
> +- Flash the SPL binary into the SD card:
> +
> +$ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 && sync
> +
> +- Flash the u-boot.img binary into the SD card:
> +
> +$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync
> diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
> similarity index 100%
> rename from board/freescale/mx6qsabreauto/mx6qsabreauto.c
> rename to board/freescale/mx6sabreauto/mx6sabreauto.c
> diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
> deleted file mode 100644
> index ba5ab8a..0000000
> --- a/configs/mx6dlsabreauto_defconfig
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
> deleted file mode 100644
> index 96a248e..0000000
> --- a/configs/mx6qpsabreauto_defconfig
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
> deleted file mode 100644
> index 015207d..0000000
> --- a/configs/mx6qsabreauto_defconfig
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> -CONFIG_VIDEO=y
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_SF=y
> -CONFIG_MTD_NOR_FLASH=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="FSL"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> -# CONFIG_VIDEO_SW_CURSOR is not set
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6qsabreauto_spl_defconfig b/configs/mx6sabreauto_defconfig
> similarity index 97%
> rename from configs/mx6qsabreauto_spl_defconfig
> rename to configs/mx6sabreauto_defconfig
> index ce2d1d2..c1b3bbf 100644
> --- a/configs/mx6qsabreauto_spl_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
>  CONFIG_SPL_GPIO_SUPPORT=y
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_TARGET_MX6QSABREAUTO=y
> +CONFIG_TARGET_MX6SABREAUTO=y
>  CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
>  CONFIG_SPL_LIBDISK_SUPPORT=y
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6sabreauto.h
> similarity index 94%
> rename from include/configs/mx6qsabreauto.h
> rename to include/configs/mx6sabreauto.h
> index 99b48ca..fd0d5ce 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6sabreauto.h
> @@ -6,8 +6,8 @@
>   * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
> -#ifndef __MX6QSABREAUTO_CONFIG_H
> -#define __MX6QSABREAUTO_CONFIG_H
> +#ifndef __MX6SABREAUTO_CONFIG_H
> +#define __MX6SABREAUTO_CONFIG_H
>  
>  #ifdef CONFIG_SPL
>  #include "imx6_spl.h"
> @@ -76,4 +76,4 @@
>  #define CONFIG_POWER_PFUZE100
>  #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
>  
> -#endif                         /* __MX6QSABREAUTO_CONFIG_H */
> +#endif                         /* __MX6SABREAUTO_CONFIG_H */
> 

Nice cleanup, thanks !

Reviewed-by: Stefano Babic <sbabic at denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================


More information about the U-Boot mailing list