]> git.dujemihanovic.xyz Git - u-boot.git/commit
mx6ull: Handle the CONFIG_MX6ULL cases correctly
authorFabio Estevam <fabio.estevam@nxp.com>
Wed, 3 Jan 2018 14:33:05 +0000 (12:33 -0200)
committerStefano Babic <sbabic@denx.de>
Thu, 4 Jan 2018 15:29:04 +0000 (16:29 +0100)
commit290e7cfdbfa288d26598c073186ab45e3fa711b3
treeeecd827a87b3f18a30048c883e5939bec7462014
parent5a6440cac77db8083aa9b7f260e0ff3e994e7834
mx6ull: Handle the CONFIG_MX6ULL cases correctly

Since commit 051ba9e082f7 ("Kconfig: mx6ull: Deselect MX6UL from
CONFIG_MX6ULL") CONFIG_MX6ULL does not select CONFIG_MX6UL anymore, so
take this into consideration in all the checks for CONFIG_MX6UL.

This fixes a boot regression.

Reported-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Tested-by: Breno Lima <breno.lima@nxp.com>
Tested-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Tested-by: Jörg Krause <joerg.krause@embedded.rocks>
arch/arm/include/asm/arch-mx6/imx-regs.h
arch/arm/include/asm/arch-mx6/mx6-ddr.h
arch/arm/include/asm/arch-mx6/mx6ul-ddr.h
arch/arm/include/asm/mach-imx/iomux-v3.h
arch/arm/include/asm/mach-imx/regs-lcdif.h
arch/arm/mach-imx/mx6/Kconfig
arch/arm/mach-imx/mx6/ddr.c
drivers/gpio/mxc_gpio.c
include/configs/imx6_spl.h
include/configs/mx6_common.h