mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Fix build vf boards + fix gpr_init()
-----BEGIN PGP SIGNATURE----- iQHDBAABCgAtFiEEiZClFGvhzbUNsmAvKMTY0yrV63cFAlvpaz0PHHNiYWJpY0Bk ZW54LmRlAAoJECjE2NMq1et3NwIMAKf0rjS+Uec7NS9GAZcLwZHIlJBkbjA3BWax 7Of6sTVrUh5Tc14Ru/QZgI3UCVHC6Su4DhTyqlrxlghCVdxFoIHRsWobha0xIYkz CDbsnFadHFby/Wq0v4b29gORL1D6Xp3qtQT8jzoWX23aZZFAWc2pVnv/alw7k02I 9y0lj+hqhI+wZyXQp+fqqIMRNz/Fr7/Kr0Oxu2APJ9D4E/EChZ4zvJlZvcQaBR0o 4uHP6Q2mNJXT9kRzq5QNuRizxpcTSdv/ffk4StoVOGa6T6nH8aEqCW4fOBW1fuzp HOjTRue6CL0xC0kEVxb2vyCkb7s/Tsh/UkWneA6Saqau0fN80asBDdrluEVqZq/p QKb5+62dsqw+j81eaaAR84opf0JWjjvb9GeKKqK11qbYr/ffUjSHMSq4DUMnBtcv /+F2hhJQ4351nR/oLHutM8Iudcp7hNdsbGjNe0PWI4VoGpV8HI8EpJQ3eRLgdN3C oDh9elgwUE31M8nM1fZ+0ArMgYIO2A== =mSG2 -----END PGP SIGNATURE----- Merge tag 'u-boot-imx-20181112' of git://git.denx.de/u-boot-imx Fix build vf boards + fix gpr_init()
This commit is contained in:
commit
c80cc3df3d
3 changed files with 26 additions and 4 deletions
|
@ -58,6 +58,21 @@ obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
|
|||
obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_BOARD_SIZE_LIMIT),)
|
||||
BOARD_SIZE_CHECK = \
|
||||
@actual=`wc -c $@ | awk '{print $$1}'`; \
|
||||
limit=`printf "%d" $(CONFIG_BOARD_SIZE_LIMIT)`; \
|
||||
if test $$actual -gt $$limit; then \
|
||||
echo "$@ exceeds file size limit:" >&2 ; \
|
||||
echo " limit: $$limit bytes" >&2 ; \
|
||||
echo " actual: $$actual bytes" >&2 ; \
|
||||
echo " excess: $$((actual - limit)) bytes" >&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
else
|
||||
BOARD_SIZE_CHECK =
|
||||
endif
|
||||
|
||||
PLUGIN = board/$(BOARDDIR)/plugin
|
||||
|
||||
ifeq ($(CONFIG_USE_IMXIMG_PLUGIN),y)
|
||||
|
@ -101,6 +116,7 @@ u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
|
|||
|
||||
u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE
|
||||
$(call if_changed,mkimage)
|
||||
$(BOARD_SIZE_CHECK)
|
||||
|
||||
ifeq ($(CONFIG_OF_SEPARATE),y)
|
||||
MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \
|
||||
|
|
|
@ -660,6 +660,14 @@ void gpr_init(void)
|
|||
{
|
||||
struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
|
||||
|
||||
/*
|
||||
* If this function is used in a common MX6 spl implementation
|
||||
* we have to ensure that it is only called for suitable cpu types,
|
||||
* otherwise it breaks hardware parts like enet1, can1, can2, etc.
|
||||
*/
|
||||
if (!is_mx6dqp() && !is_mx6dq() && !is_mx6sdl())
|
||||
return;
|
||||
|
||||
/* enable AXI cache for VDOA/VPU/IPU */
|
||||
writel(0xF00000CF, &iomux->gpr[4]);
|
||||
if (is_mx6dqp()) {
|
||||
|
|
|
@ -14,6 +14,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|||
CONFIG_ARCH_MISC_INIT=y
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
# CONFIG_CMDLINE_EDITING is not set
|
||||
# CONFIG_AUTO_COMPLETE is not set
|
||||
CONFIG_SYS_PROMPT="Colibri VFxx # "
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
|
@ -23,7 +24,6 @@ CONFIG_CMD_DFU=y
|
|||
CONFIG_CMD_FUSE=y
|
||||
CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_SPI=y
|
||||
CONFIG_CMD_USB=y
|
||||
CONFIG_CMD_USB_MASS_STORAGE=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
|
@ -55,9 +55,6 @@ CONFIG_PHY_MICREL=y
|
|||
CONFIG_MII=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_FSL_LPUART=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_DM_SPI=y
|
||||
CONFIG_FSL_DSPI=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_DM_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
|
@ -72,3 +69,4 @@ CONFIG_VIDEO_FSL_DCU_FB=y
|
|||
CONFIG_VIDEO=y
|
||||
CONFIG_SYS_CONSOLE_FG_COL=0x00
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
# CONFIG_EFI_UNICODE_CAPITALIZATION is not set
|
||||
|
|
Loading…
Add table
Reference in a new issue